You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by be...@apache.org on 2008/04/22 23:08:01 UTC
svn commit: r650654 - in /labs/vysper/src:
main/java/org/apache/vysper/xmpp/modules/core/base/handler/
main/java/org/apache/vysper/xmpp/protocol/
test/java/org/apache/vysper/xmpp/protocol/
Author: berndf
Date: Tue Apr 22 14:07:59 2008
New Revision: 650654
URL: http://svn.apache.org/viewvc?rev=650654&view=rev
Log:
[vysper] adopt unit tests to the fact that we return ServiceUnavailableStanzaErrorHandler in most cases now to not terminate connection with client
Modified:
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java
labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java?rev=650654&r1=650653&r2=650654&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/IQHandler.java Tue Apr 22 14:07:59 2008
@@ -27,6 +27,7 @@
import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
import org.apache.vysper.xmpp.xmlfragment.XMLElementVerifier;
+import org.apache.vysper.compliance.SpecCompliant;
import java.util.List;
@@ -53,6 +54,7 @@
return firstInnerElement.getVerifier().namespacePresent(namespace);
}
+ @SpecCompliant(spec="3920", section="9.2.3#1,2,5,6", status=SpecCompliant.ComplianceStatus.FINISHED)
protected Stanza executeCore(XMPPCoreStanza coreStanza, SessionContext sessionContext) {
IQStanza stanza = (IQStanza)coreStanza;
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java?rev=650654&r1=650653&r2=650654&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookup.java Tue Apr 22 14:07:59 2008
@@ -63,7 +63,7 @@
else if (presenceHandler.verify(stanza)) return getPresenceHandler(stanza);
else {
// this is not a core stanza (RFC3920),
- // could be a test, or custom extension, so we delegate
+ // could be a test, or custom extension, or from the handshake so we delegate
return getHandlerForElement(stanza, stanza);
}
}
Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java?rev=650654&r1=650653&r2=650654&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java Tue Apr 22 14:07:59 2008
@@ -27,6 +27,7 @@
import org.apache.vysper.xmpp.modules.core.base.handler.PresenceHandler;
import org.apache.vysper.xmpp.modules.core.base.handler.MessageHandler;
import org.apache.vysper.xmpp.modules.core.base.handler.TestIQHandler;
+import org.apache.vysper.xmpp.server.TestSessionContext;
import java.util.ArrayList;
@@ -50,7 +51,7 @@
Stanza nonExistingStanza = new Stanza("testDictionaryHierarchyNotExist", "testNSURI", new ArrayList<Attribute>(), new ArrayList<XMLFragment>());
StanzaHandler handler = stanzaHandlerLookup.getHandler(nonExistingStanza);
- assertNull("handler not found", handler);
+ assertTrue(handler instanceof ServiceUnavailableStanzaErrorHandler);
Stanza existingStanzaNS1 = new Stanza("testDictionaryHierarchy", "testNSURI1", new ArrayList<Attribute>(), new ArrayList<XMLFragment>());
handler = stanzaHandlerLookup.getHandler(existingStanzaNS1);
@@ -99,7 +100,7 @@
Stanza stanza = new StanzaBuilder("iq", "arbitraryNamespace").getFinalStanza();
StanzaHandler handler = stanzaHandlerLookup.getHandler(stanza);
- assertNull("iq handler with arbitrary namespace not found", handler);
+ assertTrue("iq handler with arbitrary namespace not found", handler instanceof IQHandler);
}
public void testLookupPresenceHandler() {
@@ -134,7 +135,7 @@
Stanza stanza = buildStanza("testOK", "test:namespace:FAIL");
StanzaHandler handler = stanzaHandlerLookup.getHandler(stanza);
- assertNull("handler not found for NS", handler);
+ assertTrue("handler not found for NS", handler instanceof ServiceUnavailableStanzaErrorHandler);
stanza = buildStanza("testFAIL", "test:namespace:OK");
handler = stanzaHandlerLookup.getHandler(stanza);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org