Author: berndf
Date: Fri Aug 28 10:28:51 2009
New Revision: 808843
URL: http://svn.apache.org/viewvc?rev=808843&view=rev
Log:
VYSPER-176: re-enable MUC integration test and fix how JIDs are compared. test
now succeeds again
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java?rev=808843&r1=808842&r2=808843&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java
Fri Aug 28 10:28:51 2009
@@ -25,6 +25,7 @@
import org.apache.vysper.TestUtil;
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCModule;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Conference;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
@@ -121,21 +122,15 @@
chat.sendMessage("Fooo");
Message message = chat.nextMessage(5000);
- assertNull(message); // TODO REMOVE. triggers failure as soon as
relaying is fixed
- return;
-
- // TODO re-enable rest of the test when component relay is fully
implemented
- /*
assertNotNull(message);
assertEquals("Fooo", message.getBody());
assertEquals(ROOM_JID + "/Nick", message.getFrom());
- assertEquals(TEST_USERNAME1, message.getTo());
+ assertEquals(TEST_USERNAME1,
EntityImpl.parse(message.getTo()).getBareJID().getFullQualifiedName());
message = chat2.nextMessage(5000);
assertNotNull(message);
assertEquals("Fooo", message.getBody());
assertEquals(ROOM_JID + "/Nick", message.getFrom());
- assertEquals(TEST_USERNAME2, message.getTo());
- */
+ assertEquals(TEST_USERNAME2,
EntityImpl.parse(message.getTo()).getBareJID().getFullQualifiedName());
}
}