Merge branch 'master' of https://projects.cit-ec.uni-bielefeld.de/git/ipaaca

java/src/ipaaca/AbstractIU.java

@@ -184,11 +184,6 @@ public abstract class AbstractIU
         return uid;
     }
 
-    public void setUid(String uid)
-    {
-        this.uid = uid;
-    }
-
     public abstract void commit();
 
     // XXX: might not be valid for all types of IUs

java/src/ipaaca/LocalIU.java

@@ -5,6 +5,7 @@ import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
 import ipaaca.protobuf.Ipaaca.LinkSet;
 import ipaaca.protobuf.Ipaaca.PayloadItem;
 
+import java.rmi.server.UID;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -32,12 +33,7 @@ public class LocalIU extends AbstractIU
 
     public LocalIU()
     {
-        this(null);
-    }
-
-    public LocalIU(String uid)
-    {
-        super(uid);
+        super(new UID().toString());
         revision = 1;
         payload = new Payload(this);
     }

java/src/ipaacademo/TextPrinter.java

 package ipaacademo;
 
+import ipaaca.AbstractIU;
+import ipaaca.HandlerFunctor;
+import ipaaca.IUEventHandler;
+import ipaaca.IUEventType;
+import ipaaca.Initializer;
+import ipaaca.InputBuffer;
+import ipaaca.OutputBuffer;
+import ipaaca.RemotePushIU;
+
 import java.util.EnumSet;
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Set;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-
-import ipaaca.*;
 
 import javax.swing.JFrame;
 import javax.swing.JLabel;

java/test/src/ipaaca/ComponentCommunicationIntegrationTest.java

@@ -361,5 +361,30 @@ public class ComponentCommunicationIntegrationTest
         assertThat(iuIn.getLinks("SAME_LEVEL"),containsInAnyOrder("iu7"));
     }
     
+    @Test
+    public void testPublishLinks() throws InterruptedException
+    {
+        LocalIU localIU2 = new LocalIU();
+        localIU2.setCategory(CATEGORY);
+        localIU2.getPayload().put("key1", "item2");
+        localIU.addLinks("SAME_LEVEL", ImmutableSet.of(localIU2.getUid()));
+        outBuffer.add(localIU);
+        outBuffer.add(localIU2);
+        Thread.sleep(200);
+        assertThat(localIU.getLinks("SAME_LEVEL"),containsInAnyOrder(localIU2.getUid()));
+    }
     
+    @Test
+    public void testPublishLinksRemote() throws InterruptedException
+    {
+        LocalIU localIU2 = new LocalIU();
+        localIU2.setCategory(CATEGORY);
+        localIU2.getPayload().put("key1", "item2");
+        localIU.addLinks("SAME_LEVEL", ImmutableSet.of(localIU2.getUid()));
+        outBuffer.add(localIU);
+        outBuffer.add(localIU2);
+        Thread.sleep(200);
+        AbstractIU iuIn = inBuffer.getIU(localIU.getUid());
+        assertThat(iuIn.getLinks("SAME_LEVEL"),containsInAnyOrder(localIU2.getUid()));
+    }
 }

java/test/src/ipaaca/LocalIUTest.java

@@ -21,7 +21,7 @@ public class LocalIUTest
     @Test
     public void testCommit()
     {
-        LocalIU liu = new LocalIU("iu1");
+        LocalIU liu = new LocalIU();
         liu.getPayload().put("key1", "item1");
         liu.setBuffer(mockBuffer);
         liu.commit("commitWriter");
@@ -33,7 +33,7 @@ public class LocalIUTest
     @Test
     public void testSetPayloadOnUnpublishedIU()
     {
-        LocalIU liu = new LocalIU("iu1");
+        LocalIU liu = new LocalIU();
         liu.getPayload().put("key1", "item1");
         assertEquals("item1", liu.getPayload().get("key1"));
     }
@@ -41,7 +41,7 @@ public class LocalIUTest
     @Test
     public void testSetPayloadOnPublishedIU()
     {
-        LocalIU liu = new LocalIU("iu1");
+        LocalIU liu = new LocalIU();
         liu.setBuffer(mockBuffer);
         liu.getPayload().put("key1", "item1");
         assertEquals("item1", liu.getPayload().get("key1"));