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 17:34:31 UTC
svn commit: r1341073 - in
/mina/vysper/trunk/server/extensions/xep0045-muc/src:
main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/
test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/
test/java/org/apache/vysper/xmpp/modul...
Author: berndf
Date: Mon May 21 15:34:30 2012
New Revision: 1341073
URL: http://svn.apache.org/viewvc?rev=1341073&view=rev
Log:
MUC improvement: make test-specific methods available to tests, specifically.
Added:
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/ConferenceTestUtils.java
Modified:
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/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/BanUserTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ChangeSubjectTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/EnterRoomTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ExitRoomTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantAdminTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantMembershipTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantModeratorTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantOwnershipTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantVoiceTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MessageTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ModeratorKickOccupantTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RequestVoiceTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeAdminTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeMembershipTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeModeratorTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeOwnershipTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeVoiceTestCase.java
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=1341073&r1=1341072&r2=1341073&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 15:34:30 2012
@@ -21,6 +21,7 @@ package org.apache.vysper.xmpp.modules.e
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import org.apache.vysper.xmpp.addressing.Entity;
@@ -60,15 +61,14 @@ public class Conference implements Serve
public void initialize() {
roomStorageProvider.initialize();
- if (occupantStorageProvider != null)
- occupantStorageProvider.initialize();
+ if (occupantStorageProvider != null) occupantStorageProvider.initialize();
}
- public Collection<Room> getAllRooms() {
- return roomStorageProvider.getAllRooms();
+ /*package*/ Collection<Room> getAllRooms() {
+ return Collections.unmodifiableCollection(roomStorageProvider.getAllRooms());
}
- public Room createRoom(Entity jid, String name, RoomType... types) {
+ public synchronized Room createRoom(Entity jid, String name, RoomType... types) {
if (roomStorageProvider.roomExists(jid)) {
throw new IllegalArgumentException("Room already exists with JID: " + jid);
}
@@ -78,21 +78,12 @@ public class Conference implements Serve
public void deleteRoom(Entity jid) {
roomStorageProvider.deleteRoom(jid);
-
}
public Room findRoom(Entity jid) {
return roomStorageProvider.findRoom(jid);
}
- public Room findOrCreateRoom(Entity jid, String name, RoomType... types) {
- Room room = findRoom(jid);
- if (room == null) {
- room = createRoom(jid, name, types);
- }
- return room;
- }
-
public OccupantStorageProvider getOccupantStorageProvider() {
return occupantStorageProvider;
}
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=1341073&r1=1341072&r2=1341073&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 15:34:30 2012
@@ -83,6 +83,7 @@ public class DiscussionHistory {
if (maxchars == 0 || maxstanzas == 0 || seconds == 0) {
// quick return for no-stanza requests
+ return Collections.emptyList();
} else {
int counter = 0;
int totalChars = 0;
Modified: mina/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/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java Mon May 21 15:34:30 2012
@@ -22,6 +22,7 @@ package org.apache.vysper.xmpp.modules.e
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.handler.AbstractMUCHandlerTestCase;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
import org.apache.vysper.xmpp.modules.servicediscovery.collection.ServiceCollector;
import org.apache.vysper.xmpp.protocol.ProtocolException;
@@ -64,7 +65,7 @@ public abstract class AbstractMUCOccupan
public void testDisco() throws Exception {
// add occupants to the room
- Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM1_JID, "Room 1");
room.addOccupant(OCCUPANT1_JID, "nick");
room.addOccupant(OCCUPANT2_JID, "Nick 2");
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/BanUserTestCase.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/BanUserTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/BanUserTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/BanUserTestCase.java Mon May 21 15:34:30 2012
@@ -26,6 +26,7 @@ import org.apache.vysper.xml.fragment.XM
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.StanzaAssert;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -47,7 +48,7 @@ import org.junit.Assert;
public class BanUserTestCase extends AbstractAffiliationTestCase {
public void testBanUser() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
@@ -75,7 +76,7 @@ public class BanUserTestCase extends Abs
}
public void testNonAdmin() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
occupant1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Member);
@@ -86,7 +87,7 @@ public class BanUserTestCase extends Abs
}
public void testAdminBanningOwner() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
occupant1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
@@ -98,7 +99,7 @@ public class BanUserTestCase extends Abs
}
public void testGetBanList() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
@@ -123,7 +124,7 @@ public class BanUserTestCase extends Abs
}
public void testGetBanListNonAdmin() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Member);
// send message to room
@@ -138,7 +139,7 @@ public class BanUserTestCase extends Abs
}
public void testSetBanList() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ChangeSubjectTestCase.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/ChangeSubjectTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ChangeSubjectTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ChangeSubjectTestCase.java Mon May 21 15:34:30 2012
@@ -22,6 +22,7 @@ package org.apache.vysper.xmpp.modules.e
import static org.apache.vysper.xmpp.stanza.MessageStanzaType.GROUPCHAT;
import org.apache.vysper.xml.fragment.XMLElementBuilder;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.RoomType;
@@ -36,7 +37,7 @@ public class ChangeSubjectTestCase exten
private static final String SUBJECT = "Subject";
public void testChangeSubjectNonModeratorAllowed() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2", RoomType.OpenSubject);
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2", RoomType.OpenSubject);
room.addOccupant(OCCUPANT1_JID, "nick");
room.addOccupant(OCCUPANT2_JID, "Nick 2");
@@ -51,7 +52,7 @@ public class ChangeSubjectTestCase exten
}
public void testChangeSubject() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
room.addOccupant(OCCUPANT1_JID, "nick").setRole(Role.Moderator);
room.addOccupant(OCCUPANT2_JID, "Nick 2");
@@ -66,7 +67,7 @@ public class ChangeSubjectTestCase exten
}
public void testChangeSubjectNonModerator() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
room.addOccupant(OCCUPANT1_JID, "nick");
room.addOccupant(OCCUPANT2_JID, "Nick 2");
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/EnterRoomTestCase.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/EnterRoomTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/EnterRoomTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/EnterRoomTestCase.java Mon May 21 15:34:30 2012
@@ -28,6 +28,7 @@ import org.apache.vysper.xml.fragment.XM
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.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -235,7 +236,7 @@ public class EnterRoomTestCase extends A
public void testEnterRoomWithRelays() throws Exception {
// add one occupant to the room
- Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM1_JID, "Room 1");
room.addOccupant(OCCUPANT2_JID, "Some nick");
// now, let user 1 enter room
@@ -279,7 +280,7 @@ public class EnterRoomTestCase extends A
public void testDiscussionHistory() throws Exception {
// add some messages
- Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM1_JID, "Room 1");
room.getHistory().append(
StanzaBuilder.createMessageStanza(OCCUPANT2_JID, ROOM1_JID, MessageStanzaType.GROUPCHAT, null, "Body")
.build(), new Occupant(OCCUPANT2_JID, "nick2", room, Role.Participant));
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ExitRoomTestCase.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/ExitRoomTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ExitRoomTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ExitRoomTestCase.java Mon May 21 15:34:30 2012
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xml.fragment.XMLSemanticError;
import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
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.xep0045_muc.model.RoomType;
@@ -108,7 +109,7 @@ public class ExitRoomTestCase extends Ab
public void testExitRoomWithRelays() throws Exception {
// add occupants to the room
- Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM1_JID, "Room 1");
room.addOccupant(OCCUPANT1_JID, "Nick 1");
room.addOccupant(OCCUPANT2_JID, "Nick 2");
@@ -124,7 +125,7 @@ public class ExitRoomTestCase extends Ab
String statusMessage = "Custom status";
// add occupants to the room
- Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM1_JID, "Room 1");
room.addOccupant(OCCUPANT1_JID, "Nick 1");
room.addOccupant(OCCUPANT2_JID, "Nick 2");
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantAdminTestCase.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/GrantAdminTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantAdminTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantAdminTestCase.java Mon May 21 15:34:30 2012
@@ -23,6 +23,7 @@ import static org.apache.vysper.xmpp.sta
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -37,7 +38,7 @@ import org.apache.vysper.xmpp.stanza.Sta
public class GrantAdminTestCase extends AbstractAffiliationTestCase {
public void testGrantAdminByNick() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Owner);
@@ -62,7 +63,7 @@ public class GrantAdminTestCase extends
// Test granting membership for a user which is not currently in the room
public void testGrantAdminByJid() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Owner);
@@ -81,7 +82,7 @@ public class GrantAdminTestCase extends
}
public void testNonOwner() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
occupant1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantMembershipTestCase.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/GrantMembershipTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantMembershipTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantMembershipTestCase.java Mon May 21 15:34:30 2012
@@ -23,6 +23,7 @@ import static org.apache.vysper.xmpp.sta
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -37,7 +38,7 @@ import org.apache.vysper.xmpp.stanza.Sta
public class GrantMembershipTestCase extends AbstractAffiliationTestCase {
public void testGrantMembershipByNick() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
@@ -62,7 +63,7 @@ public class GrantMembershipTestCase ext
// Test granting membership for a user which is not currently in the room
public void testGrantMembershipByJid() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
@@ -81,7 +82,7 @@ public class GrantMembershipTestCase ext
}
public void testNonAdmin() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
occupant1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Member);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantModeratorTestCase.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/GrantModeratorTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantModeratorTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantModeratorTestCase.java Mon May 21 15:34:30 2012
@@ -23,6 +23,7 @@ import static org.apache.vysper.xmpp.sta
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -37,7 +38,7 @@ import org.apache.vysper.xmpp.stanza.Sta
public class GrantModeratorTestCase extends AbstractGrantRevokeTestCase {
public void testGrantVoice() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
@@ -61,7 +62,7 @@ public class GrantModeratorTestCase exte
}
public void testMemberAttemptGrantModerator() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Member);
occupant1.setRole(Role.Moderator);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantOwnershipTestCase.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/GrantOwnershipTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantOwnershipTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantOwnershipTestCase.java Mon May 21 15:34:30 2012
@@ -23,6 +23,7 @@ import static org.apache.vysper.xmpp.sta
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -37,7 +38,7 @@ import org.apache.vysper.xmpp.stanza.Sta
public class GrantOwnershipTestCase extends AbstractAffiliationTestCase {
public void testGrantOwnershipByNick() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Owner);
@@ -62,7 +63,7 @@ public class GrantOwnershipTestCase exte
// Test granting membership for a user which is not currently in the room
public void testGrantMembershipByJid() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Owner);
@@ -81,7 +82,7 @@ public class GrantOwnershipTestCase exte
}
public void testNonOwner() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
occupant1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantVoiceTestCase.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/GrantVoiceTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantVoiceTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/GrantVoiceTestCase.java Mon May 21 15:34:30 2012
@@ -23,6 +23,7 @@ import static org.apache.vysper.xmpp.sta
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -37,7 +38,7 @@ import org.apache.vysper.xmpp.stanza.IQS
public class GrantVoiceTestCase extends AbstractMUCHandlerTestCase {
public void testGrantVoice() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Member);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MessageTestCase.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/MessageTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MessageTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MessageTestCase.java Mon May 21 15:34:30 2012
@@ -24,6 +24,7 @@ import static org.apache.vysper.xmpp.sta
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xml.fragment.XMLElementBuilder;
import org.apache.vysper.xmpp.addressing.EntityImpl;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -42,7 +43,7 @@ import org.apache.vysper.xmpp.stanza.Sta
public class MessageTestCase extends AbstractMUCMessageHandlerTestCase {
public void testMessageWithNoVoice() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM1_JID, "Room 1");
Occupant occupant = room.addOccupant(OCCUPANT1_JID, "nick");
// make sure the occupant has no voice
occupant.setRole(Role.Visitor);
@@ -51,7 +52,7 @@ public class MessageTestCase extends Abs
}
public void testMessageUserNotOccupant() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM1_JID, "Room 1");
// do not add user to room
testNotAllowedMessage(room, StanzaErrorCondition.NOT_ACCEPTABLE);
@@ -61,7 +62,7 @@ public class MessageTestCase extends Abs
String body = "Message body";
// add occupants to the room
- Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM1_JID, "Room 1");
room.addOccupant(OCCUPANT1_JID, "nick");
room.addOccupant(OCCUPANT2_JID, "Nick 2");
@@ -77,7 +78,7 @@ public class MessageTestCase extends Abs
String body = "Message body";
// add occupants to the room
- Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM1_JID, "Room 1");
room.addOccupant(OCCUPANT1_JID, "nick");
room.addOccupant(OCCUPANT2_JID, "Nick 2");
@@ -91,7 +92,7 @@ public class MessageTestCase extends Abs
public void testGroupChatMessageToOccupant() throws Exception {
// add occupants to the room
- Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM1_JID, "Room 1");
room.addOccupant(OCCUPANT1_JID, "nick");
room.addOccupant(OCCUPANT2_JID, "Nick 2");
@@ -112,7 +113,7 @@ public class MessageTestCase extends Abs
String reason = "Join me!";
// add occupants to the room
- Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM1_JID, "Room 1");
room.setPassword("secret");
room.addOccupant(OCCUPANT1_JID, "nick");
@@ -130,7 +131,7 @@ public class MessageTestCase extends Abs
String reason = "No way";
// add occupants to the room
- Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM1_JID, "Room 1");
room.addOccupant(OCCUPANT2_JID, "nick");
Decline decline = new Decline(null, OCCUPANT2_JID, reason);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ModeratorKickOccupantTestCase.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/ModeratorKickOccupantTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ModeratorKickOccupantTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/ModeratorKickOccupantTestCase.java Mon May 21 15:34:30 2012
@@ -23,6 +23,7 @@ import static org.apache.vysper.xmpp.sta
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -39,7 +40,7 @@ import org.apache.vysper.xmpp.stanza.Sta
public class ModeratorKickOccupantTestCase extends AbstractGrantRevokeTestCase {
public void testKickUser() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
room.addOccupant(OCCUPANT1_JID, "nick").setRole(Role.Moderator);
room.addOccupant(OCCUPANT2_JID, "Nick 2");
@@ -63,7 +64,7 @@ public class ModeratorKickOccupantTestCa
}
public void testMemberAttemptKickAdmin() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Member);
occupant1.setRole(Role.Moderator);
@@ -75,7 +76,7 @@ public class ModeratorKickOccupantTestCa
}
public void testMemberAttemptKickOwner() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Member);
occupant1.setRole(Role.Moderator);
@@ -87,7 +88,7 @@ public class ModeratorKickOccupantTestCa
}
public void testAdminAttemptKickOwner() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
occupant1.setRole(Role.Moderator);
@@ -99,7 +100,7 @@ public class ModeratorKickOccupantTestCa
}
public void testToKickYourself() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
occupant1.setRole(Role.Moderator);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RequestVoiceTestCase.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/RequestVoiceTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RequestVoiceTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RequestVoiceTestCase.java Mon May 21 15:34:30 2012
@@ -25,6 +25,7 @@ import static org.apache.vysper.xmpp.sta
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.dataforms.VoiceRequestForm;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -39,7 +40,7 @@ import org.apache.vysper.xmpp.stanza.dat
public class RequestVoiceTestCase extends AbstractMUCMessageHandlerTestCase {
public void testRequestVoice() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM1_JID, "Room 1");
Occupant moderator = room.addOccupant(OCCUPANT1_JID, "nick");
moderator.setRole(Role.Moderator);
@@ -59,7 +60,7 @@ public class RequestVoiceTestCase extend
}
public void testGrantVoice() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM1_JID, "Room 1");
Occupant moderator = room.addOccupant(OCCUPANT1_JID, "nick");
moderator.setRole(Role.Moderator);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeAdminTestCase.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/RevokeAdminTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeAdminTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeAdminTestCase.java Mon May 21 15:34:30 2012
@@ -23,6 +23,7 @@ import static org.apache.vysper.xmpp.sta
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -38,7 +39,7 @@ import org.apache.vysper.xmpp.stanza.Sta
public class RevokeAdminTestCase extends AbstractAffiliationTestCase {
public void testRevokeOwnershipByNick() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2", RoomType.MembersOnly);
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2", RoomType.MembersOnly);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Owner);
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
@@ -66,7 +67,7 @@ public class RevokeAdminTestCase extends
// Test granting membership for a user which is not currently in the room
public void testRevokeMembershipByJid() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Owner);
@@ -87,7 +88,7 @@ public class RevokeAdminTestCase extends
}
public void testNonOwner() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
occupant1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeMembershipTestCase.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/RevokeMembershipTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeMembershipTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeMembershipTestCase.java Mon May 21 15:34:30 2012
@@ -23,6 +23,7 @@ import static org.apache.vysper.xmpp.sta
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -40,7 +41,7 @@ import org.apache.vysper.xmpp.stanza.Sta
public class RevokeMembershipTestCase extends AbstractAffiliationTestCase {
public void testRevokeMembershipByNick() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2", RoomType.MembersOnly);
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2", RoomType.MembersOnly);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
@@ -67,7 +68,7 @@ public class RevokeMembershipTestCase ex
// Test granting membership for a user which is not currently in the room
public void testRevokeMembershipByJid() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
@@ -88,7 +89,7 @@ public class RevokeMembershipTestCase ex
}
public void testNonAdmin() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
occupant1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Member);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeModeratorTestCase.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/RevokeModeratorTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeModeratorTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeModeratorTestCase.java Mon May 21 15:34:30 2012
@@ -23,6 +23,7 @@ import static org.apache.vysper.xmpp.sta
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -37,7 +38,7 @@ import org.apache.vysper.xmpp.stanza.Sta
public class RevokeModeratorTestCase extends AbstractGrantRevokeTestCase {
public void testRevokeModerator() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
@@ -61,7 +62,7 @@ public class RevokeModeratorTestCase ext
}
public void testMemberAttemptRevokeModerator() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Member);
occupant1.setRole(Role.Moderator);
@@ -72,7 +73,7 @@ public class RevokeModeratorTestCase ext
}
public void testAttemptRevokeOwnerModerator() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Owner);
occupant1.setRole(Role.Moderator);
@@ -85,7 +86,7 @@ public class RevokeModeratorTestCase ext
}
public void testAttemptRevokeAdminModerator() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
occupant1.setRole(Role.Moderator);
@@ -98,7 +99,7 @@ public class RevokeModeratorTestCase ext
}
public void testToRevokeYourself() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
occupant1.setRole(Role.Moderator);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeOwnershipTestCase.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/RevokeOwnershipTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeOwnershipTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeOwnershipTestCase.java Mon May 21 15:34:30 2012
@@ -23,6 +23,7 @@ import static org.apache.vysper.xmpp.sta
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -38,7 +39,7 @@ import org.apache.vysper.xmpp.stanza.Sta
public class RevokeOwnershipTestCase extends AbstractAffiliationTestCase {
public void testRevokeOwnershipByNick() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2", RoomType.MembersOnly);
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2", RoomType.MembersOnly);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Owner);
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
@@ -65,7 +66,7 @@ public class RevokeOwnershipTestCase ext
// Test granting membership for a user which is not currently in the room
public void testRevokeMembershipByJid() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Owner);
@@ -86,7 +87,7 @@ public class RevokeOwnershipTestCase ext
}
public void testNonOwner() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
occupant1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeVoiceTestCase.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/RevokeVoiceTestCase.java?rev=1341073&r1=1341072&r2=1341073&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeVoiceTestCase.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/RevokeVoiceTestCase.java Mon May 21 15:34:30 2012
@@ -23,6 +23,7 @@ import static org.apache.vysper.xmpp.sta
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Affiliation;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.ConferenceTestUtils;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Occupant;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
@@ -37,7 +38,7 @@ import org.apache.vysper.xmpp.stanza.Sta
public class RevokeVoiceTestCase extends AbstractGrantRevokeTestCase {
public void testRevokeVoice() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occ1 = room.addOccupant(OCCUPANT1_JID, "nick");
occ1.setRole(Role.Moderator);
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Member);
@@ -61,7 +62,7 @@ public class RevokeVoiceTestCase extends
}
public void testMemberAttemptRevokeAdmin() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Member);
@@ -74,7 +75,7 @@ public class RevokeVoiceTestCase extends
}
public void testMemberAttemptRevokeOwner() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Member);
occupant1.setRole(Role.Moderator);
@@ -86,7 +87,7 @@ public class RevokeVoiceTestCase extends
}
public void testAdminAttemptRevokeOwner() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
room.getAffiliations().add(OCCUPANT1_JID, Affiliation.Admin);
occupant1.setRole(Role.Moderator);
@@ -98,7 +99,7 @@ public class RevokeVoiceTestCase extends
}
public void testToKickYourself() throws Exception {
- Room room = conference.findOrCreateRoom(ROOM2_JID, "Room 2");
+ Room room = ConferenceTestUtils.findOrCreateRoom(conference, ROOM2_JID, "Room 2");
Occupant occupant1 = room.addOccupant(OCCUPANT1_JID, "nick");
occupant1.setRole(Role.Moderator);
Added: mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/ConferenceTestUtils.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/ConferenceTestUtils.java?rev=1341073&view=auto
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/ConferenceTestUtils.java (added)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/ConferenceTestUtils.java Mon May 21 15:34:30 2012
@@ -0,0 +1,17 @@
+package org.apache.vysper.xmpp.modules.extension.xep0045_muc.model;
+
+import org.apache.vysper.xmpp.addressing.Entity;
+
+/**
+ */
+public class ConferenceTestUtils {
+
+ public static Room findOrCreateRoom(Conference conference, Entity jid, String name, RoomType... types) {
+ Room room = conference.findRoom(jid);
+ if (room == null) {
+ room = conference.createRoom(jid, name, types);
+ }
+ return room;
+ }
+
+}