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/06/24 18:58:39 UTC

svn commit: r671252 - in /labs/vysper/src: main/java/org/apache/vysper/xmpp/delivery/ main/java/org/apache/vysper/xmpp/server/ main/java/org/apache/vysper/xmpp/stanza/ test/java/org/apache/vysper/xmpp/modules/core/im/handler/

Author: berndf
Date: Tue Jun 24 09:58:39 2008
New Revision: 671252

URL: http://svn.apache.org/viewvc?rev=671252&view=rev
Log:
[vysper] test outbound presence (ongoing) (LABS-133)

Modified:
    labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaReceiverRelay.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
    labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandlerTestCase.java

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaReceiverRelay.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaReceiverRelay.java?rev=671252&r1=671251&r2=671252&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaReceiverRelay.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/delivery/StanzaReceiverRelay.java Tue Jun 24 09:58:39 2008
@@ -33,6 +33,9 @@
     private Map<Entity, StanzaReceiver> receiverMap = new HashMap<Entity, StanzaReceiver>();
     private boolean exploitFailureStrategy = true;
     private ServerRuntimeContext serverRuntimeContext = null;
+    private int countRelayed = 0;
+    private int countFailed = 0;
+    private int countDelivered = 0;
 
     public void setServerRuntimeContext(ServerRuntimeContext serverRuntimeContext) {
         this.serverRuntimeContext = serverRuntimeContext;
@@ -43,17 +46,32 @@
     }
 
     public void relay(Entity receiver, Stanza stanza, DeliveryFailureStrategy deliveryFailureStrategy) throws DeliveryException {
+        countRelayed++;
         if (receiver == null) throw new DeliveryException("receiver cannot be NULL");
         if (receiverMap.get(receiver) == null) {
 
             if (deliveryFailureStrategy != null && exploitFailureStrategy) {
+                countFailed++;
                 deliveryFailureStrategy.process(stanza, null);
+                // TODO needs return here?
             }
 
             throw new LocalRecipientNotReachableException("cannot find receiver " + receiver.getFullQualifiedName());
         }
         
+        countDelivered++;
         receiverMap.get(receiver).deliver(stanza);
     }
 
+    public int getCountRelayed() {
+        return countRelayed;
+    }
+
+    public int getCountFailed() {
+        return countFailed;
+    }
+
+    public int getCountDelivered() {
+        return countDelivered;
+    }
 }

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java?rev=671252&r1=671251&r2=671252&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/server/DefaultServerRuntimeContext.java Tue Jun 24 09:58:39 2008
@@ -100,7 +100,7 @@
         this.resourceRegistry = new ResourceRegistry();
         
         // TODO remove this temporary solution as soon as a roster module exists -> addModule()
-        registerServerRuntimeContextService(new MemoryRosterManager());
+//        registerServerRuntimeContextService(new MemoryRosterManager());
     }
 
     public DefaultServerRuntimeContext(Entity serverEntity, 

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java?rev=671252&r1=671251&r2=671252&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/stanza/StanzaBuilder.java Tue Jun 24 09:58:39 2008
@@ -28,6 +28,7 @@
 import java.util.Stack;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Iterator;
 
 /**
  */
@@ -97,13 +98,17 @@
     public static StanzaBuilder createClone(XMLElement original, boolean deep, List<Attribute> replacingAttributes) {
         StanzaBuilder stanzaBuilder = new StanzaBuilder(original.getName(), original.getNamespace());
 
+        List<Attribute> replacingAttributesCopy = new ArrayList<Attribute>(replacingAttributes);
+                
         List<Attribute> originalAttributes = original.getAttributes();
         for (Attribute originalAttribute : originalAttributes) {
             boolean wasReplaced = false;
-            for (Attribute replacingAttribute : replacingAttributes) {
+            for (Iterator<Attribute> it = replacingAttributesCopy.iterator(); it.hasNext();) {
+                Attribute replacingAttribute = it.next();
                 if (replacingAttribute == null) continue;
                 if (replacingAttribute.equals(originalAttribute)) {
                     stanzaBuilder.addAttribute(replacingAttribute);
+                    it.remove(); // this has been processed
                     wasReplaced = true;
                     break;
                 }
@@ -111,6 +116,11 @@
             if (!wasReplaced) stanzaBuilder.addAttribute(originalAttribute);
         }
 
+        // add remaining replacements, which are actually additions
+        for (Attribute additionalAttribute : replacingAttributesCopy) {
+            stanzaBuilder.addAttribute(additionalAttribute);
+        }
+        
         // copy over immutable inner elements
         if (deep && original.getInnerElements() != null) {
             List<XMLElement> innerElements = original.getInnerElements();

Modified: labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandlerTestCase.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandlerTestCase.java?rev=671252&r1=671251&r2=671252&view=diff
==============================================================================
--- labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandlerTestCase.java (original)
+++ labs/vysper/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandlerTestCase.java Tue Jun 24 09:58:39 2008
@@ -21,11 +21,14 @@
 import org.apache.vysper.xmpp.addressing.EntityImpl;
 import org.apache.vysper.xmpp.addressing.EntityFormatException;
 import org.apache.vysper.xmpp.delivery.StanzaReceiverQueue;
+import org.apache.vysper.xmpp.delivery.DeliveringStanzaRelay;
+import org.apache.vysper.xmpp.delivery.StanzaReceiverRelay;
 import org.apache.vysper.xmpp.resourcebinding.ResourceState;
 import org.apache.vysper.xmpp.resourcebinding.BindException;
 import org.apache.vysper.xmpp.server.TestSessionContext;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
 import org.apache.vysper.xmpp.stanza.XMPPCoreStanza;
+import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.modules.roster.persistence.MemoryRosterManager;
 
 /**
@@ -38,6 +41,7 @@
     protected EntityImpl client;
     private PresenceHandler handler = new PresenceHandler();
     private StanzaReceiverQueue initiatorsQueue;
+    private EntityImpl clientFullQualified = null;
 
     protected void setUp() throws Exception {
         super.setUp();
@@ -48,6 +52,7 @@
         boundResourceId = sessionContext.bindResource();
         initiatorsQueue = sessionContext.addReceiver(client, boundResourceId);
         setResourceState(boundResourceId, ResourceState.INTERESTED);
+        clientFullQualified = new EntityImpl(client, boundResourceId);
     }
 
     private void setResourceState(String resourceId, ResourceState state) {
@@ -64,14 +69,34 @@
         setResourceState(anotherAvailableResourceId, ResourceState.AVAILABLE);
         StanzaReceiverQueue unrelatedQueue = sessionContext.addReceiver(EntityImpl.parse("unrelated@vysper.org"), null);
 
+        // now we have: 
+        // 3 sessions for the same entity: one initiating, one interested (not yet avail), one available
+
         assertEquals(ResourceState.INTERESTED, getResourceState());
         handler.executeCore(initialPresence, sessionContext);
+        // check resource state change
         assertEquals(ResourceState.AVAILABLE, getResourceState());
 
-        assertNotNull(initiatorsQueue.getNext());
-        assertNull(anotherInterestedResourceQueue.getNext());
-        assertNotNull(anotherAvailableResourceQueue.getNext());
-        assertNull(unrelatedQueue.getNext());
+        assertEquals(2, ((StanzaReceiverRelay) sessionContext.getServerRuntimeContext().getStanzaRelay()).getCountDelivered());
+        
+        assertNull(anotherInterestedResourceQueue.getNext()); // does not sent pres to un-available
+        assertNull(unrelatedQueue.getNext()); // does not sent pres to everybody arbitrarily
+
+        Stanza initiatorNotification = initiatorsQueue.getNext();
+        assertNotNull(initiatorNotification);
+        assertTrue(initiatorNotification.getVerifier().nameEquals("presence"));
+        assertTrue(initiatorNotification.getVerifier().fromAttributeEquals(clientFullQualified.getFullQualifiedName()));
+        assertTrue(initiatorNotification.getVerifier().toAttributeEquals(clientFullQualified.getFullQualifiedName()));
+        
+        Stanza availableResourceNotification = anotherAvailableResourceQueue.getNext();
+        assertNotNull(availableResourceNotification);
+        assertTrue(availableResourceNotification.getVerifier().nameEquals("presence"));
+        assertTrue(availableResourceNotification.getVerifier().fromAttributeEquals(clientFullQualified.getFullQualifiedName()));
+        assertTrue(availableResourceNotification.getVerifier().toAttributeEquals(client.getFullQualifiedName() + "/" + anotherAvailableResourceId));
+        
+        // TODO test TO contacts recv pres, too
+        
+        // TODO test presence probes
         
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org