svn commit: r1084521 - in /mina/vysper/trunk/server: core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/ extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/

[ngn]

Author: ngn
Date: Wed Mar 23 09:35:35 2011
New Revision: 1084521

URL: http://svn.apache.org/viewvc?rev=1084521&view=rev
Log:
Fixing broken unit test for disco result relays

Modified:
    
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandlerTestCase.java
    
mina/vysper/trunk/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IntegrationTest.java

Modified: 
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandlerTestCase.java
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandlerTestCase.java?rev=1084521&r1=1084520&r2=1084521&view=diff
==============================================================================
--- 
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandlerTestCase.java
 (original)
+++ 
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandlerTestCase.java
 Wed Mar 23 09:35:35 2011
@@ -288,23 +288,23 @@ public class DiscoInfoIQHandlerTestCase 
     }
     
     @Test
-    public void handleResultToUserWithResource() throws Exception {
+    public void handleResultToUser() throws Exception {
         when(sessionContext.getInitiatingEntity()).thenReturn(FROM);
         
-        IQStanza stanza = createRequest(USER_WITH_RESOURCE, 
IQStanzaType.RESULT);
+        IQStanza stanza = createRequest(USER, IQStanzaType.RESULT);
         
         Stanza response = handler.handleResult(stanza, serverRuntimeContext, 
sessionContext);
         
         Assert.assertNull(response);
         
-        verify(stanzaRelay).relay(eq(USER_WITH_RESOURCE), eq(stanza), 
any(DeliveryFailureStrategy.class));
+        verify(stanzaRelay).relay(eq(USER), eq(stanza), 
any(DeliveryFailureStrategy.class));
     }
     
     @Test
-    public void handleResultToUserWithResourceInbound() throws Exception {
+    public void handleResultToUserInbound() throws Exception {
         when(sessionContext.getInitiatingEntity()).thenReturn(USER);
         
-        IQStanza stanza = createRequest(USER_WITH_RESOURCE, 
IQStanzaType.RESULT);
+        IQStanza stanza = createRequest(USER, IQStanzaType.RESULT);
         
         Stanza response = handler.handleResult(stanza, serverRuntimeContext, 
sessionContext);
         
@@ -313,19 +313,6 @@ public class DiscoInfoIQHandlerTestCase 
         verify(stanzaWriter).write(stanza);
     }
     
-    @Test
-    public void handleResultToUser() throws Exception {
-        when(sessionContext.getInitiatingEntity()).thenReturn(FROM);
-        
-        IQStanza stanza = createRequest(USER, IQStanzaType.RESULT);
-        
-        Stanza response = handler.handleResult(stanza, serverRuntimeContext, 
sessionContext);
-        
-        Stanza expected = createErrorResponse(SERVER, 
"feature-not-implemented");
-        
-        StanzaAssert.assertEquals(expected, response);
-    }
-    
     private Stanza createErrorResponse(Entity from, String error) {
         Stanza expected = StanzaBuilder.createIQStanza(from, FROM, 
IQStanzaType.ERROR, "id1")
         .startInnerElement("query", 
NamespaceURIs.XEP0030_SERVICE_DISCOVERY_INFO)

Modified: 
mina/vysper/trunk/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IntegrationTest.java
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IntegrationTest.java?rev=1084521&r1=1084520&r2=1084521&view=diff
==============================================================================
--- 
mina/vysper/trunk/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IntegrationTest.java
 (original)
+++ 
mina/vysper/trunk/server/extensions/xep0065-socks/src/test/java/org/apache/vysper/xmpp/extension/xep0065_socks/Socks5IntegrationTest.java
 Wed Mar 23 09:35:35 2011
@@ -105,7 +105,6 @@ public class Socks5IntegrationTest {
         // enable direct connections
         SmackConfiguration.setLocalSocks5ProxyEnabled(true);
 
-        
         assertTransfer();
     }