Author: ngn
Date: Thu Aug 26 20:31:48 2010
New Revision: 989916
URL: http://svn.apache.org/viewvc?rev=989916&view=rev
Log:
Adding integration test case for moderation (NOTE! currently fails)
Added:
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractMUCIntegrationTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/EnterExitRoomIntegrationTestCase.java
- copied, changed from r958281,
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/ModerationIntegrationTestCase.java
Added:
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractMUCIntegrationTestCase.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractMUCIntegrationTestCase.java?rev=989916&view=auto
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractMUCIntegrationTestCase.java
(added)
+++
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/AbstractMUCIntegrationTestCase.java
Thu Aug 26 20:31:48 2010
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.vysper.xmpp.modules.extension.xep0045_muc.inttest;
+
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCModule;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Conference;
+import org.apache.vysper.xmpp.server.XMPPServer;
+import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smackx.muc.MultiUserChat;
+
+/**
+ */
+public class AbstractMUCIntegrationTestCase extends
AbstractIntegrationTestCase {
+
+ protected static final String NICK1 = "Nick";
+
+ protected static final String NICK2 = "Nick2";
+
+ protected static final String MUC_SUBDOMAIN = "chat";
+
+ protected static final String ROOM_JID = "[email protected]";
+
+ protected Conference conference = new Conference("test conference");
+
+ protected XMPPConnection client2;
+
+ protected MultiUserChat chat;
+
+ protected MultiUserChat chat2;
+
+ @Override
+ protected void addModules(XMPPServer server) {
+ server.addModule(new MUCModule(MUC_SUBDOMAIN, conference));
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ client2 = connectClient(port, TEST_USERNAME2, TEST_PASSWORD2);
+
+ chat = new MultiUserChat(client, ROOM_JID);
+ chat2 = new MultiUserChat(client2, ROOM_JID);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ try {
+ client2.disconnect();
+ } catch (Exception ignored) {
+ ;
+ }
+
+ super.tearDown();
+ }
+
+
+}
Copied:
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/EnterExitRoomIntegrationTestCase.java
(from r958281,
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java)
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/EnterExitRoomIntegrationTestCase.java?p2=mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/EnterExitRoomIntegrationTestCase.java&p1=mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java&r1=958281&r2=989916&rev=989916&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/MUCIntegrationTestCase.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/EnterExitRoomIntegrationTestCase.java
Thu Aug 26 20:31:48 2010
@@ -35,34 +35,7 @@ import org.jivesoftware.smackx.muc.Multi
/**
*/
-public class MUCIntegrationTestCase extends AbstractIntegrationTestCase {
-
- private static final String MUC_SUBDOMAIN = "chat";
-
- private static final String ROOM_JID = "[email protected]";
-
- private Conference conference = new Conference("test conference");
-
- private XMPPConnection client2;
-
- private MultiUserChat chat;
-
- private MultiUserChat chat2;
-
- @Override
- protected void addModules(XMPPServer server) {
- server.addModule(new MUCModule(MUC_SUBDOMAIN, conference));
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- client2 = connectClient(port, TEST_USERNAME2, TEST_PASSWORD2);
-
- chat = new MultiUserChat(client, ROOM_JID);
- chat2 = new MultiUserChat(client2, ROOM_JID);
- }
+public class EnterExitRoomIntegrationTestCase extends
AbstractMUCIntegrationTestCase {
public void testEnterRoom() throws Exception {
chat.join("Nick");
@@ -71,7 +44,7 @@ public class MUCIntegrationTestCase exte
assertEquals(1, room.getOccupantCount());
Occupant occupant = room.getOccupants().iterator().next();
assertEquals(TEST_USERNAME1,
occupant.getJid().getBareJID().getFullQualifiedName());
- assertEquals("Nick", occupant.getName());
+ assertEquals("Nick", occupant.getNick());
final BlockingQueue<String> joinedQueue = new
LinkedBlockingQueue<String>();
chat.addParticipantStatusListener(new
ParticipantStatusListenerAdapter() {
Added:
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/ModerationIntegrationTestCase.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/ModerationIntegrationTestCase.java?rev=989916&view=auto
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/ModerationIntegrationTestCase.java
(added)
+++
mina/vysper/trunk/server/extensions/xep0045-muc-inttest/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/inttest/ModerationIntegrationTestCase.java
Thu Aug 26 20:31:48 2010
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.vysper.xmpp.modules.extension.xep0045_muc.inttest;
+
+import org.apache.vysper.xmpp.addressing.EntityImpl;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Role;
+import org.apache.vysper.xmpp.modules.extension.xep0045_muc.model.Room;
+
+/**
+ */
+public class ModerationIntegrationTestCase extends
AbstractMUCIntegrationTestCase {
+
+ public void testGrantModeration() throws Exception {
+ chat.join(NICK1);
+
+ Room room = conference.findRoom(EntityImpl.parseUnchecked(ROOM_JID));
+ assertEquals(Role.Moderator, room.findOccupantByNick(NICK1).getRole());
+
+ chat2.join(NICK2);
+
+ chat.grantModerator(NICK2);
+ assertEquals(Role.Moderator, room.findOccupantByNick(NICK2).getRole());
+
+ }
+
+}
