You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2010/05/08 10:19:09 UTC
svn commit: r942339 - in /mina/vysper/trunk: ./ server/core-inttest/
server/core-inttest/src/main/ server/core-inttest/src/test/
server/core-inttest/src/test/java/ server/core-inttest/src/test/java/org/
server/core-inttest/src/test/java/org/apache/ ser...
Author: ngn
Date: Sat May 8 08:19:08 2010
New Revision: 942339
URL: http://svn.apache.org/viewvc?rev=942339&view=rev
Log:
Integration test modules for core and MUC now funtional
Added:
mina/vysper/trunk/server/core-inttest/src/test/
- copied from r942230, mina/vysper/trunk/server/core-inttest/src/main/
mina/vysper/trunk/server/core-inttest/src/test/java/
- copied from r942230, mina/vysper/trunk/server/core-inttest/src/main/test/
mina/vysper/trunk/server/core-inttest/src/test/java/org/
mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/
mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/
mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/
mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/
mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/
mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/
mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java
- copied, changed from r940885, mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java
mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/PingPacket.java
- copied unchanged from r940884, mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/PingPacket.java
mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIntegrationTestCase.java
- copied unchanged from r940884, mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIntegrationTestCase.java
mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingNoSupportIntegrationTestCase.java
- copied, changed from r940884, mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingNoSupportIntegrationTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/
- copied from r942241, mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/main/
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/
- copied from r942241, mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/main/test/
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/
- copied from r940884, mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/TestSessionContext.java
Removed:
mina/vysper/trunk/server/core-inttest/src/main/
mina/vysper/trunk/server/core-inttest/src/test/test/
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/TestUtil.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/PingPacket.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIntegrationTestCase.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingNoSupportIntegrationTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/main/
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/test/
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/
Modified:
mina/vysper/trunk/pom.xml
mina/vysper/trunk/server/core-inttest/pom.xml
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/TestSessionContext.java
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomInfoDiscoTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCHandlerTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerVerifyTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/AffiliationsTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/ConferenceTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionHistoryTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionMessageTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/RoomTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/XTestCase.java
Modified: mina/vysper/trunk/pom.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/pom.xml?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/pom.xml (original)
+++ mina/vysper/trunk/pom.xml Sat May 8 08:19:08 2010
@@ -162,6 +162,13 @@
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.vysper</groupId>
+ <artifactId>vysper-core-inttest</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+
<!-- Spec compliance -->
<dependency>
<groupId>org.apache.vysper</groupId>
Modified: mina/vysper/trunk/server/core-inttest/pom.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core-inttest/pom.xml?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/core-inttest/pom.xml (original)
+++ mina/vysper/trunk/server/core-inttest/pom.xml Sat May 8 08:19:08 2010
@@ -65,20 +65,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Copied: mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java (from r940885, mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java)
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java?p2=mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java&p1=mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java&r1=940885&r2=942339&rev=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java (original)
+++ mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/AbstractIntegrationTestCase.java Sat May 8 08:19:08 2010
@@ -25,7 +25,6 @@ import java.net.ServerSocket;
import junit.framework.TestCase;
-import org.apache.vysper.mina.StanzaLoggingFilter;
import org.apache.vysper.mina.TCPEndpoint;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
Copied: mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingNoSupportIntegrationTestCase.java (from r940884, mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingNoSupportIntegrationTestCase.java)
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingNoSupportIntegrationTestCase.java?p2=mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingNoSupportIntegrationTestCase.java&p1=mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingNoSupportIntegrationTestCase.java&r1=940884&r2=942339&rev=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingNoSupportIntegrationTestCase.java (original)
+++ mina/vysper/trunk/server/core-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingNoSupportIntegrationTestCase.java Sat May 8 08:19:08 2010
@@ -21,6 +21,7 @@ package org.apache.vysper.xmpp.modules.e
import org.apache.vysper.xmpp.server.XMPPServer;
import org.jivesoftware.smack.packet.IQ;
+import org.apache.vysper.xmpp.modules.extension.xep0199_xmppping.PingPacket;
/**
*/
Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java Sat May 8 08:19:08 2010
@@ -70,6 +70,20 @@ public class EntityImpl implements Entit
}
return new EntityImpl(node, domain, resource);
}
+
+ /**
+ * Parse entities, throwing {@link IllegalArgumentException} on format errors
+ * @param entity
+ * @return
+ */
+ public static EntityImpl parseUnchecked(String entity) {
+ try {
+ return EntityImpl.parse(entity);
+ } catch (EntityFormatException e) {
+ throw new IllegalArgumentException(e);
+ }
+
+ }
public EntityImpl(String node, String domain, String resource) {
this.node = node;
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java Sat May 8 08:19:08 2010
@@ -21,10 +21,10 @@ import java.util.ArrayList;
import junit.framework.TestCase;
-import org.apache.vysper.TestUtil;
import org.apache.vysper.xml.fragment.Attribute;
import org.apache.vysper.xml.fragment.XMLFragment;
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.core.base.BaseStreamStanzaDictionary;
import org.apache.vysper.xmpp.modules.core.base.handler.IQHandler;
import org.apache.vysper.xmpp.modules.core.base.handler.MessageHandler;
@@ -37,8 +37,8 @@ import org.apache.vysper.xmpp.stanza.Sta
*/
public class StanzaHandlerLookupTestCase extends TestCase {
- private static final Entity SERVER_ENTITY = TestUtil.parseUnchecked("vysper.org");
- private static final Entity SUBDOMAIN_ENTITY = TestUtil.parseUnchecked("sub.vysper.org");
+ private static final Entity SERVER_ENTITY = EntityImpl.parseUnchecked("vysper.org");
+ private static final Entity SUBDOMAIN_ENTITY = EntityImpl.parseUnchecked("sub.vysper.org");
public void testDictionaryHierarchy() {
NamespaceHandlerDictionary upperNamespaceHandlerDictionary = new NamespaceHandlerDictionary("testNSURI1");
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/TestSessionContext.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/TestSessionContext.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/TestSessionContext.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/TestSessionContext.java Sat May 8 08:19:08 2010
@@ -20,6 +20,11 @@
package org.apache.vysper.xmpp.server;
+import java.util.Iterator;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.delivery.RecordingStanzaRelay;
@@ -28,13 +33,6 @@ import org.apache.vysper.xmpp.delivery.S
import org.apache.vysper.xmpp.protocol.SessionStateHolder;
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.writer.StanzaWriter;
-import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
-
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.Iterator;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
/**
* makes response available for testing
Added: mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java?rev=942339&view=auto
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java (added)
+++ mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractIntegrationTestCase.java Sat May 8 08:19:08 2010
@@ -0,0 +1,185 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.vysper.xmpp.modules.extension.xep0045_muc.inttest;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.ServerSocket;
+
+import junit.framework.TestCase;
+
+import org.apache.vysper.mina.TCPEndpoint;
+import org.apache.vysper.storage.StorageProviderRegistry;
+import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
+import org.apache.vysper.xmpp.authorization.AccountManagement;
+import org.apache.vysper.xmpp.server.XMPPServer;
+import org.jivesoftware.smack.ConnectionConfiguration;
+import org.jivesoftware.smack.PacketCollector;
+import org.jivesoftware.smack.SmackConfiguration;
+import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.filter.PacketIDFilter;
+import org.jivesoftware.smack.packet.Packet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ */
+public abstract class AbstractIntegrationTestCase extends TestCase {
+
+ private final Logger logger = LoggerFactory.getLogger(AbstractIntegrationTestCase.class);
+
+ protected static final String SERVER_DOMAIN = "vysper.org";
+
+ protected static final String TEST_USERNAME1 = "test1@vysper.org";
+ protected static final String TEST_PASSWORD1 = "password";
+ protected static final String TEST_USERNAME2 = "test2@vysper.org";
+ protected static final String TEST_PASSWORD2 = "password";
+
+ private static final int DEFAULT_SERVER_PORT = 25222;
+
+ protected XMPPConnection client;
+ private XMPPServer server;
+ protected int port;
+
+ protected void addModules(XMPPServer server) {
+ // default, do nothing
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ // make sure Smack times out after 5 seconds
+ SmackConfiguration.setPacketReplyTimeout(5000);
+
+ port = findFreePort();
+
+ startServer(port);
+
+ client = connectClient(port, TEST_USERNAME1, TEST_PASSWORD1);
+ }
+
+ private void startServer(int port) throws Exception {
+ StorageProviderRegistry providerRegistry = new MemoryStorageProviderRegistry();
+
+ AccountManagement accountManagement = (AccountManagement) providerRegistry.retrieve(AccountManagement.class);
+ accountManagement.addUser(TEST_USERNAME1, TEST_PASSWORD1);
+ accountManagement.addUser(TEST_USERNAME2, TEST_PASSWORD2);
+
+ server = new XMPPServer(SERVER_DOMAIN);
+
+ TCPEndpoint endpoint = new TCPEndpoint();
+ endpoint.setPort(port);
+ server.addEndpoint(endpoint);
+ server.setStorageProviderRegistry(providerRegistry);
+
+ server.setTLSCertificateInfo(new File("src/main/config/bogus_mina_tls.cert"), "boguspw");
+
+ server.start();
+
+ addModules(server);
+
+ // allow for the server to bootstrap
+ Thread.sleep(200);
+ }
+
+ protected XMPPConnection connectClient(int port, String username, String password) throws Exception {
+ ConnectionConfiguration connectionConfiguration = new ConnectionConfiguration("localhost", port);
+ connectionConfiguration.setCompressionEnabled(false);
+ connectionConfiguration.setSecurityMode(ConnectionConfiguration.SecurityMode.required);
+ connectionConfiguration.setSASLAuthenticationEnabled(true);
+ connectionConfiguration.setDebuggerEnabled(false);
+ connectionConfiguration.setKeystorePath("src/main/config/bogus_mina_tls.cert");
+ connectionConfiguration.setTruststorePath("src/main/config/bogus_mina_tls.cert");
+ connectionConfiguration.setTruststorePassword("boguspw");
+
+
+ XMPPConnection.DEBUG_ENABLED = true;
+ XMPPConnection client = new XMPPConnection(connectionConfiguration);
+
+ client.connect();
+
+ client.login(username, password);
+ return client;
+ }
+
+ protected Packet sendSync(XMPPConnection client, Packet request) {
+ // Create a packet collector to listen for a response.
+ PacketCollector collector = client.createPacketCollector(
+ new PacketIDFilter(request.getPacketID()));
+
+ client.sendPacket(request);
+
+ // Wait up to 5 seconds for a result.
+ return collector.nextResult(5000);
+ }
+
+ private int findFreePort() {
+ ServerSocket ss = null;
+
+ // try using a predefined default port
+ // makes netstat -a debugging easier
+ try {
+ ss = new ServerSocket(DEFAULT_SERVER_PORT);
+ ss.setReuseAddress(true);
+
+ // succeeded, return the default port
+ logger.info("Test is using the default test port {}", DEFAULT_SERVER_PORT);
+ return DEFAULT_SERVER_PORT;
+ } catch(IOException e) {
+ try {
+ ss = new ServerSocket(0);
+ ss.setReuseAddress(true);
+ int port = ss.getLocalPort();
+ logger.info("Failed to use default test port ({}), using {} instead", DEFAULT_SERVER_PORT, port);
+ return port;
+ } catch (IOException ee) {
+ // we could not even open a random port so
+ // the test will probably fail, anyways
+ // return the default port
+ return DEFAULT_SERVER_PORT;
+ }
+ } finally {
+ if(ss != null) {
+ try {
+ ss.close();
+ } catch (IOException ignored) {
+ ;
+ }
+ }
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ try {
+ client.disconnect();
+ } catch(Exception ignored) {
+ ;
+ }
+
+ try {
+ System.out.println("Test teardown, stopping server");
+ server.stop();
+ } catch(Exception ignored) {
+ ;
+ }
+ }
+
+
+}
Modified: mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java?rev=942339&r1=940884&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java Sat May 8 08:19:08 2010
@@ -23,14 +23,11 @@ import java.util.concurrent.BlockingQueu
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
-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;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
-import org.apache.vysper.xmpp.modules.extension.xep0199_xmppping.AbstractIntegrationTestCase;
import org.apache.vysper.xmpp.server.XMPPServer;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.packet.Message;
@@ -69,7 +66,7 @@ public class MUCIntegrationTestCase exte
public void testEnterRoom() throws Exception {
chat.join("Nick");
- Room room = conference.findRoom(TestUtil.parseUnchecked(ROOM_JID));
+ Room room = conference.findRoom(EntityImpl.parseUnchecked(ROOM_JID));
assertEquals(1, room.getOccupantCount());
Occupant occupant = room.getOccupants().iterator().next();
assertEquals(TEST_USERNAME1, occupant.getJid().getBareJID().getFullQualifiedName());
@@ -95,7 +92,7 @@ public class MUCIntegrationTestCase exte
chat.join("Nick");
chat2.join("Nick2");
- Room room = conference.findRoom(TestUtil.parseUnchecked(ROOM_JID));
+ Room room = conference.findRoom(EntityImpl.parseUnchecked(ROOM_JID));
assertEquals(2, room.getOccupantCount());
final BlockingQueue<String> leftQueue = new LinkedBlockingQueue<String>();
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/pom.xml Sat May 8 08:19:08 2010
@@ -55,15 +55,6 @@
<!-- Test dependencies -->
<dependency>
- <groupId>org.apache.vysper</groupId>
- <artifactId>vysper-core-inttest</artifactId>
- <version>${pom.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java Sat May 8 08:19:08 2010
@@ -21,17 +21,15 @@ package org.apache.vysper.xmpp.modules.e
import junit.framework.TestCase;
-import org.apache.vysper.TestUtil;
-import org.apache.vysper.xml.fragment.Renderer;
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.Module;
import org.apache.vysper.xmpp.modules.core.base.handler.IQHandler;
import org.apache.vysper.xmpp.modules.servicediscovery.collection.ServiceCollector;
import org.apache.vysper.xmpp.protocol.ResponseStanzaContainer;
import org.apache.vysper.xmpp.protocol.SessionStateHolder;
import org.apache.vysper.xmpp.server.DefaultServerRuntimeContext;
-import org.apache.vysper.xmpp.server.TestSessionContext;
import org.apache.vysper.xmpp.server.components.Component;
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
@@ -46,9 +44,9 @@ public abstract class AbstractDiscoTestC
protected static final String SERVERDOMAIN = "vysper.org";
protected static final String MODULEDOMAIN = SUBDOMAIN + "." + SERVERDOMAIN;
- protected static final Entity SERVER_JID = TestUtil.parseUnchecked(SERVERDOMAIN);
- protected static final Entity MODULE_JID = TestUtil.parseUnchecked(MODULEDOMAIN);
- protected static final Entity USER_JID = TestUtil.parseUnchecked("user@" + SERVERDOMAIN);
+ protected static final Entity SERVER_JID = EntityImpl.parseUnchecked(SERVERDOMAIN);
+ protected static final Entity MODULE_JID = EntityImpl.parseUnchecked(MODULEDOMAIN);
+ protected static final Entity USER_JID = EntityImpl.parseUnchecked("user@" + SERVERDOMAIN);
protected DefaultServerRuntimeContext serverRuntimeContext;
private ServiceCollector serviceCollector;
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java Sat May 8 08:19:08 2010
@@ -22,9 +22,9 @@ package org.apache.vysper.xmpp.modules.e
import java.util.Arrays;
import java.util.List;
-import org.apache.vysper.TestUtil;
import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.addressing.EntityFormatException;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.Module;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Conference;
import org.apache.vysper.xmpp.modules.servicediscovery.management.Item;
@@ -35,8 +35,8 @@ import org.apache.vysper.xmpp.modules.se
*/
public class MUCItemsDiscoTestCase extends AbstractItemsDiscoTestCase {
- private static final Entity ROOM1_JID = TestUtil.parseUnchecked("jid1@" + MODULE_JID);
- private static final Entity ROME2_JID = TestUtil.parseUnchecked("jid2@" + MODULE_JID);
+ private static final Entity ROOM1_JID = EntityImpl.parseUnchecked("jid1@" + MODULE_JID);
+ private static final Entity ROME2_JID = EntityImpl.parseUnchecked("jid2@" + MODULE_JID);
private MUCModule module;
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomInfoDiscoTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomInfoDiscoTestCase.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomInfoDiscoTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomInfoDiscoTestCase.java Sat May 8 08:19:08 2010
@@ -22,8 +22,8 @@ package org.apache.vysper.xmpp.modules.e
import java.util.Arrays;
import java.util.List;
-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.Module;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Conference;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.RoomType;
@@ -36,7 +36,7 @@ import org.apache.vysper.xmpp.protocol.N
*/
public class MUCRoomInfoDiscoTestCase extends AbstractInfoDiscoTestCase {
- private static final Entity ROOM_JID = TestUtil.parseUnchecked("jid1@" + MODULEDOMAIN);
+ private static final Entity ROOM_JID = EntityImpl.parseUnchecked("jid1@" + MODULEDOMAIN);
private MUCModule module;
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java Sat May 8 08:19:08 2010
@@ -22,7 +22,6 @@ package org.apache.vysper.xmpp.modules.e
import java.util.Arrays;
import java.util.List;
-import org.apache.vysper.TestUtil;
import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.addressing.EntityFormatException;
import org.apache.vysper.xmpp.addressing.EntityImpl;
@@ -37,10 +36,10 @@ import org.apache.vysper.xmpp.modules.se
*/
public class MUCRoomItemsDiscoTestCase extends AbstractItemsDiscoTestCase {
- private static final Entity ROOM_JID = TestUtil.parseUnchecked("jid1@" + MODULEDOMAIN);
+ private static final Entity ROOM_JID = EntityImpl.parseUnchecked("jid1@" + MODULEDOMAIN);
- private static final Entity USER1_JID = TestUtil.parseUnchecked("user1@vysper.org");
- private static final Entity USER2_JID = TestUtil.parseUnchecked("user2@vysper.org");
+ private static final Entity USER1_JID = EntityImpl.parseUnchecked("user1@vysper.org");
+ private static final Entity USER2_JID = EntityImpl.parseUnchecked("user2@vysper.org");
private static final Entity OCCUPANT1_JID = new EntityImpl(ROOM_JID, "Nick 1");
private static final Entity OCCUPANT2_JID = new EntityImpl(ROOM_JID, "Nick 2");
Added: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/TestSessionContext.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/TestSessionContext.java?rev=942339&view=auto
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/TestSessionContext.java (added)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/TestSessionContext.java Sat May 8 08:19:08 2010
@@ -0,0 +1,194 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.vysper.xmpp.modules.extension.xep0045_muc;
+
+import java.util.Iterator;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.vysper.storage.inmemory.MemoryStorageProviderRegistry;
+import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
+import org.apache.vysper.xmpp.delivery.RecordingStanzaRelay;
+import org.apache.vysper.xmpp.delivery.StanzaReceiverQueue;
+import org.apache.vysper.xmpp.delivery.StanzaReceiverRelay;
+import org.apache.vysper.xmpp.protocol.SessionStateHolder;
+import org.apache.vysper.xmpp.server.AbstractSessionContext;
+import org.apache.vysper.xmpp.server.DefaultServerRuntimeContext;
+import org.apache.vysper.xmpp.server.ServerRuntimeContext;
+import org.apache.vysper.xmpp.server.SessionState;
+import org.apache.vysper.xmpp.stanza.Stanza;
+import org.apache.vysper.xmpp.writer.StanzaWriter;
+
+/**
+ * makes response available for testing
+ */
+public class TestSessionContext extends AbstractSessionContext implements StanzaWriter {
+
+ private LinkedBlockingQueue<Stanza> recordedResponses = new LinkedBlockingQueue<Stanza>();
+ private boolean closed = false;
+ private boolean switchToTLSCalled;
+ private boolean isReopeningXMLStream;
+ private int recordedResponsesTotal = 0;
+
+ /**
+ * creates a new session context (but doesn't set the runtime context)
+ * @param entity
+ * @return
+ */
+ public static TestSessionContext createSessionContext(Entity entity) {
+ SessionStateHolder sessionStateHolder = new SessionStateHolder();
+ TestSessionContext sessionContext = new TestSessionContext(sessionStateHolder);
+ if (entity != null) sessionContext.setInitiatingEntity(entity.getBareJID());
+ return sessionContext;
+ }
+
+ /**
+ * creates a new authenticated session and a new runtime context
+ * @return
+ */
+ public static TestSessionContext createWithStanzaReceiverRelayAuthenticated() {
+ SessionStateHolder sessionStateHolder = new SessionStateHolder();
+ sessionStateHolder.setState(SessionState.AUTHENTICATED);
+ return createWithStanzaReceiverRelay(sessionStateHolder);
+ }
+
+ /**
+ * creates a session and also creates a fresh runtime context for it
+ * @param sessionStateHolder
+ * @return
+ */
+ public static TestSessionContext createWithStanzaReceiverRelay(SessionStateHolder sessionStateHolder) {
+ StanzaReceiverRelay relay = new org.apache.vysper.xmpp.delivery.StanzaReceiverRelay();
+ DefaultServerRuntimeContext serverContext = new DefaultServerRuntimeContext(new EntityImpl(null, "test", null), relay);
+ relay.setServerRuntimeContext(serverContext);
+ return new TestSessionContext(serverContext, sessionStateHolder);
+ }
+
+ /**
+ * creates another session for an already created runtime context
+ * @param sessionStateHolder
+ * @param serverContext
+ * @return
+ */
+ public static TestSessionContext createWithStanzaReceiverRelay(SessionStateHolder sessionStateHolder, ServerRuntimeContext serverContext) {
+ StanzaReceiverRelay relay = (StanzaReceiverRelay)serverContext.getStanzaRelay();
+ relay.setServerRuntimeContext(serverContext);
+ return new TestSessionContext(serverContext, sessionStateHolder);
+ }
+
+ public TestSessionContext(SessionStateHolder sessionStateHolder) {
+ this(new DefaultServerRuntimeContext(
+ new EntityImpl(null, "test", null),
+ new RecordingStanzaRelay(),
+ new MemoryStorageProviderRegistry()),
+ sessionStateHolder);
+ }
+
+ public TestSessionContext(ServerRuntimeContext serverRuntimeContext, SessionStateHolder sessionStateHolder) {
+ super(serverRuntimeContext, sessionStateHolder);
+ sessionId = serverRuntimeContext.getNextSessionId();
+ xmlLang = "de";
+ }
+
+ public Stanza getNextRecordedResponse() {
+ return recordedResponses.poll();
+ }
+
+ public Stanza getNextRecordedResponse(long maxWaitMillis) {
+ try {
+ return recordedResponses.poll(maxWaitMillis, TimeUnit.MILLISECONDS);
+ } catch (InterruptedException e) {
+ return null;
+ }
+ }
+
+ public Stanza getNextRecordedResponseForResource(String resource) {
+ for (Iterator<Stanza> it = recordedResponses.iterator(); it.hasNext();) {
+ Stanza recordedResponse = it.next();
+ if (recordedResponse.getTo() != null && recordedResponse.getTo().isResourceSet()) {
+ if (recordedResponse.getTo().getResource().equals(resource)) {
+ it.remove();
+ return recordedResponse;
+ }
+ }
+ }
+ return null;
+ }
+
+ public void close() {
+ closed = true;
+ }
+
+ public boolean isClosed() {
+ return closed; // checks if close had been called
+ }
+
+ /**
+ * Resets all recorded stanzas and their count.
+ */
+ public void reset() {
+ recordedResponses.clear();
+ recordedResponsesTotal = 0;
+ }
+
+ /**
+ * @param stanza records the stanza.
+ */
+ public void write(Stanza stanza) {
+ recordedResponses.add(stanza);
+ recordedResponsesTotal++;
+ }
+
+ public void setSessionState(SessionState sessionState) {
+ this.sessionStateHolder.setState(sessionState);
+ }
+
+ public StanzaWriter getResponseWriter() {
+ return this;
+ }
+
+ public void switchToTLS() {
+ switchToTLSCalled = true;
+ }
+
+ public void setIsReopeningXMLStream() {
+ isReopeningXMLStream = true;
+ }
+
+ public boolean isSwitchToTLSCalled() {
+ return switchToTLSCalled;
+ }
+
+ public StanzaReceiverQueue addReceiver(Entity entity, String resourceId) {
+ if (!(getServerRuntimeContext().getStanzaRelay() instanceof StanzaReceiverRelay)) {
+ throw new RuntimeException("cannot add receiver - the stanza relay is of a different kind");
+ }
+ StanzaReceiverQueue relay = new StanzaReceiverQueue();
+ if (resourceId != null) entity = new EntityImpl(entity.getNode(), entity.getDomain(), resourceId);
+ ((StanzaReceiverRelay) getServerRuntimeContext().getStanzaRelay()).add(entity, relay);
+ return relay;
+ }
+
+ public int getRecordedResponsesTotal() {
+ return recordedResponsesTotal;
+ }
+}
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCHandlerTestCase.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCHandlerTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCHandlerTestCase.java Sat May 8 08:19:08 2010
@@ -23,15 +23,15 @@ import java.util.List;
import junit.framework.TestCase;
-import org.apache.vysper.TestUtil;
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.delivery.StanzaReceiverQueue;
import org.apache.vysper.xmpp.delivery.StanzaReceiverRelay;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.TestSessionContext;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Conference;
import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.protocol.StanzaHandler;
-import org.apache.vysper.xmpp.server.TestSessionContext;
import org.apache.vysper.xmpp.stanza.Stanza;
/**
@@ -44,16 +44,16 @@ public abstract class AbstractMUCHandler
protected static final String SUBDOMAIN = "chat";
protected static final String FULLDOMAIN = SUBDOMAIN + "." + SERVERDOMAIN;
- protected static final Entity MODULE_JID = TestUtil.parseUnchecked(FULLDOMAIN);
+ protected static final Entity MODULE_JID = EntityImpl.parseUnchecked(FULLDOMAIN);
- protected static final Entity ROOM1_JID = TestUtil.parseUnchecked("room1@" + FULLDOMAIN);
- protected static final Entity ROOM2_JID = TestUtil.parseUnchecked("room2@" + FULLDOMAIN);
+ protected static final Entity ROOM1_JID = EntityImpl.parseUnchecked("room1@" + FULLDOMAIN);
+ protected static final Entity ROOM2_JID = EntityImpl.parseUnchecked("room2@" + FULLDOMAIN);
- protected static final Entity ROOM1_JID_WITH_NICK = TestUtil.parseUnchecked("room1@" + FULLDOMAIN + "/nick");
- protected static final Entity ROOM2_JID_WITH_NICK = TestUtil.parseUnchecked("room2@" + FULLDOMAIN + "/nick");
+ protected static final Entity ROOM1_JID_WITH_NICK = EntityImpl.parseUnchecked("room1@" + FULLDOMAIN + "/nick");
+ protected static final Entity ROOM2_JID_WITH_NICK = EntityImpl.parseUnchecked("room2@" + FULLDOMAIN + "/nick");
- protected static final Entity OCCUPANT1_JID = TestUtil.parseUnchecked("user1@" + SERVERDOMAIN);
- protected static final Entity OCCUPANT2_JID = TestUtil.parseUnchecked("user2@" + SERVERDOMAIN);
+ protected static final Entity OCCUPANT1_JID = EntityImpl.parseUnchecked("user1@" + SERVERDOMAIN);
+ protected static final Entity OCCUPANT2_JID = EntityImpl.parseUnchecked("user2@" + SERVERDOMAIN);
protected StanzaHandler handler;
protected Conference conference = new Conference("foo");
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java Sat May 8 08:19:08 2010
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xml.fragment.XMLElementBuilder;
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.TestSessionContext;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
@@ -38,7 +39,6 @@ import org.apache.vysper.xmpp.protocol.P
import org.apache.vysper.xmpp.protocol.ResponseStanzaContainer;
import org.apache.vysper.xmpp.protocol.StanzaHandler;
import org.apache.vysper.xmpp.server.SessionContext;
-import org.apache.vysper.xmpp.server.TestSessionContext;
import org.apache.vysper.xmpp.stanza.MessageStanza;
import org.apache.vysper.xmpp.stanza.MessageStanzaType;
import org.apache.vysper.xmpp.stanza.Stanza;
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerVerifyTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerVerifyTestCase.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerVerifyTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerVerifyTestCase.java Sat May 8 08:19:08 2010
@@ -21,8 +21,8 @@ package org.apache.vysper.xmpp.modules.e
import junit.framework.TestCase;
-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.model.Conference;
import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
@@ -31,8 +31,8 @@ import org.apache.vysper.xmpp.stanza.Sta
*/
public class MUCPresenceHandlerVerifyTestCase extends TestCase {
- private static final Entity FROM = TestUtil.parseUnchecked("user@vysper.org");
- private static final Entity TO = TestUtil.parseUnchecked("room@chat.vysper.org");
+ private static final Entity FROM = EntityImpl.parseUnchecked("user@vysper.org");
+ private static final Entity TO = EntityImpl.parseUnchecked("room@chat.vysper.org");
private MUCPresenceHandler presenceHandler;
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/AffiliationsTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/AffiliationsTestCase.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/AffiliationsTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/AffiliationsTestCase.java Sat May 8 08:19:08 2010
@@ -21,8 +21,8 @@ package org.apache.vysper.xmpp.modules.e
import junit.framework.TestCase;
-import org.apache.vysper.TestUtil;
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
/**
*
@@ -30,9 +30,9 @@ import org.apache.vysper.xmpp.addressing
*/
public class AffiliationsTestCase extends TestCase {
- private static final Entity JID1 = TestUtil.parseUnchecked("user1@vysper.org/res");
- private static final Entity JID2 = TestUtil.parseUnchecked("user1@vysper.org/other");
- private static final Entity JID3 = TestUtil.parseUnchecked("user2@vysper.org/res");
+ private static final Entity JID1 = EntityImpl.parseUnchecked("user1@vysper.org/res");
+ private static final Entity JID2 = EntityImpl.parseUnchecked("user1@vysper.org/other");
+ private static final Entity JID3 = EntityImpl.parseUnchecked("user2@vysper.org/res");
public void testAddAndGet() {
Affiliations affiliations = new Affiliations();
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/ConferenceTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/ConferenceTestCase.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/ConferenceTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/ConferenceTestCase.java Sat May 8 08:19:08 2010
@@ -25,7 +25,6 @@ import java.util.List;
import junit.framework.TestCase;
-import org.apache.vysper.TestUtil;
import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.addressing.EntityImpl;
@@ -35,8 +34,8 @@ import org.apache.vysper.xmpp.addressing
*/
public class ConferenceTestCase extends TestCase {
- private Entity jid1 = TestUtil.parseUnchecked("jid1@vysper.org");
- private Entity jid2 = TestUtil.parseUnchecked("jid2@vysper.org");
+ private Entity jid1 = EntityImpl.parseUnchecked("jid1@vysper.org");
+ private Entity jid2 = EntityImpl.parseUnchecked("jid2@vysper.org");
public void testGetName() {
Conference conference = new Conference("foo");
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionHistoryTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionHistoryTestCase.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionHistoryTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionHistoryTestCase.java Sat May 8 08:19:08 2010
@@ -25,7 +25,6 @@ import java.util.TimeZone;
import junit.framework.TestCase;
-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.stanzas.History;
@@ -44,9 +43,9 @@ public class DiscussionHistoryTestCase e
private static final String BODY = "Body";
private static final String SUBJECT = "Subject";
- private static final Entity FROM = TestUtil.parseUnchecked("user@vysper.org/res");
- private static final Entity RECEIVER = TestUtil.parseUnchecked("user2@vysper.org/res");
- private static final Entity ROOM_JID = TestUtil.parseUnchecked("room@vysper.org");
+ private static final Entity FROM = EntityImpl.parseUnchecked("user@vysper.org/res");
+ private static final Entity RECEIVER = EntityImpl.parseUnchecked("user2@vysper.org/res");
+ private static final Entity ROOM_JID = EntityImpl.parseUnchecked("room@vysper.org");
private static final Occupant FROM_OCCUPANT = new Occupant(FROM, NICK, Affiliation.None, Role.Visitor);
private static final Occupant RECEIVER_OCCUPANT = new Occupant(RECEIVER, "nick2", Affiliation.None, Role.Visitor);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionMessageTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionMessageTestCase.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionMessageTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionMessageTestCase.java Sat May 8 08:19:08 2010
@@ -24,7 +24,6 @@ import java.util.TimeZone;
import junit.framework.TestCase;
-import org.apache.vysper.TestUtil;
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.addressing.EntityImpl;
@@ -46,8 +45,8 @@ public class DiscussionMessageTestCase e
private static final Calendar TIMESTAMP = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- private static final Entity FROM = TestUtil.parseUnchecked("user@vysper.org/res");
- private static final Entity ROOM_JID = TestUtil.parseUnchecked("room@vysper.org");
+ private static final Entity FROM = EntityImpl.parseUnchecked("user@vysper.org/res");
+ private static final Entity ROOM_JID = EntityImpl.parseUnchecked("room@vysper.org");
private static final Occupant FROM_OCCUPANT = new Occupant(FROM, NICK, Affiliation.None, Role.Visitor);
@@ -78,7 +77,7 @@ public class DiscussionMessageTestCase e
Stanza inStanza = builder.build();
DiscussionMessage item = new DiscussionMessage(inStanza, FROM_OCCUPANT, TIMESTAMP);
- Entity to = TestUtil.parseUnchecked("user2@vysper.org/res");
+ Entity to = EntityImpl.parseUnchecked("user2@vysper.org/res");
Occupant toOccupant = new Occupant(to, "nick 2", Affiliation.None, Role.Visitor);
MessageStanza outStanza = (MessageStanza) MessageStanza.getWrapper(item.createStanza(toOccupant, true));
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/RoomTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/RoomTestCase.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/RoomTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/RoomTestCase.java Sat May 8 08:19:08 2010
@@ -23,8 +23,8 @@ import java.util.EnumSet;
import junit.framework.TestCase;
-import org.apache.vysper.TestUtil;
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
/**
*
@@ -32,11 +32,11 @@ import org.apache.vysper.xmpp.addressing
*/
public class RoomTestCase extends TestCase {
- private Entity roomJid1 = TestUtil.parseUnchecked("room1@vysper.org");
- private Entity roomJid2 = TestUtil.parseUnchecked("room2@vysper.org");
+ private Entity roomJid1 = EntityImpl.parseUnchecked("room1@vysper.org");
+ private Entity roomJid2 = EntityImpl.parseUnchecked("room2@vysper.org");
- private Entity occupantJid1 = TestUtil.parseUnchecked("user1@vysper.org");
- private Entity occupantJid2 = TestUtil.parseUnchecked("user2@vysper.org");
+ private Entity occupantJid1 = EntityImpl.parseUnchecked("user1@vysper.org");
+ private Entity occupantJid2 = EntityImpl.parseUnchecked("user2@vysper.org");
public void testConstructor() {
Room room = new Room(roomJid1, "Room 1");
@@ -78,7 +78,7 @@ public class RoomTestCase extends TestCa
public void testConstructorWithFullJID() {
try {
- new Room(TestUtil.parseUnchecked("jid@vysper.org/incorrect"), "Room 1");
+ new Room(EntityImpl.parseUnchecked("jid@vysper.org/incorrect"), "Room 1");
fail("Expects IllegalArgumentException");
} catch(IllegalArgumentException e) {
// ok
@@ -143,7 +143,7 @@ public class RoomTestCase extends TestCa
assertNotNull(occupant);
assertEquals(occupantJid1, occupant.getJid());
- assertNull(room.findOccupantByJID(TestUtil.parseUnchecked("dummy@vysper.org")));
+ assertNull(room.findOccupantByJID(EntityImpl.parseUnchecked("dummy@vysper.org")));
}
public void testFindOccupantByNick() {
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/XTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/XTestCase.java?rev=942339&r1=942338&r2=942339&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/XTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/XTestCase.java Sat May 8 08:19:08 2010
@@ -19,20 +19,20 @@
*/
package org.apache.vysper.xmpp.modules.extension.xep0045_muc.stanzas;
-import org.apache.vysper.TestUtil;
+import junit.framework.TestCase;
+
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
-import junit.framework.TestCase;
-
/**
*
* @author The Apache MINA Project (dev@mina.apache.org)
*/
public class XTestCase extends TestCase {
- private static Entity JID = TestUtil.parseUnchecked("jid1@vysper.org");
+ private static Entity JID = EntityImpl.parseUnchecked("jid1@vysper.org");
public void testFromStanza() {
StanzaBuilder builder = StanzaBuilder.createMessageStanza(JID, JID, null, "Foo");