Merged the 3.2 branch back into trunk.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12588 b35dd754-fafc-0310-a699-88a17e54d16e

test-unit/org/jivesoftware/smack/ChatConnectionTest.java

@@ -40,252 +40,249 @@ import org.junit.Test;
  * @see <a href="http://xmpp.org/rfcs/rfc3921.html#roster">Roster Management</a>
  * @author Guenther Niess
  */
-public class ChatConnectionTest
-{
+public class ChatConnectionTest {
 
-	private DummyConnection connection;
+    private DummyConnection connection;
 
-	@Before
-	public void setUp() throws Exception
-	{
-		// Uncomment this to enable debug output
-		// Connection.DEBUG_ENABLED = true;
+    @Before
+    public void setUp() throws Exception {
+	// Uncomment this to enable debug output
+	//Connection.DEBUG_ENABLED = true;
 
-		connection = new DummyConnection();
-		connection.connect();
-		connection.login("me", "secret");
-	}
+	connection = new DummyConnection();
+	connection.connect();
+	connection.login("me", "secret");
+    }
 
-	@After
-	public void tearDown() throws Exception
-	{
-		if (connection != null)
-			connection.disconnect();
-	}
+    @After
+    public void tearDown() throws Exception {
+	if (connection != null)
+	    connection.disconnect();
+    }
 
-	/**
-	 * Confirm that a new chat is created when a chat message is received but
-	 * there is no thread id for a user with only a base jid.
-	 */
-	@Test
-	public void chatCreatedWithIncomingChatNoThreadBaseJid()
-	{
-		TestChatManagerListener listener = new TestChatManagerListener();
-		connection.getChatManager().addChatListener(listener);
+    /**
+     * Confirm that a new chat is created when a chat message is received but
+     * there is no thread id for a user with only a base jid.
+     */
+    @Test
+    public void chatCreatedWithIncomingChatNoThreadBaseJid()
+    {
+	TestChatManagerListener listener = new TestChatManagerListener();
+	connection.getChatManager().addChatListener(listener);
 
-		Packet incomingChat = createChatPacket(null, false);
-		processServerMessage(incomingChat);
+	Packet incomingChat = createChatPacket(null, false);
+	processServerMessage(incomingChat);
 
-		Chat newChat = listener.getNewChat();
-		assertNotNull(newChat);
-	}
+	Chat newChat = listener.getNewChat();
+	assertNotNull(newChat);
+    }
 
-	/**
-	 * Confirm that a new chat is created when a chat message is received but
-	 * there is no thread id for a user with a full jid.
-	 */
-	@Test
-	public void chatCreatedWhenIncomingChatNoThreadFullJid()
-	{
-		TestChatManagerListener listener = new TestChatManagerListener();
-		connection.getChatManager().addChatListener(listener);
+    /**
+     * Confirm that a new chat is created when a chat message is received but
+     * there is no thread id for a user with a full jid.
+     */
+    @Test
+    public void chatCreatedWhenIncomingChatNoThreadFullJid()
+    {
+	TestChatManagerListener listener = new TestChatManagerListener();
+	connection.getChatManager().addChatListener(listener);
 
-		Packet incomingChat = createChatPacket(null, true);
-		processServerMessage(incomingChat);
+	Packet incomingChat = createChatPacket(null, true);
+	processServerMessage(incomingChat);
 
-		Chat newChat = listener.getNewChat();
-		assertNotNull(newChat);
-	}
+	Chat newChat = listener.getNewChat();
+	assertNotNull(newChat);
+    }
 
-	/**
-	 * Confirm that an existing chat created with a base jid is matched to an
-	 * incoming chat message that has no thread id and the user is a full jid.
-	 */
-	@Test
-	public void chatFoundWhenNoThreadFullJid()
-	{
-		TestChatManagerListener listener = new TestChatManagerListener();
-		connection.getChatManager().addChatListener(listener);
-		Chat outgoing = connection.getChatManager().createChat("you@testserver", null);
+    /**
+     * Confirm that an existing chat created with a base jid is matched to an
+     * incoming chat message that has no thread id and the user is a full jid.
+     */
+    @Test
+    public void chatFoundWhenNoThreadFullJid()
+    {
+	TestChatManagerListener listener = new TestChatManagerListener();
+	connection.getChatManager().addChatListener(listener);
+	Chat outgoing = connection.getChatManager().createChat("you@testserver", null);
 
-		Packet incomingChat = createChatPacket(null, true);
-		processServerMessage(incomingChat);
+	Packet incomingChat = createChatPacket(null, true);
+	processServerMessage(incomingChat);
 
-		Chat newChat = listener.getNewChat();
-		assertNotNull(newChat);
-		assertTrue(newChat == outgoing);
-	}
+	Chat newChat = listener.getNewChat();
+	assertNotNull(newChat);
+	assertTrue(newChat == outgoing);
+    }
 
-	/**
-	 * Confirm that an existing chat created with a base jid is matched to an
-	 * incoming chat message that has no thread id and the user is a base jid.
-	 */
-	@Test
-	public void chatFoundWhenNoThreadBaseJid()
-	{
-		TestChatManagerListener listener = new TestChatManagerListener();
-		connection.getChatManager().addChatListener(listener);
-		Chat outgoing = connection.getChatManager().createChat("you@testserver", null);
+    /**
+     * Confirm that an existing chat created with a base jid is matched to an
+     * incoming chat message that has no thread id and the user is a base jid.
+     */
+    @Test
+    public void chatFoundWhenNoThreadBaseJid()
+    {
+	TestChatManagerListener listener = new TestChatManagerListener();
+	connection.getChatManager().addChatListener(listener);
+	Chat outgoing = connection.getChatManager().createChat("you@testserver", null);
 
-		Packet incomingChat = createChatPacket(null, false);
-		processServerMessage(incomingChat);
+	Packet incomingChat = createChatPacket(null, false);
+	processServerMessage(incomingChat);
 
-		Chat newChat = listener.getNewChat();
-		assertNotNull(newChat);
-		assertTrue(newChat == outgoing);
-	}
+	Chat newChat = listener.getNewChat();
+	assertNotNull(newChat);
+	assertTrue(newChat == outgoing);
+    }
 
-	/**
-	 * Confirm that an existing chat created with a base jid is matched to an
-	 * incoming chat message that has the same id and the user is a full jid.
-	 */
-	@Test
-	public void chatFoundWithSameThreadFullJid()
-	{
-		TestChatManagerListener listener = new TestChatManagerListener();
-		connection.getChatManager().addChatListener(listener);
-		Chat outgoing = connection.getChatManager().createChat("you@testserver", null);
+    /**
+     * Confirm that an existing chat created with a base jid is matched to an
+     * incoming chat message that has the same id and the user is a full jid.
+     */
+    @Test
+    public void chatFoundWithSameThreadFullJid()
+    {
+	TestChatManagerListener listener = new TestChatManagerListener();
+	connection.getChatManager().addChatListener(listener);
+	Chat outgoing = connection.getChatManager().createChat("you@testserver", null);
 
-		Packet incomingChat = createChatPacket(outgoing.getThreadID(), true);
-		processServerMessage(incomingChat);
+	Packet incomingChat = createChatPacket(outgoing.getThreadID(), true);
+	processServerMessage(incomingChat);
 
-		Chat newChat = listener.getNewChat();
-		assertNotNull(newChat);
-		assertTrue(newChat == outgoing);
-	}
+	Chat newChat = listener.getNewChat();
+	assertNotNull(newChat);
+	assertTrue(newChat == outgoing);
+    }
 
-	/**
-	 * Confirm that an existing chat created with a base jid is matched to an
-	 * incoming chat message that has the same id and the user is a base jid.
-	 */
-	@Test
-	public void chatFoundWithSameThreadBaseJid()
-	{
-		TestChatManagerListener listener = new TestChatManagerListener();
-		connection.getChatManager().addChatListener(listener);
-		Chat outgoing = connection.getChatManager().createChat("you@testserver", null);
+    /**
+     * Confirm that an existing chat created with a base jid is matched to an
+     * incoming chat message that has the same id and the user is a base jid.
+     */
+    @Test
+    public void chatFoundWithSameThreadBaseJid()
+    {
+	TestChatManagerListener listener = new TestChatManagerListener();
+	connection.getChatManager().addChatListener(listener);
+	Chat outgoing = connection.getChatManager().createChat("you@testserver", null);
 
-		Packet incomingChat = createChatPacket(outgoing.getThreadID(), false);
-		processServerMessage(incomingChat);
+	Packet incomingChat = createChatPacket(outgoing.getThreadID(), false);
+	processServerMessage(incomingChat);
 
-		Chat newChat = listener.getNewChat();
-		assertNotNull(newChat);
-		assertTrue(newChat == outgoing);
-	}
+	Chat newChat = listener.getNewChat();
+	assertNotNull(newChat);
+	assertTrue(newChat == outgoing);
+    }
 
-	/**
-	 * Confirm that an existing chat created with a base jid is not matched to
-	 * an incoming chat message that has a different id and the same user as a
-	 * base jid.
-	 */
-	@Ignore
-	@Test
-	public void chatNotFoundWithDiffThreadBaseJid()
-	{
-		TestChatManagerListener listener = new TestChatManagerListener();
-		connection.getChatManager().addChatListener(listener);
-		Chat outgoing = connection.getChatManager().createChat("you@testserver", null);
+    /**
+     * Confirm that an existing chat created with a base jid is not matched to
+     * an incoming chat message that has a different id and the same user as a
+     * base jid.
+     */
+    @Ignore
+    @Test
+    public void chatNotFoundWithDiffThreadBaseJid()
+    {
+	TestChatManagerListener listener = new TestChatManagerListener();
+	connection.getChatManager().addChatListener(listener);
+	Chat outgoing = connection.getChatManager().createChat("you@testserver", null);
 
-		Packet incomingChat = createChatPacket(outgoing.getThreadID() + "ff", false);
-		processServerMessage(incomingChat);
+	Packet incomingChat = createChatPacket(outgoing.getThreadID() + "ff", false);
+	processServerMessage(incomingChat);
 
-		Chat newChat = listener.getNewChat();
-		assertNotNull(newChat);
-		assertFalse(newChat == outgoing);
-	}
+	Chat newChat = listener.getNewChat();
+	assertNotNull(newChat);
+	assertFalse(newChat == outgoing);
+    }
 
-	/**
-	 * Confirm that an existing chat created with a base jid is not matched to
-	 * an incoming chat message that has a different id and the same base jid.
-	 */
-	@Ignore
-	@Test
-	public void chatNotFoundWithDiffThreadFullJid()
-	{
-		TestChatManagerListener listener = new TestChatManagerListener();
-		connection.getChatManager().addChatListener(listener);
-		Chat outgoing = connection.getChatManager().createChat("you@testserver", null);
+    /**
+     * Confirm that an existing chat created with a base jid is not matched to
+     * an incoming chat message that has a different id and the same base jid.
+     */
+    @Ignore
+    @Test
+    public void chatNotFoundWithDiffThreadFullJid()
+    {
+	TestChatManagerListener listener = new TestChatManagerListener();
+	connection.getChatManager().addChatListener(listener);
+	Chat outgoing = connection.getChatManager().createChat("you@testserver", null);
 
-		Packet incomingChat = createChatPacket(outgoing.getThreadID() + "ff", true);
-		processServerMessage(incomingChat);
+	Packet incomingChat = createChatPacket(outgoing.getThreadID() + "ff", true);
+	processServerMessage(incomingChat);
 
-		Chat newChat = listener.getNewChat();
-		assertNotNull(newChat);
-		assertFalse(newChat == outgoing);
-	}
+	Chat newChat = listener.getNewChat();
+	assertNotNull(newChat);
+	assertFalse(newChat == outgoing);
+    }
 
-	private Packet createChatPacket(final String threadId, final boolean isFullJid)
-	{
-		Message chatMsg = new Message("me@testserver", Message.Type.chat);
-		chatMsg.setBody("the body message");
-		chatMsg.setFrom("you@testserver" + (isFullJid ? "/resource" : ""));
-
-		if (threadId != null)
-			chatMsg.addExtension(new PacketExtension()
-			{
-				@Override
-				public String toXML()
-				{
-					return "<thread>" + threadId + "</thread>";
-				}
-
-				@Override
-				public String getNamespace()
-				{
-					return null;
-				}
-
-				@Override
-				public String getElementName()
-				{
-					return "thread";
-				}
-			});
-		return chatMsg;
-	}
-
-	private void processServerMessage(Packet incomingChat)
-	{
-		TestChatServer chatServer = new TestChatServer(incomingChat);
-		chatServer.start();
-		try
-		{
-			chatServer.join();
-		} catch (InterruptedException e)
-		{
-			fail();
-		}
-	}
-
-	class TestChatManagerListener implements ChatManagerListener
-	{
-		private Chat newChat;
+    private Packet createChatPacket(final String threadId, final boolean isFullJid)
+    {
+	Message chatMsg = new Message("me@testserver", Message.Type.chat);
+	chatMsg.setBody("the body message");
+	chatMsg.setFrom("you@testserver" + (isFullJid ? "/resource" : ""));
 
+	if (threadId != null)
+	    chatMsg.addExtension(new PacketExtension()
+	    {
 		@Override
-		public void chatCreated(Chat chat, boolean createdLocally)
+		public String toXML()
 		{
-			newChat = chat;
-		}
-
-		public Chat getNewChat()
-		{
-			return newChat;
-		}
-	}
-
-	private class TestChatServer extends Thread
-	{
-		private Packet chatPacket;
-
-		TestChatServer(Packet chatMsg)
-		{
-			chatPacket = chatMsg;
+		    return "<thread>" + threadId + "</thread>";
 		}
 
 		@Override
-		public void run()
+		public String getNamespace()
 		{
-			connection.processPacket(chatPacket);
+		    return null;
 		}
+
+		@Override
+		public String getElementName()
+		{
+		    return "thread";
+		}
+	    });
+	return chatMsg;
+    }
+
+    private void processServerMessage(Packet incomingChat)
+    {
+	TestChatServer chatServer = new TestChatServer(incomingChat);
+	chatServer.start();
+	try
+	{
+	    chatServer.join();
+	} catch (InterruptedException e)
+	{
+	    fail();
 	}
+    }
+
+    class TestChatManagerListener implements ChatManagerListener
+    {
+	private Chat newChat;
+
+	@Override
+	public void chatCreated(Chat chat, boolean createdLocally)
+	{
+	    newChat = chat;
+	}
+
+	public Chat getNewChat()
+	{
+	    return newChat;
+	}
+    }
+
+    private class TestChatServer extends Thread
+    {
+	private Packet chatPacket;
+
+	TestChatServer(Packet chatMsg)
+	{
+	    chatPacket = chatMsg;
+	}
+
+	@Override
+	public void run()
+	{
+	    connection.processPacket(chatPacket);
+	}
+    }
 }

test-unit/org/jivesoftware/smack/SmackConfigTest.java

@@ -0,0 +1,32 @@
+package org.jivesoftware.smack;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class SmackConfigTest
+{
+	@Test
+	public void validatePacketCollectorSize()
+	{
+		assertEquals(10000, SmackConfiguration.getPacketCollectorSize());
+	}
+
+	@Test
+	public void validateKeepAliveInterval()
+	{
+		assertEquals(30000, SmackConfiguration.getKeepAliveInterval());
+	}
+
+	@Test
+	public void validateLocalSocks5ProxyPort()
+	{
+		assertEquals(7777, SmackConfiguration.getLocalSocks5ProxyPort());
+	}
+
+	@Test
+	public void validateIsLocalSocks5Proxy()
+	{
+		assertTrue(SmackConfiguration.isLocalSocks5ProxyEnabled());
+	}
+}

test-unit/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java

@@ -2,6 +2,17 @@ package org.jivesoftware.smackx.pubsub;
 
 import static org.junit.Assert.assertEquals;
 
+import org.jivesoftware.smack.SmackConfiguration;
+import org.jivesoftware.smack.ThreadedDummyConnection;
+import org.jivesoftware.smack.XMPPException;
+import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.packet.PacketExtension;
+import org.jivesoftware.smack.packet.XMPPError;
+import org.jivesoftware.smack.packet.XMPPError.Condition;
+import org.jivesoftware.smackx.packet.DiscoverInfo;
+import org.jivesoftware.smackx.packet.DiscoverInfo.Identity;
+import org.jivesoftware.smackx.pubsub.packet.PubSub;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class ConfigureFormTest
@@ -13,4 +24,49 @@ public class ConfigureFormTest
 		form.setChildrenAssociationPolicy(ChildrenAssociationPolicy.owners);
 		assertEquals(ChildrenAssociationPolicy.owners, form.getChildrenAssociationPolicy());
 	}
+	
+	@Test
+	public void getConfigFormWithInsufficientPriviliges() throws XMPPException
+	{
+		ThreadedDummyConnection con = new ThreadedDummyConnection();
+		PubSubManager mgr = new PubSubManager(con);
+		DiscoverInfo info = new DiscoverInfo();
+		Identity ident = new Identity("pubsub", null);
+		ident.setType("leaf");
+		info.addIdentity(ident);
+		con.addIQReply(info);
+		
+		Node node = mgr.getNode("princely_musings");
+		
+		PubSub errorIq = new PubSub();
+		XMPPError error = new XMPPError(Condition.forbidden);
+		errorIq.setError(error);
+		con.addIQReply(errorIq);
+		
+		try
+		{
+			node.getNodeConfiguration();
+		}
+		catch (XMPPException e)
+		{
+			Assert.assertEquals(XMPPError.Type.AUTH, e.getXMPPError().getType());
+		}
+	}
+
+	@Test (expected=XMPPException.class)
+	public void getConfigFormWithTimeout() throws XMPPException
+	{
+		ThreadedDummyConnection con = new ThreadedDummyConnection();
+		PubSubManager mgr = new PubSubManager(con);
+		DiscoverInfo info = new DiscoverInfo();
+		Identity ident = new Identity("pubsub", null);
+		ident.setType("leaf");
+		info.addIdentity(ident);
+		con.addIQReply(info);
+		
+		Node node = mgr.getNode("princely_musings");
+		
+		SmackConfiguration.setPacketReplyTimeout(100);
+		node.getNodeConfiguration();
+	}
 }