You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2010/06/26 22:40:05 UTC
svn commit: r958281 [15/22] - in /mina/vysper/trunk:
demo/pubsub/client/src/main/java/org/apache/vysper/demo/pubsub/client/
nbxml/src/main/java/org/apache/vysper/charset/
nbxml/src/main/java/org/apache/vysper/xml/decoder/
nbxml/src/main/java/org/apache...
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandlerBaseTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandlerBaseTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandlerBaseTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandlerBaseTestCase.java Sat Jun 26 20:39:54 2010
@@ -20,21 +20,22 @@
package org.apache.vysper.xmpp.modules.core.im.handler;
import junit.framework.TestCase;
+
import org.apache.vysper.storage.OpenStorageProviderRegistry;
import org.apache.vysper.xml.fragment.XMLElementVerifier;
import org.apache.vysper.xml.fragment.XMLSemanticError;
import org.apache.vysper.xmpp.addressing.Entity;
import org.apache.vysper.xmpp.addressing.EntityImpl;
import org.apache.vysper.xmpp.delivery.StanzaReceiverRelay;
+import org.apache.vysper.xmpp.modules.core.TestUser;
import org.apache.vysper.xmpp.modules.roster.AskSubscriptionType;
import org.apache.vysper.xmpp.modules.roster.RosterException;
import org.apache.vysper.xmpp.modules.roster.RosterItem;
import org.apache.vysper.xmpp.modules.roster.RosterUtils;
import org.apache.vysper.xmpp.modules.roster.SubscriptionType;
import org.apache.vysper.xmpp.modules.roster.persistence.MemoryRosterManager;
-import org.apache.vysper.xmpp.modules.core.TestUser;
-import org.apache.vysper.xmpp.server.TestSessionContext;
import org.apache.vysper.xmpp.server.DefaultServerRuntimeContext;
+import org.apache.vysper.xmpp.server.TestSessionContext;
import org.apache.vysper.xmpp.stanza.IQStanza;
import org.apache.vysper.xmpp.stanza.PresenceStanzaType;
import org.apache.vysper.xmpp.stanza.Stanza;
@@ -46,17 +47,24 @@ import org.apache.vysper.xmpp.state.reso
*/
abstract public class PresenceHandlerBaseTestCase extends TestCase {
-
protected TestSessionContext sessionContext;
+
protected MemoryRosterManager rosterManager;
protected TestUser initiatingUser;
+
protected TestUser anotherInterestedNotAvailUser;
+
protected TestUser anotherInterestedUser;
+
protected TestUser anotherAvailableUser;
+
protected TestUser unrelatedUser;
+
protected TestUser subscribed_TO;
+
protected TestUser subscribed_BOTH;
+
protected TestUser subscribed_FROM;
@Override
@@ -66,7 +74,8 @@ abstract public class PresenceHandlerBas
rosterManager = new MemoryRosterManager();
OpenStorageProviderRegistry storageProviderRegistry = new OpenStorageProviderRegistry();
storageProviderRegistry.add(rosterManager);
- ((DefaultServerRuntimeContext) sessionContext.getServerRuntimeContext()).setStorageProviderRegistry(storageProviderRegistry);
+ ((DefaultServerRuntimeContext) sessionContext.getServerRuntimeContext())
+ .setStorageProviderRegistry(storageProviderRegistry);
Entity client = EntityImpl.parse("tester@vysper.org");
sessionContext.setInitiatingEntity(client);
@@ -89,9 +98,12 @@ abstract public class PresenceHandlerBas
// 4 resources for the same entity: one initiating, one interested (not yet avail), one interested (implicitly avail), one available
// and another unrelated resource
- subscribed_TO = TestUser.createContact(sessionContext, rosterManager, "subscribed_to@vysper.org", SubscriptionType.TO);
- subscribed_BOTH = TestUser.createContact(sessionContext, rosterManager, "subscribed_both@vysper.org", SubscriptionType.BOTH);
- subscribed_FROM = TestUser.createContact(sessionContext, rosterManager, "subscribed_from@vysper.org", SubscriptionType.FROM);
+ subscribed_TO = TestUser.createContact(sessionContext, rosterManager, "subscribed_to@vysper.org",
+ SubscriptionType.TO);
+ subscribed_BOTH = TestUser.createContact(sessionContext, rosterManager, "subscribed_both@vysper.org",
+ SubscriptionType.BOTH);
+ subscribed_FROM = TestUser.createContact(sessionContext, rosterManager, "subscribed_from@vysper.org",
+ SubscriptionType.FROM);
}
protected void setResourceState(String resourceId, ResourceState state) {
@@ -103,16 +115,22 @@ abstract public class PresenceHandlerBas
}
protected boolean checkPresence(Stanza stanza, PresenceStanzaType presenceType, Entity from, String show) {
- if (stanza == null) return false;
+ if (stanza == null)
+ return false;
XMLElementVerifier xmlElementVerifier = stanza.getVerifier();
if (from == null) {
- if (stanza.getFrom() != null) return false;
+ if (stanza.getFrom() != null)
+ return false;
} else {
- if (!stanza.getFrom().equals(from)) return false;
+ if (!stanza.getFrom().equals(from))
+ return false;
}
- if (!xmlElementVerifier.nameEquals("presence")) return false;
- if (presenceType == null && xmlElementVerifier.attributePresent("type")) return false;
- if (presenceType != null && !xmlElementVerifier.attributeEquals("type", presenceType.value())) return false;
+ if (!xmlElementVerifier.nameEquals("presence"))
+ return false;
+ if (presenceType == null && xmlElementVerifier.attributePresent("type"))
+ return false;
+ if (presenceType != null && !xmlElementVerifier.attributeEquals("type", presenceType.value()))
+ return false;
try {
if (show != null && !xmlElementVerifier.subElementPresent("show")
&& !stanza.getSingleInnerElementsNamed("show").getSingleInnerText().getText().equals(show)) {
@@ -125,7 +143,8 @@ abstract public class PresenceHandlerBas
}
protected ResourceState getResourceState() {
- return sessionContext.getServerRuntimeContext().getResourceRegistry().getResourceState(initiatingUser.getBoundResourceId());
+ return sessionContext.getServerRuntimeContext().getResourceRegistry().getResourceState(
+ initiatingUser.getBoundResourceId());
}
protected void assertStanzasDeliveredAndRelayed(int expectedRelayedAndDelivered) {
@@ -137,11 +156,14 @@ abstract public class PresenceHandlerBas
}
protected void assertStanzasRelayed(int expectedRelayed, int expectedDelivered) {
- assertEquals(expectedRelayed, ((StanzaReceiverRelay) sessionContext.getServerRuntimeContext().getStanzaRelay()).getCountRelayed());
- assertEquals(expectedDelivered, ((StanzaReceiverRelay) sessionContext.getServerRuntimeContext().getStanzaRelay()).getCountDelivered());
+ assertEquals(expectedRelayed, ((StanzaReceiverRelay) sessionContext.getServerRuntimeContext().getStanzaRelay())
+ .getCountRelayed());
+ assertEquals(expectedDelivered, ((StanzaReceiverRelay) sessionContext.getServerRuntimeContext()
+ .getStanzaRelay()).getCountDelivered());
}
- protected boolean checkRosterItem(Entity contactEntity, SubscriptionType expectedSubscriptionType, AskSubscriptionType expectedAskSubscriptionType) {
+ protected boolean checkRosterItem(Entity contactEntity, SubscriptionType expectedSubscriptionType,
+ AskSubscriptionType expectedAskSubscriptionType) {
try {
RosterItem contact = rosterManager.getContact(initiatingUser.getEntity(), contactEntity);
assertNotNull(contact);
@@ -153,8 +175,10 @@ abstract public class PresenceHandlerBas
return true;
}
- protected boolean checkRosterPush(Stanza stanza, Entity entity, Entity contact, SubscriptionType subscriptionType, AskSubscriptionType askSubscriptionType) {
- if (stanza == null) return false;
+ protected boolean checkRosterPush(Stanza stanza, Entity entity, Entity contact, SubscriptionType subscriptionType,
+ AskSubscriptionType askSubscriptionType) {
+ if (stanza == null)
+ return false;
IQStanza rosterPush = (IQStanza) XMPPCoreStanza.getWrapper(stanza);
rosterPush.getInnerElementsNamed("query");
@@ -174,7 +198,8 @@ abstract public class PresenceHandlerBas
}
protected void resetRecordedStanzas() {
- StanzaReceiverRelay receiverRelay = (StanzaReceiverRelay) sessionContext.getServerRuntimeContext().getStanzaRelay();
+ StanzaReceiverRelay receiverRelay = (StanzaReceiverRelay) sessionContext.getServerRuntimeContext()
+ .getStanzaRelay();
receiverRelay.resetAll();
}
@@ -187,4 +212,3 @@ abstract public class PresenceHandlerBas
return sessionContext.getNextRecordedResponseForResource(testUser.getBoundResourceId());
}
}
-
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceSubRequestOutHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceSubRequestOutHandlerTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceSubRequestOutHandlerTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceSubRequestOutHandlerTestCase.java Sat Jun 26 20:39:54 2010
@@ -20,10 +20,12 @@
package org.apache.vysper.xmpp.modules.core.im.handler;
+import static org.apache.vysper.xmpp.modules.roster.AskSubscriptionType.ASK_SUBSCRIBE;
+import static org.apache.vysper.xmpp.modules.roster.SubscriptionType.FROM;
+import static org.apache.vysper.xmpp.modules.roster.SubscriptionType.NONE;
+
import org.apache.vysper.xmpp.addressing.EntityFormatException;
import org.apache.vysper.xmpp.addressing.EntityImpl;
-import static org.apache.vysper.xmpp.modules.roster.AskSubscriptionType.*;
-import static org.apache.vysper.xmpp.modules.roster.SubscriptionType.*;
import org.apache.vysper.xmpp.stanza.PresenceStanzaType;
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
@@ -44,7 +46,9 @@ public class PresenceSubRequestOutHandle
// now entity 'unrelated' approves the subscription
- XMPPCoreStanza requestApproval = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(unrelatedUser.getEntityFQ(), initiatingUser.getEntity(), null, PresenceStanzaType.SUBSCRIBED, null, null).build());
+ XMPPCoreStanza requestApproval = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(
+ unrelatedUser.getEntityFQ(), initiatingUser.getEntity(), null, PresenceStanzaType.SUBSCRIBED, null,
+ null).build());
handler.executeCore(requestApproval, sessionContext.getServerRuntimeContext(), false, sessionContext);
// 3 roster pushes but...
@@ -62,7 +66,9 @@ public class PresenceSubRequestOutHandle
setResourceState(initiatingUser.getBoundResourceId(), ResourceState.AVAILABLE_INTERESTED);
// SUBSCRIBE FROM
- XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), unrelatedUser.getEntity(), null, PresenceStanzaType.SUBSCRIBE, null, null).build());
+ XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder
+ .createPresenceStanza(initiatingUser.getEntityFQ(), unrelatedUser.getEntity(), null,
+ PresenceStanzaType.SUBSCRIBE, null, null).build());
handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true, sessionContext);
assertEquals(ResourceState.AVAILABLE_INTERESTED, getResourceState());
@@ -73,25 +79,30 @@ public class PresenceSubRequestOutHandle
// roster push for 1 interested initiator of _same_ session
Stanza initiatorNotification = getNextDirectResponseFor(initiatingUser);
- assertTrue(checkRosterPush(initiatorNotification, initiatingUser.getEntityFQ(), unrelatedUser.getEntity(), NONE, ASK_SUBSCRIBE));
+ assertTrue(checkRosterPush(initiatorNotification, initiatingUser.getEntityFQ(), unrelatedUser.getEntity(),
+ NONE, ASK_SUBSCRIBE));
// no stanzas for not interested
assertNull(getNextDirectResponseFor(anotherAvailableUser));
// roster 2 interested resources of _same_ session...
-
+
// roster push for interested
Stanza interestedResourceNotification = getNextDirectResponseFor(anotherInterestedUser);
- assertTrue(checkRosterPush(interestedResourceNotification, new EntityImpl(initiatingUser.getEntity(), anotherInterestedUser.getBoundResourceId()), unrelatedUser.getEntity(), NONE, ASK_SUBSCRIBE));
+ assertTrue(checkRosterPush(interestedResourceNotification, new EntityImpl(initiatingUser.getEntity(),
+ anotherInterestedUser.getBoundResourceId()), unrelatedUser.getEntity(), NONE, ASK_SUBSCRIBE));
assertNull(getNextDirectResponseFor(anotherInterestedUser)); // no more stanzas;
// roster push for interested but not avail
Stanza interestedNotYetAvailResourceNotification = getNextDirectResponseFor(anotherInterestedNotAvailUser);
- assertTrue(checkRosterPush(interestedNotYetAvailResourceNotification, new EntityImpl(initiatingUser.getEntity(), anotherInterestedNotAvailUser.getBoundResourceId()), unrelatedUser.getEntity(), NONE, ASK_SUBSCRIBE));
+ assertTrue(checkRosterPush(interestedNotYetAvailResourceNotification, new EntityImpl(
+ initiatingUser.getEntity(), anotherInterestedNotAvailUser.getBoundResourceId()), unrelatedUser
+ .getEntity(), NONE, ASK_SUBSCRIBE));
assertNull(getNextDirectResponseFor(anotherInterestedNotAvailUser)); // no more stanzas;
// sub request sent to contact
- assertTrue(checkPresence(unrelatedUser.getNextStanza(), PresenceStanzaType.SUBSCRIBE, initiatingUser.getEntity(), null));
+ assertTrue(checkPresence(unrelatedUser.getNextStanza(), PresenceStanzaType.SUBSCRIBE, initiatingUser
+ .getEntity(), null));
assertNull(unrelatedUser.getNextStanza()); // no other stanza
assertTrue(checkRosterItem(unrelatedUser.getEntity(), NONE, ASK_SUBSCRIBE));
@@ -104,7 +115,9 @@ public class PresenceSubRequestOutHandle
setResourceState(initiatingUser.getBoundResourceId(), ResourceState.AVAILABLE_INTERESTED);
// SUBSCRIBE FROM
- XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), subscribed_FROM.getEntity(), null, PresenceStanzaType.SUBSCRIBE, null, null).build());
+ XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(
+ initiatingUser.getEntityFQ(), subscribed_FROM.getEntity(), null, PresenceStanzaType.SUBSCRIBE, null,
+ null).build());
handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true, sessionContext);
assertEquals(ResourceState.AVAILABLE_INTERESTED, getResourceState());
@@ -115,18 +128,22 @@ public class PresenceSubRequestOutHandle
// roster push for 1 interested initiator...
Stanza initiatorNotification = getNextDirectResponseFor(initiatingUser);
- assertTrue(checkRosterPush(initiatorNotification, initiatingUser.getEntityFQ(), subscribed_FROM.getEntity(), FROM, ASK_SUBSCRIBE));
+ assertTrue(checkRosterPush(initiatorNotification, initiatingUser.getEntityFQ(), subscribed_FROM.getEntity(),
+ FROM, ASK_SUBSCRIBE));
// .. and 2 interested resources of _same_ session
Stanza anotherInterestedUserNotification = getNextDirectResponseFor(anotherInterestedUser);
- assertTrue(checkRosterPush(anotherInterestedUserNotification, anotherInterestedUser.getEntityFQ(), subscribed_FROM.getEntity(), FROM, ASK_SUBSCRIBE));
+ assertTrue(checkRosterPush(anotherInterestedUserNotification, anotherInterestedUser.getEntityFQ(),
+ subscribed_FROM.getEntity(), FROM, ASK_SUBSCRIBE));
Stanza anotherInterestedNotAvailUserNotification = getNextDirectResponseFor(anotherInterestedNotAvailUser);
- assertTrue(checkRosterPush(anotherInterestedNotAvailUserNotification, anotherInterestedNotAvailUser.getEntityFQ(), subscribed_FROM.getEntity(), FROM, ASK_SUBSCRIBE));
+ assertTrue(checkRosterPush(anotherInterestedNotAvailUserNotification, anotherInterestedNotAvailUser
+ .getEntityFQ(), subscribed_FROM.getEntity(), FROM, ASK_SUBSCRIBE));
assertNull(sessionContext.getNextRecordedResponse()); // no more stanzas
// sub request sent to contact
- assertTrue(checkPresence(subscribed_FROM.getNextStanza(), PresenceStanzaType.SUBSCRIBE, initiatingUser.getEntity(), null));
+ assertTrue(checkPresence(subscribed_FROM.getNextStanza(), PresenceStanzaType.SUBSCRIBE, initiatingUser
+ .getEntity(), null));
assertNull(subscribed_FROM.getNextStanza()); // no other stanza
assertTrue(checkRosterItem(subscribed_FROM.getEntity(), FROM, ASK_SUBSCRIBE));
@@ -136,7 +153,9 @@ public class PresenceSubRequestOutHandle
setResourceState(initiatingUser.getBoundResourceId(), ResourceState.AVAILABLE_INTERESTED);
- XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), subscribed_TO.getEntity(), null, PresenceStanzaType.SUBSCRIBE, null, null).build());
+ XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder
+ .createPresenceStanza(initiatingUser.getEntityFQ(), subscribed_TO.getEntity(), null,
+ PresenceStanzaType.SUBSCRIBE, null, null).build());
handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true, sessionContext);
assertEquals(ResourceState.AVAILABLE_INTERESTED, getResourceState());
@@ -148,7 +167,9 @@ public class PresenceSubRequestOutHandle
setResourceState(initiatingUser.getBoundResourceId(), ResourceState.AVAILABLE_INTERESTED);
- XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), subscribed_BOTH.getEntity(), null, PresenceStanzaType.SUBSCRIBE, null, null).build());
+ XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(
+ initiatingUser.getEntityFQ(), subscribed_BOTH.getEntity(), null, PresenceStanzaType.SUBSCRIBE, null,
+ null).build());
handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true, sessionContext);
assertEquals(ResourceState.AVAILABLE_INTERESTED, getResourceState());
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java Sat Jun 26 20:39:54 2010
@@ -19,27 +19,27 @@
*/
package org.apache.vysper.xmpp.modules.core.sasl.handler;
+import java.util.ArrayList;
+import java.util.List;
+
import junit.framework.TestCase;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.vysper.storage.OpenStorageProviderRegistry;
import org.apache.vysper.xml.fragment.XMLSemanticError;
import org.apache.vysper.xmpp.authorization.Plain;
import org.apache.vysper.xmpp.authorization.SASLMechanism;
import org.apache.vysper.xmpp.authorization.SimpleUserAuthorization;
+import org.apache.vysper.xmpp.modules.core.sasl.AuthorizationRetriesCounter;
import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.protocol.ResponseStanzaContainer;
import org.apache.vysper.xmpp.protocol.SessionStateHolder;
import org.apache.vysper.xmpp.protocol.exception.AuthorizationFailedException;
+import org.apache.vysper.xmpp.server.DefaultServerRuntimeContext;
import org.apache.vysper.xmpp.server.SessionState;
import org.apache.vysper.xmpp.server.TestSessionContext;
-import org.apache.vysper.xmpp.server.DefaultServerRuntimeContext;
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
-import org.apache.vysper.xmpp.modules.core.sasl.AuthorizationRetriesCounter;
-import org.apache.vysper.storage.OpenStorageProviderRegistry;
-import org.apache.commons.codec.binary.Base64;
-
-import java.util.ArrayList;
-import java.util.List;
/**
*/
@@ -56,18 +56,20 @@ public class AbortHandlerTestCase extend
List<SASLMechanism> methods = new ArrayList<SASLMechanism>();
methods.add(new Plain());
-
+
sessionContext.getServerRuntimeContext().getServerFeatures().setAuthenticationMethods(methods);
SimpleUserAuthorization users = new SimpleUserAuthorization();
users.addUser("user007@test", "pass007");
OpenStorageProviderRegistry providerRegistry = new OpenStorageProviderRegistry();
providerRegistry.add(users);
- ((DefaultServerRuntimeContext) sessionContext.getServerRuntimeContext()).setStorageProviderRegistry(providerRegistry);
+ ((DefaultServerRuntimeContext) sessionContext.getServerRuntimeContext())
+ .setStorageProviderRegistry(providerRegistry);
}
+
public void testAbort() throws XMLSemanticError, AuthorizationFailedException {
executeAbortAuthorization_3Times();
-
+
StanzaBuilder stanzaBuilder = createAbort();
Stanza abortPlainStanza = stanzaBuilder.build();
@@ -79,7 +81,8 @@ public class AbortHandlerTestCase extend
// correct credential no longer work - no retries left
AuthHandler authHandler = new AuthHandler();
try {
- ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
+ ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext
+ .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
fail("should raise error - no tries left");
} catch (AuthorizationFailedException e) {
// test succeeded
@@ -110,7 +113,8 @@ public class AbortHandlerTestCase extend
Stanza abortStanza = stanzaBuilder.build();
AbortHandler abortHandler = new AbortHandler();
- ResponseStanzaContainer responseContainer = abortHandler.execute(abortStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
+ ResponseStanzaContainer responseContainer = abortHandler.execute(abortStanza, sessionContext
+ .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
Stanza responseStanza = responseContainer.getResponseStanza();
return responseStanza;
}
@@ -120,5 +124,4 @@ public class AbortHandlerTestCase extend
return stanzaBuilder;
}
-
}
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java Sat Jun 26 20:39:54 2010
@@ -19,7 +19,11 @@
*/
package org.apache.vysper.xmpp.modules.core.sasl.handler;
+import java.util.ArrayList;
+import java.util.List;
+
import junit.framework.TestCase;
+
import org.apache.commons.codec.binary.Base64;
import org.apache.vysper.storage.OpenStorageProviderRegistry;
import org.apache.vysper.xml.fragment.XMLSemanticError;
@@ -37,9 +41,6 @@ import org.apache.vysper.xmpp.server.Tes
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
-import java.util.ArrayList;
-import java.util.List;
-
/**
*/
public class AuthHandlerPlainMechanismTestCase extends TestCase {
@@ -47,8 +48,6 @@ public class AuthHandlerPlainMechanismTe
private SessionStateHolder sessionStateHolder = new SessionStateHolder();
-
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -57,13 +56,14 @@ public class AuthHandlerPlainMechanismTe
List<SASLMechanism> methods = new ArrayList<SASLMechanism>();
methods.add(new Plain());
-
+
sessionContext.getServerRuntimeContext().getServerFeatures().setAuthenticationMethods(methods);
SimpleUserAuthorization users = new SimpleUserAuthorization();
users.addUser("user007@test", "pass007");
OpenStorageProviderRegistry providerRegistry = new OpenStorageProviderRegistry();
providerRegistry.add(users);
- ((DefaultServerRuntimeContext) sessionContext.getServerRuntimeContext()).setStorageProviderRegistry(providerRegistry);
+ ((DefaultServerRuntimeContext) sessionContext.getServerRuntimeContext())
+ .setStorageProviderRegistry(providerRegistry);
}
public void testAuthPlainNoInitialResponse() throws AuthorizationFailedException {
@@ -71,7 +71,8 @@ public class AuthHandlerPlainMechanismTe
Stanza authPlainStanza = stanzaBuilder.build();
AuthHandler authHandler = new AuthHandler();
- ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
+ ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext
+ .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
assertTrue(responseContainer.getResponseStanza().getVerifier().nameEquals("failure"));
assertTrue(sessionStateHolder.getState() == SessionState.ENCRYPTED);
@@ -83,7 +84,8 @@ public class AuthHandlerPlainMechanismTe
Stanza authPlainStanza = stanzaBuilder.build();
AuthHandler authHandler = new AuthHandler();
- ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
+ ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext
+ .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
assertTrue(responseContainer.getResponseStanza().getVerifier().nameEquals("failure"));
assertTrue(sessionStateHolder.getState() == SessionState.ENCRYPTED);
@@ -92,15 +94,16 @@ public class AuthHandlerPlainMechanismTe
public void testAuthPlainAuthorizedCredentialsResponse() throws XMLSemanticError, AuthorizationFailedException {
StanzaBuilder stanzaBuilder = createAuthPlain();
stanzaBuilder.addText(new String(Base64.encodeBase64("dummy\0user007\0pass007".getBytes())));
-
+
Stanza authPlainStanza = stanzaBuilder.build();
assertEquals(3, AuthorizationRetriesCounter.getFromSession(sessionContext).getTriesLeft());
AuthHandler authHandler = new AuthHandler();
- ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
+ ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext
+ .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
Stanza responseStanza = responseContainer.getResponseStanza();
-
+
assertTrue(responseStanza.getVerifier().nameEquals("success"));
assertTrue(sessionStateHolder.getState() == SessionState.AUTHENTICATED);
assertNull(sessionContext.getAttribute(AuthorizationRetriesCounter.SESSION_ATTRIBUTE_ABORTION_COUNTER));
@@ -109,7 +112,7 @@ public class AuthHandlerPlainMechanismTe
public void testAuthPlainWrongCredentialsResponse() throws XMLSemanticError, AuthorizationFailedException {
executeWrongPlainAuthorization_3Times();
-
+
StanzaBuilder stanzaBuilder = createAuthPlain();
stanzaBuilder.addText(new String(Base64.encodeBase64("dummy\0user007\0pass007".getBytes())));
Stanza authPlainStanza = stanzaBuilder.build();
@@ -117,7 +120,8 @@ public class AuthHandlerPlainMechanismTe
// correct credential no longer work - no retries left
AuthHandler authHandler = new AuthHandler();
try {
- ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
+ ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext
+ .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
fail("should raise error - no tries left");
} catch (AuthorizationFailedException e) {
// test succeeded
@@ -149,7 +153,8 @@ public class AuthHandlerPlainMechanismTe
Stanza authPlainStanza = stanzaBuilder.build();
AuthHandler authHandler = new AuthHandler();
- ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
+ ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext
+ .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
Stanza responseStanza = responseContainer.getResponseStanza();
return responseStanza;
}
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerUnavailableMechanismTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerUnavailableMechanismTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerUnavailableMechanismTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerUnavailableMechanismTestCase.java Sat Jun 26 20:39:54 2010
@@ -20,9 +20,13 @@
package org.apache.vysper.xmpp.modules.core.sasl.handler;
+import java.util.ArrayList;
+import java.util.List;
+
import junit.framework.TestCase;
-import org.apache.vysper.xmpp.authorization.SASLMechanism;
+
import org.apache.vysper.xmpp.authorization.Plain;
+import org.apache.vysper.xmpp.authorization.SASLMechanism;
import org.apache.vysper.xmpp.protocol.NamespaceURIs;
import org.apache.vysper.xmpp.protocol.ResponseStanzaContainer;
import org.apache.vysper.xmpp.protocol.SessionStateHolder;
@@ -32,9 +36,6 @@ import org.apache.vysper.xmpp.server.Tes
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
-import java.util.ArrayList;
-import java.util.List;
-
/**
*/
public class AuthHandlerUnavailableMechanismTestCase extends TestCase {
@@ -50,7 +51,7 @@ public class AuthHandlerUnavailableMecha
List<SASLMechanism> methods = new ArrayList<SASLMechanism>();
methods.add(new Plain());
-
+
sessionContext.getServerRuntimeContext().getServerFeatures().setAuthenticationMethods(methods);
}
@@ -61,22 +62,24 @@ public class AuthHandlerUnavailableMecha
AuthHandler authHandler = new AuthHandler();
try {
- ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
+ ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext
+ .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
fail("should raise exception");
} catch (RuntimeException e) {
// test succeeded
}
}
-
+
public void testAuthPlainUnavailableMechanism() throws AuthorizationFailedException {
StanzaBuilder stanzaBuilder = new StanzaBuilder("auth", NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
- stanzaBuilder.addAttribute("mechanism", "EXTERNAL");
+ stanzaBuilder.addAttribute("mechanism", "EXTERNAL");
Stanza authPlainStanza = stanzaBuilder.build();
AuthHandler authHandler = new AuthHandler();
try {
- ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
+ ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext
+ .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
fail("should raise exception");
} catch (RuntimeException e) {
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java Sat Jun 26 20:39:54 2010
@@ -56,7 +56,7 @@ public class StartTLSHandlerTestCase ext
XMLElementVerifier verifier = responseStanza.getVerifier();
assertTrue("session state to low failure", verifier.nameEquals("failure"));
assertFalse("tls init", sessionContext.isSwitchToTLSCalled());
-
+
sessionContext.setSessionState(SessionState.ENCRYPTION_STARTED);
responseStanza = executeStartTLSHandler(starttlsStanza, sessionContext);
verifier = responseStanza.getVerifier();
@@ -67,20 +67,22 @@ public class StartTLSHandlerTestCase ext
responseStanza = executeStartTLSHandler(starttlsStanza, sessionContext);
verifier = responseStanza.getVerifier();
assertTrue("session state ready", verifier.nameEquals("proceed"));
- assertEquals("session stat is encryption started", SessionState.ENCRYPTION_STARTED, sessionStateHolder.getState());
+ assertEquals("session stat is encryption started", SessionState.ENCRYPTION_STARTED, sessionStateHolder
+ .getState());
assertTrue("tls init", sessionContext.isSwitchToTLSCalled());
}
private Stanza executeStartTLSHandler(Stanza starttlsStanza, TestSessionContext sessionContext) {
StartTLSHandler startTLSHandler = new StartTLSHandler();
- ResponseStanzaContainer responseStanzaContainer = startTLSHandler.execute(starttlsStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
+ ResponseStanzaContainer responseStanzaContainer = startTLSHandler.execute(starttlsStanza, sessionContext
+ .getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
Stanza responseStanza = responseStanzaContainer.getResponseStanza();
return responseStanza;
}
-
+
public void testNamespace() {
sessionContext.setSessionState(SessionState.STARTED);
-
+
StanzaBuilder stanzaBuilder = new StanzaBuilder("starttls", NamespaceURIs.HTTP_ETHERX_JABBER_ORG_STREAMS);
Stanza wrongNSStanza = stanzaBuilder.build();
@@ -99,5 +101,5 @@ public class StartTLSHandlerTestCase ext
assertTrue("namespace correct proceed", verifier.nameEquals("proceed"));
assertTrue("tls init", sessionContext.isSwitchToTLSCalled());
}
-
+
}
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandlerTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandlerTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandlerTestCase.java Sat Jun 26 20:39:54 2010
@@ -34,28 +34,31 @@ import org.apache.vysper.xmpp.stanza.Sta
/**
*/
public class XmppPingIQHandlerTestCase extends TestCase {
-
+
private static final String IQ_ID = "id1";
private TestSessionContext sessionContext;
protected Entity client;
+
protected Entity boundClient;
+
protected Entity server;
+
protected XmppPingIQHandler handler;
@Override
protected void setUp() throws Exception {
super.setUp();
-
+
client = EntityImpl.parse("tester@vysper.org");
-
+
sessionContext = TestSessionContext.createWithStanzaReceiverRelayAuthenticated();
sessionContext.setInitiatingEntity(client);
-
+
boundClient = new EntityImpl(client, sessionContext.bindResource());
server = sessionContext.getServerJID();
-
+
handler = new XmppPingIQHandler();
}
@@ -66,16 +69,16 @@ public class XmppPingIQHandlerTestCase e
//
// S: <iq from='capulet.lit' to='juliet@capulet.lit/balcony' id='c2s1' type='result'/>
-
StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(boundClient, server, IQStanzaType.GET, IQ_ID);
stanzaBuilder.startInnerElement("ping", NamespaceURIs.URN_XMPP_PING).endInnerElement();
Stanza requestStanza = stanzaBuilder.build();
- ResponseStanzaContainer resp = handler.execute(requestStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, null);
+ ResponseStanzaContainer resp = handler.execute(requestStanza, sessionContext.getServerRuntimeContext(), true,
+ sessionContext, null);
// we should always get a response
assertTrue(resp.hasResponse());
-
+
Stanza respStanza = resp.getResponseStanza();
assertEquals("iq", respStanza.getName());
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/RosterSubscriptionMutatorTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/RosterSubscriptionMutatorTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/RosterSubscriptionMutatorTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/RosterSubscriptionMutatorTestCase.java Sat Jun 26 20:39:54 2010
@@ -19,17 +19,27 @@
*/
package org.apache.vysper.xmpp.modules.roster;
+import static org.apache.vysper.xmpp.modules.roster.AskSubscriptionType.ASK_SUBSCRIBE;
+import static org.apache.vysper.xmpp.modules.roster.AskSubscriptionType.ASK_SUBSCRIBED;
+import static org.apache.vysper.xmpp.modules.roster.AskSubscriptionType.NOT_SET;
+import static org.apache.vysper.xmpp.modules.roster.RosterSubscriptionMutator.Result.ALREADY_SET;
+import static org.apache.vysper.xmpp.modules.roster.RosterSubscriptionMutator.Result.FAILED;
+import static org.apache.vysper.xmpp.modules.roster.RosterSubscriptionMutator.Result.ILLEGAL_ARGUMENT;
+import static org.apache.vysper.xmpp.modules.roster.RosterSubscriptionMutator.Result.OK;
+import static org.apache.vysper.xmpp.modules.roster.SubscriptionType.BOTH;
+import static org.apache.vysper.xmpp.modules.roster.SubscriptionType.FROM;
+import static org.apache.vysper.xmpp.modules.roster.SubscriptionType.NONE;
+import static org.apache.vysper.xmpp.modules.roster.SubscriptionType.REMOVE;
+import static org.apache.vysper.xmpp.modules.roster.SubscriptionType.TO;
import junit.framework.TestCase;
-import org.apache.vysper.xmpp.addressing.EntityImpl;
+
import org.apache.vysper.xmpp.addressing.EntityFormatException;
-import static org.apache.vysper.xmpp.modules.roster.AskSubscriptionType.*;
-import static org.apache.vysper.xmpp.modules.roster.SubscriptionType.*;
-import static org.apache.vysper.xmpp.modules.roster.RosterSubscriptionMutator.Result.*;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
/**
*/
public class RosterSubscriptionMutatorTestCase extends TestCase {
-
+
@Override
public void setUp() {
// Add your code here
@@ -37,7 +47,7 @@ public class RosterSubscriptionMutatorTe
public void testAddSubscriptionRequest() {
checkAdd(NONE, NOT_SET, NOT_SET, ILLEGAL_ARGUMENT, null, null);
-
+
// most simple cases
checkAdd(NONE, NOT_SET, ASK_SUBSCRIBE, OK, NONE, ASK_SUBSCRIBE);
checkAdd(NONE, NOT_SET, ASK_SUBSCRIBED, OK, NONE, ASK_SUBSCRIBED);
@@ -95,32 +105,37 @@ public class RosterSubscriptionMutatorTe
}
private void checkAdd(SubscriptionType initialSubscriptionType, AskSubscriptionType initialAskSubscriptionType,
- SubscriptionType parameterSubscriptionType,
- RosterSubscriptionMutator.Result expectedResult,
- SubscriptionType expectedSubscriptionType, AskSubscriptionType expectedAskSubscriptionType) {
+ SubscriptionType parameterSubscriptionType, RosterSubscriptionMutator.Result expectedResult,
+ SubscriptionType expectedSubscriptionType, AskSubscriptionType expectedAskSubscriptionType) {
RosterItem item = prepareItem(initialSubscriptionType, initialAskSubscriptionType);
-
+
// add parameterSubscriptionType
- RosterSubscriptionMutator.Result subscriptionMutatorResult = new RosterSubscriptionMutator().add(item, parameterSubscriptionType);
+ RosterSubscriptionMutator.Result subscriptionMutatorResult = new RosterSubscriptionMutator().add(item,
+ parameterSubscriptionType);
- checkResult(initialSubscriptionType, initialAskSubscriptionType, expectedResult, expectedSubscriptionType, expectedAskSubscriptionType, item, subscriptionMutatorResult);
+ checkResult(initialSubscriptionType, initialAskSubscriptionType, expectedResult, expectedSubscriptionType,
+ expectedAskSubscriptionType, item, subscriptionMutatorResult);
}
private void checkAdd(SubscriptionType initialSubscriptionType, AskSubscriptionType initialAskSubscriptionType,
- AskSubscriptionType parameterAskSubscriptionType,
- RosterSubscriptionMutator.Result expectedResult,
- SubscriptionType expectedSubscriptionType, AskSubscriptionType expectedAskSubscriptionType) {
+ AskSubscriptionType parameterAskSubscriptionType, RosterSubscriptionMutator.Result expectedResult,
+ SubscriptionType expectedSubscriptionType, AskSubscriptionType expectedAskSubscriptionType) {
RosterItem item = prepareItem(initialSubscriptionType, initialAskSubscriptionType);
-
+
// add parameterSubscriptionType
- RosterSubscriptionMutator.Result subscriptionMutatorResult = new RosterSubscriptionMutator().add(item, parameterAskSubscriptionType);
+ RosterSubscriptionMutator.Result subscriptionMutatorResult = new RosterSubscriptionMutator().add(item,
+ parameterAskSubscriptionType);
- checkResult(initialSubscriptionType, initialAskSubscriptionType, expectedResult, expectedSubscriptionType, expectedAskSubscriptionType, item, subscriptionMutatorResult);
+ checkResult(initialSubscriptionType, initialAskSubscriptionType, expectedResult, expectedSubscriptionType,
+ expectedAskSubscriptionType, item, subscriptionMutatorResult);
}
- private void checkResult(SubscriptionType initialSubscriptionType, AskSubscriptionType initialAskSubscriptionType, RosterSubscriptionMutator.Result expectedResult, SubscriptionType expectedSubscriptionType, AskSubscriptionType expectedAskSubscriptionType, RosterItem item, RosterSubscriptionMutator.Result subscriptionMutatorResult) {
+ private void checkResult(SubscriptionType initialSubscriptionType, AskSubscriptionType initialAskSubscriptionType,
+ RosterSubscriptionMutator.Result expectedResult, SubscriptionType expectedSubscriptionType,
+ AskSubscriptionType expectedAskSubscriptionType, RosterItem item,
+ RosterSubscriptionMutator.Result subscriptionMutatorResult) {
assertEquals(expectedResult, subscriptionMutatorResult);
if (expectedSubscriptionType == null && expectedAskSubscriptionType == null) {
@@ -132,12 +147,13 @@ public class RosterSubscriptionMutatorTe
}
}
- private RosterItem prepareItem(SubscriptionType initialSubscriptionType, AskSubscriptionType initialAskSubscriptionType) {
+ private RosterItem prepareItem(SubscriptionType initialSubscriptionType,
+ AskSubscriptionType initialAskSubscriptionType) {
EntityImpl jid = null;
try {
jid = EntityImpl.parse("test@test.org");
} catch (EntityFormatException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
RosterItem item = new RosterItem(jid, "group", initialSubscriptionType, initialAskSubscriptionType);
return item;
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java Sat Jun 26 20:39:54 2010
@@ -20,25 +20,29 @@
package org.apache.vysper.xmpp.modules.roster.handler;
import junit.framework.TestCase;
-import org.apache.vysper.xmpp.stanza.StanzaBuilder;
-import org.apache.vysper.xmpp.stanza.IQStanzaType;
+
+import org.apache.vysper.storage.OpenStorageProviderRegistry;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
+import org.apache.vysper.xmpp.modules.roster.persistence.MemoryRosterManager;
import org.apache.vysper.xmpp.protocol.NamespaceURIs;
-import org.apache.vysper.xmpp.server.TestSessionContext;
import org.apache.vysper.xmpp.server.DefaultServerRuntimeContext;
-import org.apache.vysper.xmpp.addressing.EntityImpl;
+import org.apache.vysper.xmpp.server.TestSessionContext;
+import org.apache.vysper.xmpp.stanza.IQStanzaType;
+import org.apache.vysper.xmpp.stanza.StanzaBuilder;
import org.apache.vysper.xmpp.state.resourcebinding.ResourceState;
-import org.apache.vysper.xmpp.modules.roster.persistence.MemoryRosterManager;
-import org.apache.vysper.storage.OpenStorageProviderRegistry;
/**
*/
public class RosterIQHandlerTestCase extends TestCase {
-
+
private TestSessionContext sessionContext;
private String boundResourceId;
+
protected MemoryRosterManager rosterManager;
+
protected EntityImpl client;
+
protected RosterIQHandler handler;
@Override
@@ -48,11 +52,13 @@ public class RosterIQHandlerTestCase ext
client = EntityImpl.parse("tester@vysper.org");
sessionContext.setInitiatingEntity(client);
boundResourceId = sessionContext.bindResource();
- sessionContext.getServerRuntimeContext().getResourceRegistry().setResourceState(boundResourceId, ResourceState.CONNECTED);
+ sessionContext.getServerRuntimeContext().getResourceRegistry().setResourceState(boundResourceId,
+ ResourceState.CONNECTED);
rosterManager = new MemoryRosterManager();
OpenStorageProviderRegistry storageProviderRegistry = new OpenStorageProviderRegistry();
storageProviderRegistry.add(rosterManager);
- ((DefaultServerRuntimeContext) sessionContext.getServerRuntimeContext()).setStorageProviderRegistry(storageProviderRegistry);
+ ((DefaultServerRuntimeContext) sessionContext.getServerRuntimeContext())
+ .setStorageProviderRegistry(storageProviderRegistry);
handler = new RosterIQHandler();
}
@@ -63,13 +69,13 @@ public class RosterIQHandlerTestCase ext
assertEquals(ResourceState.CONNECTED, getResourceState());
handler.execute(stanzaBuilder.build(), sessionContext.getServerRuntimeContext(), true, sessionContext, null);
assertEquals(ResourceState.CONNECTED_INTERESTED, getResourceState());
-
-// C: <iq from='juliet@example.com/balcony'
-// type='get'
-// id='roster_get'>
-// <query xmlns='jabber:iq:roster'/>
-// </iq>
-
+
+ // C: <iq from='juliet@example.com/balcony'
+ // type='get'
+ // id='roster_get'>
+ // <query xmlns='jabber:iq:roster'/>
+ // </iq>
+
}
public void testRosterState_WithRosterGetAfterInitialPresence() {
@@ -77,21 +83,22 @@ public class RosterIQHandlerTestCase ext
StanzaBuilder stanzaBuilder = createRosterGet();
// mock intial presence resource state change
- sessionContext.getServerRuntimeContext().getResourceRegistry().setResourceState(boundResourceId, ResourceState.AVAILABLE);
-
+ sessionContext.getServerRuntimeContext().getResourceRegistry().setResourceState(boundResourceId,
+ ResourceState.AVAILABLE);
+
handler.execute(stanzaBuilder.build(), sessionContext.getServerRuntimeContext(), true, sessionContext, null);
assertEquals(ResourceState.AVAILABLE_INTERESTED, getResourceState());
}
private StanzaBuilder createRosterGet() {
- StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(new EntityImpl(client, boundResourceId), null, IQStanzaType.GET, "id1");
+ StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(new EntityImpl(client, boundResourceId), null,
+ IQStanzaType.GET, "id1");
stanzaBuilder.startInnerElement("query", NamespaceURIs.JABBER_IQ_ROSTER).endInnerElement();
return stanzaBuilder;
}
-
private ResourceState getResourceState() {
return sessionContext.getServerRuntimeContext().getResourceRegistry().getResourceState(boundResourceId);
}
-
+
}
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/ExtendedDiscoInfoTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/ExtendedDiscoInfoTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/ExtendedDiscoInfoTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/ExtendedDiscoInfoTestCase.java Sat Jun 26 20:39:54 2010
@@ -19,6 +19,9 @@
*/
package org.apache.vysper.xmpp.modules.servicediscovery.handler;
+import java.util.ArrayList;
+import java.util.List;
+
import junit.framework.TestCase;
import org.apache.vysper.xml.fragment.XMLElement;
@@ -44,17 +47,14 @@ import org.apache.vysper.xmpp.stanza.Sta
import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
import org.apache.vysper.xmpp.stanza.dataforms.DataForm;
-import java.util.ArrayList;
-import java.util.List;
-
/**
*/
public class ExtendedDiscoInfoTestCase extends TestCase {
-
+
public void testExtendedInfo() throws EntityFormatException {
// test if the data form is correctly added to the disco info response
-
+
ServiceCollector serviceCollector = new ServiceCollector();
serviceCollector.addInfoRequestListener(new InfoRequestListener() {
public List<InfoElement> getInfosFor(InfoRequest request) throws ServiceDiscoveryRequestException {
@@ -71,18 +71,22 @@ public class ExtendedDiscoInfoTestCase e
}
});
- DefaultServerRuntimeContext runtimeContext = new DefaultServerRuntimeContext(EntityImpl.parse("vysper.org"), null);
+ DefaultServerRuntimeContext runtimeContext = new DefaultServerRuntimeContext(EntityImpl.parse("vysper.org"),
+ null);
runtimeContext.registerServerRuntimeContextService(serviceCollector);
DiscoInfoIQHandler infoIQHandler = new DiscoInfoIQHandler();
- StanzaBuilder request = StanzaBuilder.createIQStanza(EntityImpl.parse("user@vysper.org"), EntityImpl.parse("info@vysper.org"), IQStanzaType.GET, "1");
+ StanzaBuilder request = StanzaBuilder.createIQStanza(EntityImpl.parse("user@vysper.org"), EntityImpl
+ .parse("info@vysper.org"), IQStanzaType.GET, "1");
- IQStanza finalStanza = (IQStanza)XMPPCoreStanza.getWrapper(request.build());
-
- Stanza resultStanza = infoIQHandler.handleGet(finalStanza, runtimeContext, new TestSessionContext(runtimeContext, new SessionStateHolder()));
+ IQStanza finalStanza = (IQStanza) XMPPCoreStanza.getWrapper(request.build());
- assertTrue(resultStanza.getVerifier().onlySubelementEquals("query", NamespaceURIs.XEP0030_SERVICE_DISCOVERY_INFO));
+ Stanza resultStanza = infoIQHandler.handleGet(finalStanza, runtimeContext, new TestSessionContext(
+ runtimeContext, new SessionStateHolder()));
+
+ assertTrue(resultStanza.getVerifier().onlySubelementEquals("query",
+ NamespaceURIs.XEP0030_SERVICE_DISCOVERY_INFO));
XMLElement queryElement = resultStanza.getFirstInnerElement();
XMLElementVerifier queryVerifier = queryElement.getVerifier();
assertTrue(queryVerifier.subElementsPresentExact(4));
@@ -91,5 +95,5 @@ public class ExtendedDiscoInfoTestCase e
XMLElementVerifier xmlElementVerifier = xmlElement.getVerifier();
assertTrue(xmlElementVerifier.nameEquals("x"));
}
-
+
}
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/AbstractProtocolStateTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/AbstractProtocolStateTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/AbstractProtocolStateTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/AbstractProtocolStateTestCase.java Sat Jun 26 20:39:54 2010
@@ -22,26 +22,31 @@ package org.apache.vysper.xmpp.protocol;
import junit.framework.TestCase;
import org.apache.vysper.xml.fragment.XMLElementVerifier;
+import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
+import org.apache.vysper.xmpp.delivery.StanzaReceiverRelay;
+import org.apache.vysper.xmpp.modules.core.base.BaseStreamStanzaDictionary;
import org.apache.vysper.xmpp.server.DefaultServerRuntimeContext;
+import org.apache.vysper.xmpp.server.SessionState;
import org.apache.vysper.xmpp.server.TestSessionContext;
import org.apache.vysper.xmpp.server.XMPPVersion;
-import org.apache.vysper.xmpp.server.SessionState;
import org.apache.vysper.xmpp.server.response.ServerResponses;
-import org.apache.vysper.xmpp.delivery.StanzaReceiverRelay;
-import org.apache.vysper.xmpp.modules.core.base.BaseStreamStanzaDictionary;
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
-import org.apache.vysper.xmpp.addressing.Entity;
-import org.apache.vysper.xmpp.addressing.EntityImpl;
/**
*/
public abstract class AbstractProtocolStateTestCase extends TestCase {
protected ProtocolWorker protocolWorker;
+
protected DefaultServerRuntimeContext serverRuntimeContext;
+
protected TestSessionContext sessionContext;
+
protected static Entity serverEnitity = new EntityImpl(null, "vysper-server.org", null);
- protected EntityImpl testFrom = new EntityImpl("testuser", "vysper.org", null);
+
+ protected EntityImpl testFrom = new EntityImpl("testuser", "vysper.org", null);
+
protected SessionStateHolder sessionStateHolder;
@Override
@@ -63,7 +68,8 @@ public abstract class AbstractProtocolSt
Stanza recordedResponse;
XMLElementVerifier responseVerifier;
stanza = new ServerResponses().getStreamOpener(true, testFrom, xmlLang, XMPPVersion.VERSION_1_0, null).build();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza,
+ sessionStateHolder);
recordedResponse = sessionContext.getNextRecordedResponse();
responseVerifier = recordedResponse.getVerifier();
@@ -84,7 +90,8 @@ public abstract class AbstractProtocolSt
stanzaBuilder.addAttribute("id", "1");
stanzaBuilder.addAttribute("type", "get");
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(),
+ sessionStateHolder);
Stanza response = sessionContext.getNextRecordedResponse();
XMLElementVerifier responseVerifier = response.getVerifier();
@@ -93,7 +100,6 @@ public abstract class AbstractProtocolSt
assertTrue(sessionContext.isClosed());
}
-
/**
* call from a test method in subclass
*/
@@ -102,16 +108,17 @@ public abstract class AbstractProtocolSt
stanzaBuilder.addAttribute("id", "1");
stanzaBuilder.addAttribute("type", "get");
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(),
+ sessionStateHolder);
Stanza response = sessionContext.getNextRecordedResponse();
-
+
XMLElementVerifier responseVerifier = response.getVerifier();
// error might be wrapped within a stream opener
if (responseVerifier.nameEquals("stream")) {
responseVerifier = response.getFirstInnerElement().getVerifier();
}
-
+
assertTrue(responseVerifier.nameEquals("error"));
assertTrue("error", responseVerifier.subElementPresent(StreamErrorCondition.UNSUPPORTED_STANZA_TYPE.value()));
assertTrue(sessionContext.isClosed());
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandler.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandler.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandler.java Sat Jun 26 20:39:54 2010
@@ -21,15 +21,19 @@
package org.apache.vysper.xmpp.protocol;
import org.apache.vysper.xml.fragment.XMLElement;
-import org.apache.vysper.xmpp.server.SessionContext;
import org.apache.vysper.xmpp.server.ServerRuntimeContext;
+import org.apache.vysper.xmpp.server.SessionContext;
import org.apache.vysper.xmpp.stanza.Stanza;
public class CallTestStanzaHandler implements StanzaHandler {
private boolean handlerCalled = false;
+
private String name;
+
private String namespaceURI = null;
+
private ProtocolException exception = null;
+
private boolean verifyCalled = false;
public CallTestStanzaHandler(String name, String namespaceURI) {
@@ -47,20 +51,24 @@ public class CallTestStanzaHandler imple
public boolean verify(Stanza stanza) {
verifyCalled = true;
- if (name != null && !name.equals(stanza.getName())) return false;
- if (namespaceURI == null) return true;
-
+ if (name != null && !name.equals(stanza.getName()))
+ return false;
+ if (namespaceURI == null)
+ return true;
+
//boolean elementNamespaceMatches = false;
//if (namespaceURI != null && namespaceURI.equals(stanza.getNamespacePrefix())) elementNamespaceMatches = true;
-
+
boolean outerNamespaceMatches = false;
boolean innerNamespaceMatches = false;
- if (namespaceURI != null && namespaceURI.equals(stanza.getNamespaceURI())) outerNamespaceMatches = true;
+ if (namespaceURI != null && namespaceURI.equals(stanza.getNamespaceURI()))
+ outerNamespaceMatches = true;
XMLElement firstInnerElement = stanza.getFirstInnerElement();
if (firstInnerElement != null) {
- if (namespaceURI != null && namespaceURI.equals(firstInnerElement.getNamespaceURI())) innerNamespaceMatches = true;
+ if (namespaceURI != null && namespaceURI.equals(firstInnerElement.getNamespaceURI()))
+ innerNamespaceMatches = true;
}
- return /*elementNamespaceMatches || */ outerNamespaceMatches || innerNamespaceMatches;
+ return /*elementNamespaceMatches || */outerNamespaceMatches || innerNamespaceMatches;
}
public boolean isSessionRequired() {
@@ -77,15 +85,20 @@ public class CallTestStanzaHandler imple
this.exception = exception;
}
- public ResponseStanzaContainer execute(Stanza stanza, ServerRuntimeContext serverRuntimeContext, boolean isOutboundStanza, SessionContext sessionContext, SessionStateHolder sessionStateHolder) throws ProtocolException {
- if (stanza == null || !stanza.getName().equals(getName()) || sessionContext == null) throw new RuntimeException("test failed");
+ public ResponseStanzaContainer execute(Stanza stanza, ServerRuntimeContext serverRuntimeContext,
+ boolean isOutboundStanza, SessionContext sessionContext, SessionStateHolder sessionStateHolder)
+ throws ProtocolException {
+ if (stanza == null || !stanza.getName().equals(getName()) || sessionContext == null)
+ throw new RuntimeException("test failed");
handlerCalled = true;
- if (exception != null) throw exception;
+ if (exception != null)
+ throw exception;
return null;
}
public void assertHandlerCalled() {
- if (!handlerCalled) throw new RuntimeException("handler not called");
+ if (!handlerCalled)
+ throw new RuntimeException("handler not called");
handlerCalled = false;
}
}
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandlerResponse.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandlerResponse.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandlerResponse.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/CallTestStanzaHandlerResponse.java Sat Jun 26 20:39:54 2010
@@ -20,9 +20,9 @@
package org.apache.vysper.xmpp.protocol;
-import org.apache.vysper.xmpp.stanza.Stanza;
-import org.apache.vysper.xmpp.server.SessionContext;
import org.apache.vysper.xmpp.server.ServerRuntimeContext;
+import org.apache.vysper.xmpp.server.SessionContext;
+import org.apache.vysper.xmpp.stanza.Stanza;
/**
*/
@@ -34,7 +34,9 @@ public class CallTestStanzaHandlerRespon
}
@Override
- public ResponseStanzaContainer execute(Stanza stanza, ServerRuntimeContext serverRuntimeContext, boolean isOutboundStanza, SessionContext sessionContext, SessionStateHolder sessionStateHolder) throws ProtocolException {
+ public ResponseStanzaContainer execute(Stanza stanza, ServerRuntimeContext serverRuntimeContext,
+ boolean isOutboundStanza, SessionContext sessionContext, SessionStateHolder sessionStateHolder)
+ throws ProtocolException {
super.execute(stanza, serverRuntimeContext, true, sessionContext, null);
return new ResponseStanzaContainerImpl(getResponseStanza());
}
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptedTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptedTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptedTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptedTestCase.java Sat Jun 26 20:39:54 2010
@@ -37,5 +37,4 @@ public class ProtocolEncryptedTestCase e
skeleton_testDontAcceptArbitraryStanzaWhileNotAuthenticated();
}
-
}
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolEncryptionStartedTestCase.java Sat Jun 26 20:39:54 2010
@@ -40,5 +40,4 @@ public class ProtocolEncryptionStartedTe
skeleton_testDontAcceptArbitraryStanzaWhileNotAuthenticated();
}
-
}
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java Sat Jun 26 20:39:54 2010
@@ -20,7 +20,6 @@
package org.apache.vysper.xmpp.protocol;
-import org.apache.vysper.xml.fragment.Renderer;
import org.apache.vysper.xml.fragment.XMLElementVerifier;
import org.apache.vysper.xmpp.server.SessionState;
import org.apache.vysper.xmpp.server.XMPPVersion;
@@ -40,7 +39,7 @@ public class ProtocolInitiatedTestCase e
Stanza recordedResponse = sessionContext.getNextRecordedResponse();
XMLElementVerifier responseVerifier = recordedResponse.getVerifier();
-
+
assertTrue(responseVerifier.nameEquals("stream"));
assertTrue(responseVerifier.attributeEquals(NamespaceURIs.XML, "lang", "fr"));
@@ -79,11 +78,10 @@ public class ProtocolInitiatedTestCase e
protected void openClientSession() {
sessionContext.setSessionState(getDefaultState());
- Stanza stanza = new ServerResponses().getStreamOpener(true,
- testFrom,
- sessionContext.getXMLLang(),
- XMPPVersion.VERSION_1_0, null).build();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
+ Stanza stanza = new ServerResponses().getStreamOpener(true, testFrom, sessionContext.getXMLLang(),
+ XMPPVersion.VERSION_1_0, null).build();
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza,
+ sessionStateHolder);
}
public void testProcessClientStreamOpeningResponse_Version_1_0() {
@@ -157,18 +155,19 @@ public class ProtocolInitiatedTestCase e
protected Stanza getVersionResponse(XMPPVersion versionSent) {
Stanza stanza = new ServerResponses().getStreamOpener(true, testFrom, null, versionSent, null).build();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza,
+ sessionStateHolder);
return sessionContext.getNextRecordedResponse();
}
public void testProcessClientStreamOpeningResponse_MissingMainNamespace() {
// we do not supply "http://etherx.jabber.org/streams"
- StanzaBuilder stanzaBuilder = new StanzaBuilder("stream")
- .declareNamespace("", NamespaceURIs.JABBER_CLIENT)
- .addAttribute(NamespaceURIs.XML, "lang", "en_UK")
- .addAttribute("version", XMPPVersion.VERSION_1_0.toString());
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
+ StanzaBuilder stanzaBuilder = new StanzaBuilder("stream").declareNamespace("", NamespaceURIs.JABBER_CLIENT)
+ .addAttribute(NamespaceURIs.XML, "lang", "en_UK").addAttribute("version",
+ XMPPVersion.VERSION_1_0.toString());
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(),
+ sessionStateHolder);
Stanza response = sessionContext.getNextRecordedResponse();
XMLElementVerifier responseVerifier = response.getVerifier();
@@ -176,7 +175,7 @@ public class ProtocolInitiatedTestCase e
assertTrue("error", responseVerifier.subElementPresent(StreamErrorCondition.INVALID_NAMESPACE.value()));
}
-
+
public void testDontAcceptIQStanzaWhileNotAuthenticated() {
skeleton_testDontAcceptIQStanzaWhileNotAuthenticated();
}
@@ -185,5 +184,4 @@ public class ProtocolInitiatedTestCase e
skeleton_testDontAcceptArbitraryStanzaWhileNotAuthenticated();
}
-
}
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStartedTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStartedTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStartedTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolStartedTestCase.java Sat Jun 26 20:39:54 2010
@@ -39,5 +39,4 @@ public class ProtocolStartedTestCase ext
skeleton_testDontAcceptArbitraryStanzaWhileNotAuthenticated();
}
-
}
Modified: mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java?rev=958281&r1=958280&r2=958281&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java (original)
+++ mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java Sat Jun 26 20:39:54 2010
@@ -17,33 +17,38 @@
package org.apache.vysper.xmpp.protocol;
+import junit.framework.TestCase;
+
import org.apache.vysper.xml.fragment.XMLElement;
import org.apache.vysper.xml.fragment.XMLElementVerifier;
import org.apache.vysper.xml.fragment.XMLSemanticError;
+import org.apache.vysper.xmpp.addressing.Entity;
+import org.apache.vysper.xmpp.addressing.EntityImpl;
+import org.apache.vysper.xmpp.delivery.StanzaReceiverRelay;
import org.apache.vysper.xmpp.server.DefaultServerRuntimeContext;
import org.apache.vysper.xmpp.server.SessionState;
import org.apache.vysper.xmpp.server.TestSessionContext;
+import org.apache.vysper.xmpp.stanza.IQStanza;
+import org.apache.vysper.xmpp.stanza.IQStanzaType;
import org.apache.vysper.xmpp.stanza.Stanza;
import org.apache.vysper.xmpp.stanza.StanzaBuilder;
-import org.apache.vysper.xmpp.stanza.IQStanzaType;
-import org.apache.vysper.xmpp.stanza.IQStanza;
import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
-import org.apache.vysper.xmpp.addressing.Entity;
-import org.apache.vysper.xmpp.addressing.EntityImpl;
-import org.apache.vysper.xmpp.delivery.StanzaReceiverRelay;
import org.apache.vysper.xmpp.state.resourcebinding.BindException;
-import junit.framework.TestCase;
/**
* test basic behavior of ProtocolWorker.processStanza()
*/
public class ProtocolWorkerProcessTestCase extends TestCase {
private ProtocolWorker protocolWorker;
+
private NamespaceHandlerDictionary namespaceHandlerDictionary;
+
private DefaultServerRuntimeContext serverRuntimeContext;
+
private TestSessionContext sessionContext;
private static Entity serverEnitity = new EntityImpl(null, "test", null);
+
private SessionStateHolder sessionStateHolder;
@Override
@@ -65,12 +70,14 @@ public class ProtocolWorkerProcessTestCa
sessionContext.setSessionState(SessionState.AUTHENTICATED);
Stanza stanza = new StanzaBuilder("ProtocolWorkerProcessTestCase", "testNSURI").build();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza,
+ sessionStateHolder);
Stanza recordedResponse = sessionContext.getNextRecordedResponse();
XMLElementVerifier verifier = recordedResponse.getVerifier();
assertTrue("error", verifier.nameEquals("error"));
- assertTrue("unsupported stanza type", verifier.subElementPresent(StreamErrorCondition.UNSUPPORTED_STANZA_TYPE.value()));
+ assertTrue("unsupported stanza type", verifier.subElementPresent(StreamErrorCondition.UNSUPPORTED_STANZA_TYPE
+ .value()));
}
public void testProcessStanzaNoResponse() {
@@ -82,7 +89,8 @@ public class ProtocolWorkerProcessTestCa
Stanza stanza = new StanzaBuilder("ProtocolWorkerProcessTestCase", "testNSURI").build();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza,
+ sessionStateHolder);
stanzaHandler.assertHandlerCalled();
Stanza recordedResponse = sessionContext.getNextRecordedResponse();
@@ -101,14 +109,16 @@ public class ProtocolWorkerProcessTestCa
stanzaHandler.setResponseStanza(responseStanza);
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza,
+ sessionStateHolder);
stanzaHandler.assertHandlerCalled();
Stanza recordedResponse = sessionContext.getNextRecordedResponse();
assertEquals("response handled", responseStanza, recordedResponse);
stanzaHandler.setResponseStanza(null);
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza,
+ sessionStateHolder);
assertNull("handler emmitted null as response", stanzaHandler.getResponseStanza());
}
@@ -123,7 +133,8 @@ public class ProtocolWorkerProcessTestCa
Stanza stanza = new StanzaBuilder("ProtocolWorkerProcessTestCase", "testNSURI").build();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza,
+ sessionStateHolder);
Stanza recordedResponse = sessionContext.getNextRecordedResponse();
assertEquals("bad format", "error", recordedResponse.getName());
@@ -139,7 +150,8 @@ public class ProtocolWorkerProcessTestCa
Stanza stanza = new StanzaBuilder("ProtocolWorkerProcessTestCase", "testNSURI").build();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza,
+ sessionStateHolder);
try {
stanzaHandler.assertHandlerCalled();
@@ -170,8 +182,9 @@ public class ProtocolWorkerProcessTestCa
// we set a different from user name 'ernest'!
stanzaBuilder.addAttribute("from", new EntityImpl("ernest", server.getDomain(), null).getFullQualifiedName());
stanzaBuilder.startInnerElement("query", "jabber:iq:roster").endInnerElement();
-
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
+
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(),
+ sessionStateHolder);
try {
stanzaHandler.assertHandlerCalled();
@@ -196,10 +209,12 @@ public class ProtocolWorkerProcessTestCa
String onlyBoundResource = sessionContext.bindResource();
StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(null, null, IQStanzaType.GET, "test");
- stanzaBuilder.addAttribute("from", new EntityImpl("charlotte", server.getDomain(), onlyBoundResource).getFullQualifiedName());
+ stanzaBuilder.addAttribute("from", new EntityImpl("charlotte", server.getDomain(), onlyBoundResource)
+ .getFullQualifiedName());
stanzaBuilder.startInnerElement("query", "testNSURI").endInnerElement();
-
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
+
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(),
+ sessionStateHolder);
stanzaHandler.assertHandlerCalled();
}
@@ -216,13 +231,15 @@ public class ProtocolWorkerProcessTestCa
String onlyBoundResource = sessionContext.bindResource();
String arbitraryUnboundResource = "unboundResourceID";
-
+
StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(null, null, IQStanzaType.GET, "test");
-
- stanzaBuilder.addAttribute("from", new EntityImpl("charlotte", server.getDomain(), arbitraryUnboundResource).getFullQualifiedName());
+
+ stanzaBuilder.addAttribute("from", new EntityImpl("charlotte", server.getDomain(), arbitraryUnboundResource)
+ .getFullQualifiedName());
stanzaBuilder.startInnerElement("query", "testNSURI").endInnerElement();
-
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
+
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(),
+ sessionStateHolder);
try {
stanzaHandler.assertHandlerCalled();
@@ -238,7 +255,7 @@ public class ProtocolWorkerProcessTestCa
// from="client@vysper.org" is only allowed when a single resource is bound
// if there is more than one resource bound in the same session, from must come
// fully qualified, e.g. from="client@vysper.org/resourceId"
-
+
Entity server = sessionContext.getServerRuntimeContext().getServerEnitity();
sessionContext.setSessionState(SessionState.AUTHENTICATED);
// the session is running for 'lea'
@@ -253,32 +270,37 @@ public class ProtocolWorkerProcessTestCa
StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(null, null, IQStanzaType.GET, "test");
stanzaBuilder.addAttribute("from", new EntityImpl("lea", server.getDomain(), null).getFullQualifiedName());
stanzaBuilder.startInnerElement("query", "testNSURI").endInnerElement();
-
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
+
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(),
+ sessionStateHolder);
Stanza recordedResponse = sessionContext.getNextRecordedResponse();
assertUnknownSenderError(recordedResponse); // not allowed, bare id without resource and two resources bound
sessionContext.reset();
-
+
// unbind second resource, leaving only one
- boolean noResourceRemains = sessionContext.getServerRuntimeContext().getResourceRegistry().unbindResource(secondBoundResource);
+ boolean noResourceRemains = sessionContext.getServerRuntimeContext().getResourceRegistry().unbindResource(
+ secondBoundResource);
assertFalse(noResourceRemains);
// bare id allowed, only one resource is bound
stanzaBuilder = StanzaBuilder.createIQStanza(null, null, IQStanzaType.GET, "test");
stanzaBuilder.addAttribute("from", new EntityImpl("lea", server.getDomain(), null).getFullQualifiedName());
stanzaBuilder.startInnerElement("query", "testNSURI").endInnerElement();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(),
+ sessionStateHolder);
stanzaHandler.assertHandlerCalled();
sessionContext.reset();
// second resource is now invalid and cannot be used anymore in a full qualified entity
stanzaBuilder = StanzaBuilder.createIQStanza(null, null, IQStanzaType.GET, "test");
- stanzaBuilder.addAttribute("from", new EntityImpl("lea", server.getDomain(), secondBoundResource).getFullQualifiedName());
+ stanzaBuilder.addAttribute("from", new EntityImpl("lea", server.getDomain(), secondBoundResource)
+ .getFullQualifiedName());
stanzaBuilder.startInnerElement("query", "testNSURI").endInnerElement();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(),
+ sessionStateHolder);
recordedResponse = sessionContext.getNextRecordedResponse();
assertUnknownSenderError(recordedResponse);
-
+
}
private void assertUnknownSenderError(Stanza recordedResponse) throws XMLSemanticError {