implemented message unions, parameter parsing

3 files changed, 46 insertions, 8 deletions

diff --git a/test/org/gnunet/construct/ByteFillMessage.java b/test/org/gnunet/construct/ByteFillMessage.java
index 3eb6d73..55b0e89 100644
--- a/test/org/gnunet/construct/ByteFillMessage.java
+++ b/test/org/gnunet/construct/ByteFillMessage.java
@@ -1,12 +1,6 @@
 package org.gnunet.construct;
 
-/**
- * Created by IntelliJ IDEA.
- * User: dold
- * Date: 1/17/12
- * Time: 10:20 PM
- * To change this template use File | Settings | File Templates.
- */
+
 public class ByteFillMessage implements Message {
     @Nested
     public MessageHeader header;
diff --git a/test/org/gnunet/construct/UnionTest.java b/test/org/gnunet/construct/UnionTest.java
new file mode 100644
index 0000000..ba74a8b
--- /dev/null
+++ b/test/org/gnunet/construct/UnionTest.java
@@ -0,0 +1,44 @@
+package org.gnunet.construct;
+
+
+import org.junit.Test;
+
+public class UnionTest {
+    public static interface TestUnion extends MessageUnion {}
+    
+    @UnionCase(0)
+    public static class TestUnionCase0 implements TestUnion {
+        @Int8
+        public int val;
+    } 
+    
+    @UnionCase(1)
+    public static class TestUnionCase1 implements  TestUnion{
+        @ZeroTerminatedString
+        public String str;
+    }
+
+    public static class UnionTestMessage implements Message {
+        @Int16
+        public int tag;
+        @Union(tag = "tag")
+        public TestUnion instance;
+    }
+
+
+
+    @Test
+    public void test_Union() {
+        UnionTestMessage utm = new UnionTestMessage();
+        utm.tag = 0;
+        utm.instance = new TestUnionCase0();
+        ((TestUnionCase0)utm.instance).val = 20;
+
+        byte[] a = Construct.toBinary(utm);
+        
+        System.out.println(a.length);
+        
+        UnionTestMessage utm2 = Construct.parseAs(a, 0, UnionTestMessage.class);
+
+    }
+}
diff --git a/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java b/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java
index eb8e01e..e98db4e 100644
--- a/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java
+++ b/test/org/gnunet/services/NetworkSizeEstimationServiceTest.java
@@ -11,7 +11,7 @@ import java.io.File;
 import java.io.IOError;
 import java.io.IOException;
 
-public class NetworkSizeEstimationServiceTest{
+public class NetworkSizeEstimationServiceTest {
     class TestSubscriber implements NetworkSizeEstimation.NSE_Subscriber {
         public boolean success = false;
         NetworkSizeEstimation svc;