JavaPythontest + bugfixes

java/ivy.xml

@@ -6,5 +6,7 @@
    <dependencies>
       <dependency org="slf4j"   name="slf4j-api"              rev="latest.release"  />
       <dependency org="google"  name="guava"                  rev="latest.release"  />
+      <dependency org="google"  name="protobuf-java"                  rev="latest.release"  />
+      <dependency org="rsb"  name="rsb"                  rev="latest.release"  />
    </dependencies>
 </ivy-module>

java/src/ipaaca/IUConverter.java

@@ -70,7 +70,7 @@ public class IUConverter implements Converter<ByteBuffer>
                 .addAllPayload(payloadItems)
                 .addAllLinks(links)
                 .build();
-        return new WireContents<ByteBuffer>(ByteBuffer.wrap(iu.toByteArray()),"ipaaca-remotepushiu");        
+        return new WireContents<ByteBuffer>(ByteBuffer.wrap(iu.toByteArray()),"ipaaca-iu");        
     }
 
     @Override

java/src/ipaaca/Initializer.java

@@ -32,9 +32,9 @@ public final class Initializer {
 	    DefaultConverterRepository.getDefaultConverterRepository()
             .addConverter(new ProtocolBufferConverter<IULinkUpdate>(IULinkUpdate.getDefaultInstance()));
 	    DefaultConverterRepository.getDefaultConverterRepository().addConverter(
-	            new IUConverter(new ConverterSignature("ipaaca-remotepushiu", RemotePushIU.class)));
-	    DefaultConverterRepository.getDefaultConverterRepository().addConverter(
-                new IUConverter(new ConverterSignature("ipaaca-localiu", LocalIU.class)));
+	            new IUConverter(new ConverterSignature("ipaaca-iu", RemotePushIU.class)));
+	    //DefaultConverterRepository.getDefaultConverterRepository().addConverter(
+        //        new IUConverter(new ConverterSignature("ipaaca-localiu", LocalIU.class)));
 	    	    
 	}
 }

java/src/ipaaca/RemotePushIU.java

@@ -367,7 +367,7 @@ public class RemotePushIU extends AbstractIU
     // else:
     // self._revision = new_revision
     @Override
-    public void modifyLinks(boolean isDelta, SetMultimap<String, String> linksToAdd, SetMultimap<String, String> linksToRemove, String writerName)
+    void modifyLinks(boolean isDelta, SetMultimap<String, String> linksToAdd, SetMultimap<String, String> linksToRemove, String writerName)
     {
         if (isCommitted())
         {

java/test/src/ipaaca/JavaPythonTest.java

@@ -2,6 +2,8 @@ package ipaaca;
 
 import static org.junit.Assert.assertEquals;
 
+import ipaaca.Ipaaca.IU;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -30,21 +32,10 @@ public class JavaPythonTest {
         inBuffer = new InputBuffer("javaside", categories);
     }
     
-	@Ignore
-	@Test
-	public void test() throws IOException, InterruptedException {
-		
-		String pypr = 
-		"import sys\n" +
-		"sys.path.append('../python/build/')\n" +
-		"import ipaaca, time\n" +
-		"ob = ipaaca.OutputBuffer('pythonside')\n" + 
-		"iu = ipaaca.IU('JavaPythonTest')\n" +
-		"iu.payload = {'data':'Hello from Python!'}\n" +
-		"time.sleep(0.1)\n" +
-		"ob.add(iu)";
-		Process p = Runtime.getRuntime().exec(new String[]{"python","-c", pypr});
-		InputStream in = p.getInputStream();
+	private void printRuntimeErrors(Process p) throws IOException
+	{
+	    
+        InputStream in = p.getInputStream();
         BufferedInputStream buf = new BufferedInputStream(in);
         InputStreamReader inread = new InputStreamReader(buf);
         BufferedReader bufferedreader = new BufferedReader(inread);
@@ -76,9 +67,27 @@ public class JavaPythonTest {
         {
             System.out.println(line);
         }
+	}
+	
+	@Test
+	public void test() throws IOException, InterruptedException {
+		
+		String pypr = 
+		"import sys\n" +
+		"sys.path.append('/homes/hvanwelbergen/git_pool/ipaaca/python/build/')\n" +
+		"import ipaaca, time\n" +
+		"ob = ipaaca.OutputBuffer('pythonside')\n" + 
+		"iu = ipaaca.IU('JavaPythonTest')\n" +
+		"iu.payload = {'data':'Hello from Python!'}\n" +
+		"time.sleep(0.1)\n" +
+		"ob.add(iu)";
+		Process p = Runtime.getRuntime().exec(new String[]{"python","-c", pypr});
+		printRuntimeErrors(p);
 		
 		Thread.sleep(200);
 		assertEquals(1, inBuffer.getIUs().size());
+		AbstractIU iu = inBuffer.getIUs().iterator().next();
+		assertEquals("Hello from Python!",iu.getPayload().get("data"));
 	}
 	
 	

python/src/ipaaca.py

@@ -320,6 +320,7 @@ class IU(IUInterface):#{{{
 			raise IUCommittedError(self)
 		with self.revision_lock:
 			# set item locally
+			# FIXME: Is it actually set locally?
 			self._increase_revision_number()
 			if self.is_published:
 				# send update to remote holders

python/test/src/testipaaca.py

@@ -28,6 +28,20 @@ class IpaacaIUStoreTestCase(unittest.TestCase):
 		self.assertIn(self.sensor_iu.uid, self.ob.iu_store)
 		self.assertEqual(len(self.ob.iu_store), 1)
 
+class IpaacaPayloadTestCase(unittest.TestCase):
+	def setUp(self):
+		self.ib = ipaaca.InputBuffer('TestIn', ['sensorcategory', 'decisioncategory'])
+		self.ob = ipaaca.OutputBuffer('TestOut')
+		self.sensor_iu = ipaaca.IU('sensorcategory')
+		self.sensor_iu.payload = {'data': 'sensordata'}
+		self.ob.add(self.sensor_iu)
+		
+	def testPayloadContent(self):
+		time.sleep(0.1)ipaac		
+nimp[
+		iu_received = self.ib.iu_store.get(self.sensor_iu.uid)
+		self.assertEqual(iu_received.payload["data"], 'sensordata')
+
 class IpaacaLinksTestCase(unittest.TestCase):
 	def setUp(self):
 		self.ib = ipaaca.InputBuffer('TestIn', ['sensorcategory', 'decisioncategory'])