You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by be...@apache.org on 2012/05/21 18:31:02 UTC
svn commit: r1341098 - in
/mina/vysper/trunk/server/extensions/xep0045-muc/src:
main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/
main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/
main/java/org/apache/vysper/xmpp/modul...
Author: berndf
Date: Mon May 21 16:31:01 2012
New Revision: 1341098
URL: http://svn.apache.org/viewvc?rev=1341098&view=rev
Log:
VYSPER-312: introduce MUCFeatures, making room history length and nick rewriting configurable
Added:
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCFeatures.java
Modified:
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Conference.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionHistory.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Room.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/storage/InMemoryRoomStorageProvider.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/storage/RoomStorageProvider.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCComponentInfoDiscoTestCase.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/MUCPresenceHandlerVerifyTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/ConferenceTestCase.java
Added: mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCFeatures.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCFeatures.java?rev=1341098&view=auto
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCFeatures.java (added)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCFeatures.java Mon May 21 16:31:01 2012
@@ -0,0 +1,26 @@
+package org.apache.vysper.xmpp.modules.extension.xep0045_muc;
+
+/**
+ */
+public class MUCFeatures {
+
+ protected boolean rewriteDuplicateNick = true;
+
+ protected int maxRoomHisotryItems = 20;
+
+ public boolean isRewriteDuplicateNick() {
+ return rewriteDuplicateNick;
+ }
+
+ public void setRewriteDuplicateNick(boolean rewriteDuplicateNick) {
+ this.rewriteDuplicateNick = rewriteDuplicateNick;
+ }
+
+ public int getMaxRoomHistoryItems() {
+ return maxRoomHisotryItems;
+ }
+
+ public void setMaxRoomHistoryItems(int maxRoomHisotryItems) {
+ this.maxRoomHisotryItems = maxRoomHisotryItems;
+ }
+}
Modified: mina/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/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java?rev=1341098&r1=1341097&r2=1341098&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java Mon May 21 16:31:01 2012
@@ -59,9 +59,11 @@ import org.slf4j.LoggerFactory;
public class MUCModule extends DefaultDiscoAwareModule implements Component, ComponentInfoRequestListener,
ItemRequestListener {
- private String subdomain = "chat";
+ private final MUCFeatures mucFeatures = new MUCFeatures();
+
+ private final String subdomain;
- private Conference conference;
+ private final Conference conference;
private Entity fullDomain;
@@ -72,15 +74,17 @@ public class MUCModule extends DefaultDi
private ComponentStanzaProcessor stanzaProcessor;
public MUCModule(String subdomain) {
- this(subdomain, new Conference("Conference"));
+ this(subdomain, null);
}
public MUCModule() {
- this.conference = new Conference("Conference");
+ this(null, null);
}
public MUCModule(String subdomain, Conference conference) {
+ if (subdomain == null) subdomain = "chat";
this.subdomain = subdomain;
+ if (conference == null) conference = new Conference("Conference", mucFeatures);
this.conference = conference;
}
@@ -131,6 +135,10 @@ public class MUCModule extends DefaultDi
return "1.24";
}
+ public MUCFeatures getFeatures() {
+ return mucFeatures;
+ }
+
/**
* Make this object available for disco#items requests.
*/
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Conference.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Conference.java?rev=1341098&r1=1341097&r2=1341098&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Conference.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Conference.java Mon May 21 16:31:01 2012
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCFeatures;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.storage.InMemoryOccupantStorageProvider;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.storage.InMemoryRoomStorageProvider;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.storage.OccupantStorageProvider;
@@ -45,18 +46,21 @@ import org.apache.vysper.xmpp.protocol.N
*/
public class Conference implements ServerInfoRequestListener, ItemRequestListener {
- private String name;
+ protected String name;
+ protected final MUCFeatures mucFeatures;
+
private RoomStorageProvider roomStorageProvider = new InMemoryRoomStorageProvider();
private OccupantStorageProvider occupantStorageProvider = new InMemoryOccupantStorageProvider();
- public Conference(String name) {
+ public Conference(String name, MUCFeatures mucFeatures) {
if (name == null || name.trim().length() == 0) {
throw new IllegalArgumentException("Name must not be null or empty");
}
-
this.name = name;
+
+ this.mucFeatures = mucFeatures;
}
public void initialize() {
@@ -73,7 +77,7 @@ public class Conference implements Serve
throw new IllegalArgumentException("Room already exists with JID: " + jid);
}
- return roomStorageProvider.createRoom(jid, name, types);
+ return roomStorageProvider.createRoom(mucFeatures, jid, name, types);
}
public void deleteRoom(Entity jid) {
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionHistory.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionHistory.java?rev=1341098&r1=1341097&r2=1341098&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionHistory.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionHistory.java Mon May 21 16:31:01 2012
@@ -59,16 +59,20 @@ public class DiscussionHistory {
}
// check if size is over limits
- if (getSize() > maxItems) {
- items.remove(0);
+ while (maxItems != -1 && getSize() > maxItems) {
+ items.remove(0); // oldest
}
}
}
+ public void setMaxItems(int maxItems) {
+ if (maxItems < -1) maxItems = -1;
+ this.maxItems = maxItems;
+ }
+
private int getSize() {
int size = items.size();
- if (subjectMessage != null)
- size++;
+ if (subjectMessage != null) size++;
return size;
}
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Room.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Room.java?rev=1341098&r1=1341097&r2=1341098&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Room.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/Room.java Mon May 21 16:31:01 2012
@@ -116,6 +116,10 @@ public class Room implements InfoRequest
this.rewriteDuplicateNick = rewriteDuplicateNick;
}
+ public void setMaxRoomHistoryItems(int maxItems) {
+ history.setMaxItems(maxItems);
+ }
+
public Occupant addOccupant(Entity occupantJid, String name) {
Affiliation affiliation = affiliations.getAffiliation(occupantJid);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/storage/InMemoryRoomStorageProvider.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/storage/InMemoryRoomStorageProvider.java?rev=1341098&r1=1341097&r2=1341098&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/storage/InMemoryRoomStorageProvider.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/storage/InMemoryRoomStorageProvider.java Mon May 21 16:31:01 2012
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCFeatures;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.RoomType;
@@ -40,8 +41,10 @@ public class InMemoryRoomStorageProvider
// do nothing
}
- public Room createRoom(Entity jid, String name, RoomType... roomTypes) {
+ public Room createRoom(MUCFeatures mucFeatures, Entity jid, String name, RoomType... roomTypes) {
Room room = new Room(jid, name, roomTypes);
+ room.setRewriteDuplicateNick(mucFeatures.isRewriteDuplicateNick());
+ room.setMaxRoomHistoryItems(mucFeatures.getMaxRoomHistoryItems());
rooms.put(jid, room);
return room;
}
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/storage/RoomStorageProvider.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/storage/RoomStorageProvider.java?rev=1341098&r1=1341097&r2=1341098&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/storage/RoomStorageProvider.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/storage/RoomStorageProvider.java Mon May 21 16:31:01 2012
@@ -23,6 +23,7 @@ import java.util.Collection;
import org.apache.vysper.storage.StorageProvider;
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCFeatures;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.RoomType;
@@ -30,7 +31,7 @@ public interface RoomStorageProvider ext
void initialize();
- Room createRoom(Entity jid, String name, RoomType... roomTypes);
+ Room createRoom(MUCFeatures mucFeatures, Entity jid, String name, RoomType... roomTypes);
Collection<Room> getAllRooms();
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCComponentInfoDiscoTestCase.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/MUCComponentInfoDiscoTestCase.java?rev=1341098&r1=1341097&r2=1341098&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCComponentInfoDiscoTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCComponentInfoDiscoTestCase.java Mon May 21 16:31:01 2012
@@ -39,7 +39,9 @@ public class MUCComponentInfoDiscoTestCa
protected void setUp() throws Exception {
super.setUp();
- Conference conference = new Conference("Foo");
+ final MUCFeatures mucFeatures = new MUCFeatures();
+ mucFeatures.setMaxRoomHistoryItems(20);
+ Conference conference = new Conference("Foo", mucFeatures);
module = new MUCModule(SUBDOMAIN, conference);
module.initialize(serverRuntimeContext);
}
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=1341098&r1=1341097&r2=1341098&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 Mon May 21 16:31:01 2012
@@ -44,7 +44,7 @@ public class MUCItemsDiscoTestCase exten
@Override
protected void setUp() throws Exception {
super.setUp();
- Conference conference = new Conference("Foo");
+ Conference conference = new Conference("Foo", new MUCFeatures());
conference.createRoom(ROOM1_JID, "room1");
conference.createRoom(ROME2_JID, "room2");
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=1341098&r1=1341097&r2=1341098&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 Mon May 21 16:31:01 2012
@@ -44,7 +44,7 @@ public class MUCRoomInfoDiscoTestCase ex
protected void setUp() throws Exception {
super.setUp();
- Conference conference = new Conference("Foo");
+ Conference conference = new Conference("Foo", new MUCFeatures());
conference.createRoom(ROOM_JID, "Room1", RoomType.Hidden, RoomType.PasswordProtected);
module = new MUCModule(SUBDOMAIN, conference);
module.initialize(serverRuntimeContext);
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=1341098&r1=1341097&r2=1341098&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 Mon May 21 16:31:01 2012
@@ -52,7 +52,7 @@ public class MUCRoomItemsDiscoTestCase e
protected void setUp() throws Exception {
super.setUp();
- Conference conference = new Conference("Foo");
+ Conference conference = new Conference("Foo", new MUCFeatures());
Room room = conference.createRoom(ROOM_JID, "room1");
room.addOccupant(USER1_JID, "Nick 1");
room.addOccupant(USER2_JID, "Nick 2");
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=1341098&r1=1341097&r2=1341098&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 Mon May 21 16:31:01 2012
@@ -32,6 +32,7 @@ import org.apache.vysper.xmpp.addressing
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.MUCFeatures;
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.modules.extension.xep0045_muc.stanzas.MucUserItem;
@@ -81,7 +82,7 @@ public abstract class AbstractMUCHandler
protected StanzaHandler handler;
- protected Conference conference = new Conference("foo");
+ protected Conference conference;
protected StanzaReceiverQueue occupant1Queue = new StanzaReceiverQueue();
@@ -89,6 +90,8 @@ public abstract class AbstractMUCHandler
@Override
protected void setUp() throws Exception {
+ conference = new Conference("foo", new MUCFeatures());
+
sessionContext = TestSessionContext.createWithStanzaReceiverRelayAuthenticated();
sessionContext.setInitiatingEntity(OCCUPANT1_JID);
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=1341098&r1=1341097&r2=1341098&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 Mon May 21 16:31:01 2012
@@ -23,6 +23,7 @@ import junit.framework.TestCase;
import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.addressing.EntityImpl;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCFeatures;
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;
@@ -39,7 +40,7 @@ public class MUCPresenceHandlerVerifyTes
@Override
protected void setUp() throws Exception {
- Conference conference = new Conference("foo");
+ Conference conference = new Conference("foo", new MUCFeatures());
presenceHandler = new MUCPresenceHandler(conference);
}
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=1341098&r1=1341097&r2=1341098&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 Mon May 21 16:31:01 2012
@@ -27,6 +27,7 @@ import junit.framework.TestCase;
import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.addressing.EntityImpl;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCFeatures;
/**
*
@@ -39,13 +40,15 @@ public class ConferenceTestCase extends
private Entity jid2 = EntityImpl.parseUnchecked("jid2@vysper.org");
public void testGetName() {
- Conference conference = new Conference("foo");
+ final MUCFeatures mucFeatures = new MUCFeatures();
+ mucFeatures.setMaxRoomHistoryItems(20);
+ Conference conference = new Conference("foo", mucFeatures);
assertEquals("foo", conference.getName());
}
public void testConstructNullName() {
try {
- new Conference(null);
+ new Conference(null, new MUCFeatures());
fail("Expecting IllegalArgumentException");
} catch (IllegalArgumentException e) {
// ok
@@ -54,7 +57,7 @@ public class ConferenceTestCase extends
public void testConstructEmptyName() {
try {
- new Conference("");
+ new Conference("", new MUCFeatures());
fail("Expecting IllegalArgumentException");
} catch (IllegalArgumentException e) {
// ok
@@ -63,7 +66,7 @@ public class ConferenceTestCase extends
public void testConstructWhitespaceName() {
try {
- new Conference("\t ");
+ new Conference("\t ", new MUCFeatures());
fail("Expecting IllegalArgumentException");
} catch (IllegalArgumentException e) {
// ok
@@ -71,7 +74,7 @@ public class ConferenceTestCase extends
}
public void testCreateGetRooms() {
- Conference conference = new Conference("foo");
+ Conference conference = new Conference("foo", new MUCFeatures());
conference.createRoom(jid1, "room1");
conference.createRoom(jid2, "room2");
@@ -86,7 +89,7 @@ public class ConferenceTestCase extends
}
public void testCreateDuplicateRooms() throws Exception {
- Conference conference = new Conference("foo");
+ Conference conference = new Conference("foo", new MUCFeatures());
conference.createRoom(jid1, "room1");
try {
// make sure we use a different JID instance