Author: ngn
Date: Sun Sep 6 20:09:38 2009
New Revision: 811874
URL: http://svn.apache.org/viewvc?rev=811874&view=rev
Log:
Fixing broken unit tests for MUC disco
Added:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractComponentInfoDiscoTestCase.java
- copied, changed from r811825,
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractServerInfoDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCComponentInfoDiscoTestCase.java
- copied, changed from r811825,
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCServerInfoDiscoTestCase.java
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractInfoDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractItemsDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomInfoDiscoTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java?rev=811874&r1=811873&r2=811874&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
Sun Sep 6 20:09:38 2009
@@ -19,6 +19,9 @@
*/
package org.apache.vysper.xmpp.modules.extension.xep0045_muc;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.addressing.EntityFormatException;
import org.apache.vysper.xmpp.addressing.EntityImpl;
@@ -32,14 +35,12 @@
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
import
org.apache.vysper.xmpp.modules.extension.xep0045_muc.storage.OccupantStorageProvider;
import
org.apache.vysper.xmpp.modules.extension.xep0045_muc.storage.RoomStorageProvider;
+import
org.apache.vysper.xmpp.modules.servicediscovery.management.ComponentInfoRequestListener;
import org.apache.vysper.xmpp.modules.servicediscovery.management.InfoElement;
import org.apache.vysper.xmpp.modules.servicediscovery.management.InfoRequest;
-import
org.apache.vysper.xmpp.modules.servicediscovery.management.InfoRequestListener;
import org.apache.vysper.xmpp.modules.servicediscovery.management.Item;
import
org.apache.vysper.xmpp.modules.servicediscovery.management.ItemRequestListener;
-import
org.apache.vysper.xmpp.modules.servicediscovery.management.ServerInfoRequestListener;
import
org.apache.vysper.xmpp.modules.servicediscovery.management.ServiceDiscoveryRequestException;
-import
org.apache.vysper.xmpp.modules.servicediscovery.management.ComponentInfoRequestListener;
import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.protocol.StanzaProcessor;
import org.apache.vysper.xmpp.server.ServerRuntimeContext;
@@ -50,9 +51,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.List;
-import java.util.ArrayList;
-
/**
* A module for <a href="http://xmpp.org/extensions/xep-0045.html";>XEP-0045
Multi-user chat</a>.
*
@@ -60,7 +58,7 @@
*/
public class MUCModule
extends DefaultDiscoAwareModule
- implements Component, ComponentInfoRequestListener,
InfoRequestListener, ItemRequestListener {
+ implements Component, ComponentInfoRequestListener,
ItemRequestListener {
private String subdomain = "chat";
private Conference conference;
@@ -147,8 +145,21 @@
List<InfoElement> serverInfos =
conference.getServerInfosFor(request);
return serverInfos;
} else {
- // TODO return room info
- return null;
+ // might be an items request on a room
+ Room room = conference.findRoom(request.getTo().getBareJID());
+ if (room != null) {
+ if (request.getTo().getResource() != null) {
+ // request for an occupant
+ Occupant occupant =
room.findOccupantByNick(request.getTo().getResource());
+ // request for occupant, relay
+ if (occupant != null) {
+ relayDiscoStanza(occupant.getJid(), request,
NamespaceURIs.XEP0030_SERVICE_DISCOVERY_INFO);
+ }
+ } else {
+ return room.getInfosFor(request);
+ }
+ }
+
}
}
return null;
@@ -178,7 +189,7 @@
return componentItem;
}
return null;
- } else if (fullDomain.equals(to)) {
+ } else if (fullDomain.getDomain().equals(to.getDomain())) {
// might be an items request on a room
Room room = conference.findRoom(to.getBareJID());
if (room != null) {
@@ -197,14 +208,6 @@
return null;
}
- /**
- * Make this object available for disco#items requests for rooms
- */
- @Override
- protected void addInfoRequestListeners(List<InfoRequestListener>
infoRequestListeners) {
- infoRequestListeners.add(this);
- }
-
private void relayDiscoStanza(Entity receiver, InfoRequest request, String
ns) {
StanzaBuilder builder =
StanzaBuilder.createIQStanza(request.getFrom(), receiver, IQStanzaType.GET,
request.getID());
builder.startInnerElement("query", ns);
@@ -219,26 +222,7 @@
}
}
-
- public List<InfoElement> getInfosFor(InfoRequest request)
- throws ServiceDiscoveryRequestException {
- Entity to = request.getTo();
-
- if(to.getNode() != null) {
- Room room = conference.findRoom(to.getBareJID());
- if(room != null) {
- if(to.getResource() != null) {
- Occupant occupant =
room.findOccupantByNick(to.getResource());
- // request for occupant, relay
- if(occupant != null) relayDiscoStanza(occupant.getJid(),
request, NamespaceURIs.XEP0030_SERVICE_DISCOVERY_INFO);
- } else {
- // request for room
- return room.getInfosFor(request);
- }
- }
- }
- return null;
- }
+
public String getSubdomain() {
return subdomain;
Copied:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractComponentInfoDiscoTestCase.java
(from r811825,
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractServerInfoDiscoTestCase.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/AbstractComponentInfoDiscoTestCase.java?p2=mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractComponentInfoDiscoTestCase.java&p1=mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractServerInfoDiscoTestCase.java&r1=811825&r2=811874&rev=811874&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractServerInfoDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractComponentInfoDiscoTestCase.java
Sun Sep 6 20:09:38 2009
@@ -20,33 +20,15 @@
package org.apache.vysper.xmpp.modules.extension.xep0045_muc;
import org.apache.vysper.xmpp.addressing.Entity;
-import org.apache.vysper.xmpp.modules.Module;
-import
org.apache.vysper.xmpp.modules.servicediscovery.collection.ServiceCollector;
-import
org.apache.vysper.xmpp.modules.servicediscovery.management.ServerInfoRequestListener;
/**
*
* @author The Apache MINA Project ([email protected])
*/
-public abstract class AbstractServerInfoDiscoTestCase extends
AbstractInfoDiscoTestCase {
+public abstract class AbstractComponentInfoDiscoTestCase extends
AbstractInfoDiscoTestCase {
- protected ServerInfoRequestListener getServerInfoRequestListener() {
- Module module = getModule();
- if(module instanceof ServerInfoRequestListener) {
- return (ServerInfoRequestListener) module;
- } else {
- throw new RuntimeException("Module does not implement
ServerInfoRequestListener");
- }
- }
-
@Override
protected Entity getTo() {
- return SERVER_JID;
- }
-
-
- @Override
- protected void addListener(ServiceCollector serviceCollector) {
-
serviceCollector.addServerInfoRequestListener(getServerInfoRequestListener());
+ return MODULE_JID;
}
}
Modified:
mina/sandbox/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/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java?rev=811874&r1=811873&r2=811874&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java
Sun Sep 6 20:09:38 2009
@@ -30,8 +30,10 @@
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;
+import org.apache.vysper.xmpp.xmlfragment.Renderer;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
/**
@@ -40,9 +42,15 @@
*/
public abstract class AbstractDiscoTestCase extends TestCase {
- protected static final Entity SERVER_JID =
TestUtil.parseUnchecked("vysper.org");
- protected static final Entity MODULE_JID =
TestUtil.parseUnchecked("chat.vysper.org");
- protected static final Entity USER_JID =
TestUtil.parseUnchecked("[email protected]");
+ protected static final String SUBDOMAIN = "chat";
+ 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 DefaultServerRuntimeContext serverRuntimeContext;
+ private ServiceCollector serviceCollector;
protected abstract Module getModule();
@@ -51,26 +59,34 @@
protected abstract StanzaBuilder buildRequest();
- protected abstract void addListener(ServiceCollector serviceCollector);
-
protected abstract IQHandler createDiscoIQHandler();
protected abstract Entity getTo();
+
- public void testDisco() throws Exception {
- ServiceCollector serviceCollector = new ServiceCollector();
- addListener(serviceCollector);
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ serviceCollector = new ServiceCollector();
+ serverRuntimeContext = new DefaultServerRuntimeContext(SERVER_JID,
null);
+
serverRuntimeContext.registerServerRuntimeContextService(serviceCollector);
- DefaultServerRuntimeContext runtimeContext = new
DefaultServerRuntimeContext(SERVER_JID, null);
- runtimeContext.registerServerRuntimeContextService(serviceCollector);
+
+ }
+
+ public void testDisco() throws Exception {
+ serverRuntimeContext.registerComponent((Component) getModule());
IQHandler infoIQHandler = createDiscoIQHandler();
StanzaBuilder request = buildRequest();
- ResponseStanzaContainer resultStanzaContainer =
infoIQHandler.execute(request.getFinalStanza(), runtimeContext, false, new
TestSessionContext(runtimeContext, new SessionStateHolder()), null);
+ ResponseStanzaContainer resultStanzaContainer =
infoIQHandler.execute(request.getFinalStanza(), serverRuntimeContext, false,
new TestSessionContext(serverRuntimeContext, new SessionStateHolder()), null);
Stanza resultStanza = resultStanzaContainer.getResponseStanza();
+ assertEquals("Disco request must not return error", "result",
resultStanza.getAttributeValue("type"));
XMLElement queryElement = resultStanza.getFirstInnerElement();
assertResponse(queryElement);
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractInfoDiscoTestCase.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/AbstractInfoDiscoTestCase.java?rev=811874&r1=811873&r2=811874&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractInfoDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractInfoDiscoTestCase.java
Sun Sep 6 20:09:38 2009
@@ -23,13 +23,9 @@
import java.util.Collections;
import java.util.List;
-import org.apache.vysper.xmpp.addressing.Entity;
-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.modules.servicediscovery.handler.DiscoInfoIQHandler;
import org.apache.vysper.xmpp.modules.servicediscovery.management.Identity;
-import
org.apache.vysper.xmpp.modules.servicediscovery.management.InfoRequestListener;
import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.stanza.IQStanzaType;
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
@@ -42,19 +38,9 @@
*/
public abstract class AbstractInfoDiscoTestCase extends AbstractDiscoTestCase {
- protected InfoRequestListener getInfoRequestListener() {
- Module module = getModule();
- if(module instanceof InfoRequestListener) {
- return (InfoRequestListener) module;
- } else {
- throw new RuntimeException("Module does not implement
InfoRequestListener");
- }
- }
-
protected IQHandler createDiscoIQHandler() {
return new DiscoInfoIQHandler();
}
-
/**
* Default, expect no identity
@@ -71,11 +57,6 @@
}
@Override
- protected void addListener(ServiceCollector serviceCollector) {
- serviceCollector.addInfoRequestListener(getInfoRequestListener());
- }
-
- @Override
protected void assertResponse(XMLElement queryElement)
throws XMLSemanticError {
assertIdentity(queryElement);
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractItemsDiscoTestCase.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/AbstractItemsDiscoTestCase.java?rev=811874&r1=811873&r2=811874&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractItemsDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractItemsDiscoTestCase.java
Sun Sep 6 20:09:38 2009
@@ -26,12 +26,9 @@
import junit.framework.AssertionFailedError;
import org.apache.vysper.xmpp.addressing.EntityFormatException;
-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.modules.servicediscovery.handler.DiscoItemIQHandler;
import org.apache.vysper.xmpp.modules.servicediscovery.management.Item;
-import
org.apache.vysper.xmpp.modules.servicediscovery.management.ItemRequestListener;
import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.stanza.IQStanzaType;
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
@@ -43,15 +40,6 @@
*/
public abstract class AbstractItemsDiscoTestCase extends AbstractDiscoTestCase
{
- protected ItemRequestListener getItemRequestListener() {
- Module module = getModule();
- if(module instanceof ItemRequestListener) {
- return (ItemRequestListener) module;
- } else {
- throw new RuntimeException("Module does not implement
ItemRequestListener");
- }
- }
-
@Override
protected IQHandler createDiscoIQHandler() {
return new DiscoItemIQHandler();
@@ -66,11 +54,6 @@
}
@Override
- protected void addListener(ServiceCollector serviceCollector) {
- serviceCollector.addItemRequestListener(getItemRequestListener());
- }
-
- @Override
protected StanzaBuilder buildRequest() {
StanzaBuilder request = StanzaBuilder.createIQStanza(USER_JID,
getTo(), IQStanzaType.GET, "1");
request.startInnerElement("query",
NamespaceURIs.XEP0030_SERVICE_DISCOVERY_ITEMS).endInnerElement();
Modified:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.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/AbstractMUCOccupantDiscoTestCase.java?rev=811874&r1=811873&r2=811874&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
Sun Sep 6 20:09:38 2009
@@ -31,12 +31,15 @@
super.setUp();
ServiceCollector serviceCollector = new ServiceCollector();
- MUCModule module = new MUCModule(MODULE_JID.getDomain(), conference);
+
sessionContext.getServerRuntimeContext().registerServerRuntimeContextService(serviceCollector);
+
+ MUCModule module = new MUCModule(SUBDOMAIN, conference);
module.initialize(sessionContext.getServerRuntimeContext());
- serviceCollector.addInfoRequestListener(module);
+ sessionContext.getServerRuntimeContext().registerComponent(module);
+
+ serviceCollector.addComponentInfoRequestListener(module);
serviceCollector.addItemRequestListener(module);
-
sessionContext.getServerRuntimeContext().registerServerRuntimeContextService(serviceCollector);
}
protected abstract String getNamespace();
Copied:
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCComponentInfoDiscoTestCase.java
(from r811825,
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCServerInfoDiscoTestCase.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/MUCComponentInfoDiscoTestCase.java?p2=mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCComponentInfoDiscoTestCase.java&p1=mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCServerInfoDiscoTestCase.java&r1=811825&r2=811874&rev=811874&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCServerInfoDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCComponentInfoDiscoTestCase.java
Sun Sep 6 20:09:38 2009
@@ -31,12 +31,22 @@
*
* @author The Apache MINA Project ([email protected])
*/
-public class MUCServerInfoDiscoTestCase extends
AbstractServerInfoDiscoTestCase {
+public class MUCComponentInfoDiscoTestCase extends
AbstractComponentInfoDiscoTestCase {
+
+ private MUCModule module;
@Override
- protected Module getModule() {
+ protected void setUp() throws Exception {
+ super.setUp();
+
Conference conference = new Conference("Foo");
- return new MUCModule(MODULE_JID.getDomain(), conference);
+ module = new MUCModule(SUBDOMAIN, conference);
+ module.initialize(serverRuntimeContext);
+ }
+
+ @Override
+ protected Module getModule() {
+ return module;
}
@Override
Modified:
mina/sandbox/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/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java?rev=811874&r1=811873&r2=811874&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCItemsDiscoTestCase.java
Sun Sep 6 20:09:38 2009
@@ -35,15 +35,27 @@
*/
public class MUCItemsDiscoTestCase extends AbstractItemsDiscoTestCase {
- private static final Entity ROOM1_JID =
TestUtil.parseUnchecked("[email protected]");
- private static final Entity ROME2_JID =
TestUtil.parseUnchecked("[email protected]");
+ private static final Entity ROOM1_JID = TestUtil.parseUnchecked("jid1@" +
MODULE_JID);
+ private static final Entity ROME2_JID = TestUtil.parseUnchecked("jid2@" +
MODULE_JID);
+
+ private MUCModule module;
+
+
@Override
- protected Module getModule() {
+ protected void setUp() throws Exception {
+ super.setUp();
Conference conference = new Conference("Foo");
conference.createRoom(ROOM1_JID, "room1");
conference.createRoom(ROME2_JID, "room2");
- return new MUCModule(MODULE_JID.getDomain(), conference);
+
+ module = new MUCModule(SUBDOMAIN, conference);
+ module.initialize(serverRuntimeContext);
+ }
+
+ @Override
+ protected Module getModule() {
+ return module;
}
@Override
@@ -56,6 +68,6 @@
@Override
protected Entity getTo() {
- return SERVER_JID;
+ return MODULE_JID;
}
}
Modified:
mina/sandbox/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/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomInfoDiscoTestCase.java?rev=811874&r1=811873&r2=811874&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomInfoDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomInfoDiscoTestCase.java
Sun Sep 6 20:09:38 2009
@@ -36,13 +36,23 @@
*/
public class MUCRoomInfoDiscoTestCase extends AbstractInfoDiscoTestCase {
- private static final Entity ROOM_JID =
TestUtil.parseUnchecked("[email protected]");
+ private static final Entity ROOM_JID = TestUtil.parseUnchecked("jid1@" +
MODULEDOMAIN);
+
+ private MUCModule module;
@Override
- protected Module getModule() {
+ protected void setUp() throws Exception {
+ super.setUp();
+
Conference conference = new Conference("Foo");
conference.createRoom(ROOM_JID, "Room1", RoomType.Hidden,
RoomType.PasswordProtected);
- return new MUCModule(MODULE_JID.getDomain(), conference);
+ module = new MUCModule(SUBDOMAIN, conference);
+ module.initialize(serverRuntimeContext);
+ }
+
+ @Override
+ protected Module getModule() {
+ return module;
}
@Override
Modified:
mina/sandbox/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/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java?rev=811874&r1=811873&r2=811874&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCRoomItemsDiscoTestCase.java
Sun Sep 6 20:09:38 2009
@@ -37,7 +37,7 @@
*/
public class MUCRoomItemsDiscoTestCase extends AbstractItemsDiscoTestCase {
- private static final Entity ROOM_JID =
TestUtil.parseUnchecked("[email protected]");
+ private static final Entity ROOM_JID = TestUtil.parseUnchecked("jid1@" +
MODULEDOMAIN);
private static final Entity USER1_JID =
TestUtil.parseUnchecked("[email protected]");
private static final Entity USER2_JID =
TestUtil.parseUnchecked("[email protected]");
@@ -45,14 +45,24 @@
private static final Entity OCCUPANT1_JID = new EntityImpl(ROOM_JID, "Nick
1");
private static final Entity OCCUPANT2_JID = new EntityImpl(ROOM_JID, "Nick
2");
+ private MUCModule module;
@Override
- protected Module getModule() {
+ protected void setUp() throws Exception {
+ super.setUp();
+
Conference conference = new Conference("Foo");
Room room = conference.createRoom(ROOM_JID, "room1");
room.addOccupant(USER1_JID, "Nick 1");
room.addOccupant(USER2_JID, "Nick 2");
- return new MUCModule(MODULE_JID.getDomain(), conference);
+ module = new MUCModule(SUBDOMAIN, conference);
+ module.initialize(serverRuntimeContext);
+
+ }
+
+ @Override
+ protected Module getModule() {
+ return module;
}
@Override
