Send info from gossip initiator

2 files changed, 106 insertions, 11 deletions

diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlTest.java b/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlTest.java
index 1d6496c..7ac27e9 100644
--- a/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlTest.java
+++ b/src/test/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlTest.java
@@ -14,10 +14,13 @@ import java.util.Set;
 
 import pl.edu.mimuw.cloudatlas.agent.MockExecutor;
 import pl.edu.mimuw.cloudatlas.agent.messages.AgentMessage;
+import pl.edu.mimuw.cloudatlas.agent.messages.AttributesMessage;
 import pl.edu.mimuw.cloudatlas.agent.messages.HejkaMessage;
 import pl.edu.mimuw.cloudatlas.agent.messages.GetStateMessage;
 import pl.edu.mimuw.cloudatlas.agent.messages.GossipGirlMessage;
 import pl.edu.mimuw.cloudatlas.agent.messages.InitiateGossipMessage;
+import pl.edu.mimuw.cloudatlas.agent.messages.QueryMessage;
+import pl.edu.mimuw.cloudatlas.agent.messages.NoCoTamMessage;
 import pl.edu.mimuw.cloudatlas.agent.messages.StanikMessage;
 import pl.edu.mimuw.cloudatlas.agent.messages.StateMessage;
 import pl.edu.mimuw.cloudatlas.agent.messages.UDUPMessage;
@@ -41,10 +44,11 @@ public class GossipGirlTest {
     private final PathName theirPath = new PathName("/son/bro");
     private ValueContact theirContact;
     private InitiateGossipMessage initiateGossipMessage;
-    private ZMI initiatorHierarchy;
     private ValueTime testTime;
+    private ZMI initiatorHierarchy;
     private Map<Attribute, Entry<ValueQuery, ValueTime>> initiatorQueries;
     private StateMessage initiatorStateMessage;
+    private NoCoTamMessage noCoTamMessage;
 
     @Before
     public void setupLocals() throws Exception {
@@ -66,6 +70,36 @@ public class GossipGirlTest {
         setupHierarchy();
         setupQueries();
         initiatorStateMessage = new StateMessage("", ModuleType.GOSSIP, 0, 0, initiatorHierarchy, initiatorQueries);
+
+        Map<PathName, ValueTime> otherZoneTimestamps = makeOtherZoneTimestamps();
+        Map<Attribute, ValueTime> otherQueryTimestamps = makeOtherQueryTimestamps();
+
+        noCoTamMessage = new NoCoTamMessage("", 0, 0, 42, otherZoneTimestamps, otherQueryTimestamps, TestUtil.addToTime(testTime, 10), TestUtil.addToTime(testTime, 22));
+    }
+
+    public Map<PathName, ValueTime> makeOtherZoneTimestamps() {
+        Map<PathName, ValueTime> zoneTimestamps = new HashMap();
+        addOtherZoneTimestamp(zoneTimestamps, "/son/sis", -100);
+        addOtherZoneTimestamp(zoneTimestamps, "/son/bro", 0);
+        addOtherZoneTimestamp(zoneTimestamps, "/son/whodis", -300);
+
+        return zoneTimestamps;
+    }
+
+    public Map<Attribute, ValueTime> makeOtherQueryTimestamps() {
+        Map<Attribute, ValueTime> queryTimestamps = new HashMap();
+        addOtherQueryTimestamp(queryTimestamps, "&one", 10);
+        addOtherQueryTimestamp(queryTimestamps, "&query", -400);
+        addOtherQueryTimestamp(queryTimestamps, "&three", 0);
+        return queryTimestamps;
+    }
+
+    public void addOtherQueryTimestamp(Map<Attribute, ValueTime> timestamps, String name, long offset) {
+        timestamps.put(new Attribute(name), TestUtil.addToTime(testTime, offset));
+    }
+
+    public void addOtherZoneTimestamp(Map<PathName, ValueTime> timestamps, String path, long offset) {
+        timestamps.put(new PathName(path), TestUtil.addToTime(testTime, offset));
     }
 
     public void setupHierarchy() {
@@ -80,6 +114,7 @@ public class GossipGirlTest {
     public void setupQueries() throws Exception {
         initiatorQueries = new HashMap();
         addQuery(initiatorQueries, "&one", "SELECT 1 AS one", testTime);
+        addQuery(initiatorQueries, "&two", "SELECT 2 AS two", testTime);
         addQuery(initiatorQueries, "&query", "SELECT sum(foo) AS foo", testTime);
     }
 
@@ -123,15 +158,12 @@ public class GossipGirlTest {
         gossipGirl.handleTyped(initiatorStateMessage);
 
         AgentMessage receivedMessage = executor.messagesToPass.poll();
-        assertNotNull(receivedMessage);
-        assertEquals(ModuleType.UDP, receivedMessage.getDestinationModule());
-        UDUPMessage udupMessage = (UDUPMessage) receivedMessage;
-        assertEquals(new PathName("/son/bro"), udupMessage.getContact().getName());
-        assertEquals(ModuleType.GOSSIP, udupMessage.getContent().getDestinationModule());
-        GossipGirlMessage gossipMessage = (GossipGirlMessage) udupMessage.getContent();
-
-        assertEquals(GossipGirlMessage.Type.HEJKA, gossipMessage.getType());
-        HejkaMessage hejkaMessage = (HejkaMessage) gossipMessage;
+        assertUDUPMessage(
+                receivedMessage,
+                new PathName("/son/bro"),
+                GossipGirlMessage.Type.HEJKA
+        );
+        HejkaMessage hejkaMessage = (HejkaMessage) ((UDUPMessage) receivedMessage).getContent();
         assertEquals(0, hejkaMessage.getSenderGossipId());
         System.out.println(hejkaMessage.getZoneTimestamps().keySet());
         assertEquals(3, TestUtil.iterableSize(hejkaMessage.getZoneTimestamps().keySet()));
@@ -140,6 +172,65 @@ public class GossipGirlTest {
         assertThat(zoneSet, hasItems(new PathName("/son/sis")));
         assertThat(zoneSet, hasItems(new PathName("/son/grand")));
 
-        assertEquals(2, TestUtil.iterableSize(hejkaMessage.getQueryTimestamps().keySet()));
+        assertEquals(3, TestUtil.iterableSize(hejkaMessage.getQueryTimestamps().keySet()));
+        Set<Attribute> querySet = hejkaMessage.getQueryTimestamps().keySet();
+        assertThat(querySet, hasItems(new Attribute("&one")));
+        assertThat(querySet, hasItems(new Attribute("&two")));
+        assertThat(querySet, hasItems(new Attribute("&query")));
+    }
+
+    @Test
+    public void initiatorSendsZonesAndQueriesOnNoCoTam() throws Exception {
+        gossipGirl.handleTyped(initiateGossipMessage);
+        executor.messagesToPass.take();
+        gossipGirl.handleTyped(initiatorStateMessage);
+        executor.messagesToPass.take();
+        gossipGirl.handleTyped(noCoTamMessage);
+
+        // 3 ZMIs, 2 queries
+        assertEquals(5, executor.messagesToPass.size());
+
+        AgentMessage receivedMessage1 = executor.messagesToPass.poll();
+        assertAttributeMessage(receivedMessage1, "/son/bro", "/daughter");
+        AgentMessage receivedMessage2 = executor.messagesToPass.poll();
+        assertAttributeMessage(receivedMessage2, "/son/bro", "/son/sis");
+        AgentMessage receivedMessage3 = executor.messagesToPass.poll();
+        assertAttributeMessage(receivedMessage3, "/son/bro", "/son/grand");
+
+        AgentMessage receivedMessage4 = executor.messagesToPass.poll();
+        assertQueryMessage(receivedMessage4, "/son/bro", "&two", "SELECT 2 AS two");
+        AgentMessage receivedMessage5 = executor.messagesToPass.poll();
+        assertQueryMessage(receivedMessage5, "/son/bro", "&query", "SELECT sum(foo) AS foo");
+    }
+
+    private void assertQueryMessage(AgentMessage message, String recipientPath, String name, String query) throws Exception {
+        assertUDUPMessage(
+                message,
+                new PathName(recipientPath),
+                GossipGirlMessage.Type.QUERY
+        );
+        QueryMessage queryMessage = (QueryMessage) ((UDUPMessage) message).getContent();
+        assertEquals(new Attribute(name), queryMessage.getName());
+        assertEquals(new ValueQuery(query), queryMessage.getQuery());
+    }
+
+    private void assertAttributeMessage(AgentMessage message, String recipientPath, String zonePath) throws Exception {
+        assertUDUPMessage(
+                message,
+                new PathName(recipientPath),
+                GossipGirlMessage.Type.ATTRIBUTES
+        );
+        AttributesMessage attributesMessage = (AttributesMessage) ((UDUPMessage) message).getContent();
+        assertEquals(new PathName(zonePath), attributesMessage.getPath());
+    }
+
+    private void assertUDUPMessage(AgentMessage message, PathName destinationName, GossipGirlMessage.Type type) throws Exception {
+        assertNotNull(message);
+        assertEquals(ModuleType.UDP, message.getDestinationModule());
+        UDUPMessage udupMessage = (UDUPMessage) message;
+        assertEquals(destinationName, udupMessage.getContact().getName());
+        assertEquals(ModuleType.GOSSIP, udupMessage.getContent().getDestinationModule());
+        GossipGirlMessage gossipMessage = (GossipGirlMessage) udupMessage.getContent();
+        assertEquals(type, gossipMessage.getType());
     }
 }
diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/model/TestUtil.java b/src/test/java/pl/edu/mimuw/cloudatlas/model/TestUtil.java
index ddc61a9..0fef6b4 100644
--- a/src/test/java/pl/edu/mimuw/cloudatlas/model/TestUtil.java
+++ b/src/test/java/pl/edu/mimuw/cloudatlas/model/TestUtil.java
@@ -9,4 +9,8 @@ public class TestUtil {
 
         return count;
     }
+
+    public static ValueTime addToTime(ValueTime time, long millis) {
+        return time.addValue(new ValueDuration(millis));
+    }
 }