1 files changed, 52 insertions, 0 deletions

diff --git a/test/org/gnunet/construct/ConstructTest.java b/test/org/gnunet/construct/ConstructTest.java
index 470df5e..c7f9853 100644
--- a/test/org/gnunet/construct/ConstructTest.java
+++ b/test/org/gnunet/construct/ConstructTest.java
@@ -3,6 +3,8 @@ package org.gnunet.construct;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.Random;
+
 /**
  * @author Florian Dold
  */
@@ -27,4 +29,54 @@ public class ConstructTest {
         Assert.assertArrayEquals(new byte[]{0,1,2,3}, msg_r.bytes);
     }
 
+
+    @Test
+    public void test_IntMessage() {
+        IntMessage im = new IntMessage();
+        Random r = new Random();
+        im.i1 = r.nextLong();
+        im.i2 = r.nextLong();
+        im.i3 = r.nextLong();
+        im.i4 = r.nextLong();
+        im.i5 = r.nextLong();
+        im.i6 = r.nextLong();
+        im.i7 = r.nextLong();
+        im.i8 = r.nextLong();
+
+        byte[] data = Construct.toBinary(im);
+
+        IntMessage im_new = Construct.parseAs(data, IntMessage.class);
+
+        Assert.assertEquals((1+2+4+8)*2, data.length);
+        Assert.assertEquals((1+2+4+8)*2, Construct.getStaticSize(im));
+    }
+
+    @Test(expected = AssertionError.class)
+    public void test_PrivateMemberMessage() {
+        PrivateMemberMessage m1 = new PrivateMemberMessage();
+        byte[] data = Construct.toBinary(m1);
+        PrivateMemberMessage m2 = Construct.parseAs(data, PrivateMemberMessage.class);
+    }
+
+
+    @Test
+    public void test_variable_size() {
+        VariableSizeMessage m1 = new VariableSizeMessage();
+        m1.n1 = 2;
+        m1.n2 = 3;
+        m1.a1 = new int[]{42,43};
+        m1.a2 = new int[]{1,2,1000};
+
+        byte[] data = Construct.toBinary(m1);
+
+        VariableSizeMessage m2 = Construct.parseAs(data, VariableSizeMessage.class);
+
+        Assert.assertEquals(m1.n1, m2.n1);
+        Assert.assertEquals(m1.n2, m2.n2);
+        Assert.assertArrayEquals(m1.a1, m2.a1);
+        Assert.assertArrayEquals(m1.a2, m2.a2);
+    }
+
+
 }
+