26 files changed, 672 insertions, 192 deletions

diff --git a/test/org/gnunet/construct/ByteFillMessage.java b/test/org/gnunet/construct/ByteFillMessage.java
index fe7716f..090f7d0 100644
--- a/test/org/gnunet/construct/ByteFillMessage.java
+++ b/test/org/gnunet/construct/ByteFillMessage.java
@@ -26,7 +26,7 @@ public class ByteFillMessage implements Message {
     @UInt32
     public int someValue;
 
-    @ByteFill
+    @FillWith @UInt8
     public byte[] rest;
     
 }
diff --git a/test/org/gnunet/construct/ConstructTest.java b/test/org/gnunet/construct/ConstructTest.java
index c7f9853..8853b1d 100644
--- a/test/org/gnunet/construct/ConstructTest.java
+++ b/test/org/gnunet/construct/ConstructTest.java
@@ -13,7 +13,7 @@ public class ConstructTest {
         @FrameSize
         @UInt32
         public int frameSize;
-        @ByteFill
+        @FillWith @UInt8
         public byte[] bytes;
     }
 
diff --git a/test/org/gnunet/construct/FillParserTest.java b/test/org/gnunet/construct/FillParserTest.java
new file mode 100644
index 0000000..115b567
--- /dev/null
+++ b/test/org/gnunet/construct/FillParserTest.java
@@ -0,0 +1,37 @@
+package org.gnunet.construct;
+
+import junit.framework.Assert;
+import org.junit.Test;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public class FillParserTest {
+
+    public static class FillTestMessage implements Message {
+        @FrameSize
+        @UInt32
+        public int size;
+        @FillWith
+        public StringTuple[] strings;
+    }
+
+    @Test
+    public void test_fillParser() {
+        FillTestMessage m = new FillTestMessage();
+        m.strings = new StringTuple[]{new StringTuple("foo", "bar"), new StringTuple("quux", "spam")};
+        Construct.patch(m);
+        System.out.println(m.size);
+        byte[] data = Construct.toBinary(m);
+        Assert.assertEquals(m.size, data.length);
+
+        FillTestMessage m2 = Construct.parseAs(data, FillTestMessage.class);
+
+        Assert.assertEquals(m.strings.length, m2.strings.length);
+
+        Assert.assertEquals(m.strings[0], m2.strings[0]);
+        Assert.assertEquals(m.strings[1], m2.strings[1]);
+    }
+}
diff --git a/test/org/gnunet/construct/FixedSizeTest.java b/test/org/gnunet/construct/FixedSizeTest.java
new file mode 100644
index 0000000..573e120
--- /dev/null
+++ b/test/org/gnunet/construct/FixedSizeTest.java
@@ -0,0 +1,52 @@
+package org.gnunet.construct;
+
+import junit.framework.Assert;
+import org.junit.Test;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public class FixedSizeTest {
+
+    public static class Msg implements Message {
+        @UInt8
+        public int v;
+
+        public Msg() {
+            // default ctor required by Construct
+        }
+
+        public Msg(int v) {
+            this.v = v;
+        }
+    }
+
+    public static class FixedSizeTestMessage implements Message {
+        @FixedSizeArray(length = 4)
+        public Msg[] msgs;
+    }
+
+
+    @Test
+    public void test_fixedNested() {
+        FixedSizeTestMessage m = new FixedSizeTestMessage();
+        m.msgs = new Msg[]{new Msg(1), new Msg(2), new Msg(3), new Msg(4)};
+        byte[] bytes = Construct.toBinary(m);
+
+        FixedSizeTestMessage m2 = Construct.parseAs(bytes, FixedSizeTestMessage.class);
+
+        Assert.assertEquals(m.msgs[0].v, m2.msgs[0].v);
+        Assert.assertEquals(m.msgs[1].v, m2.msgs[1].v);
+        Assert.assertEquals(m.msgs[2].v, m2.msgs[2].v);
+        Assert.assertEquals(m.msgs[3].v, m2.msgs[3].v);
+    }
+
+    @Test(expected = AssertionError.class)
+    public void test_sizeMismatch() {
+        FixedSizeTestMessage m = new FixedSizeTestMessage();
+        m.msgs = new Msg[]{new Msg(1), new Msg(2)};
+        byte[] bytes = Construct.toBinary(m);
+    }
+}
diff --git a/test/org/gnunet/construct/FrameSizeTest.java b/test/org/gnunet/construct/FrameSizeTest.java
new file mode 100644
index 0000000..dcce5de
--- /dev/null
+++ b/test/org/gnunet/construct/FrameSizeTest.java
@@ -0,0 +1,50 @@
+package org.gnunet.construct;
+
+import junit.framework.Assert;
+import org.gnunet.util.GnunetMessage;
+import org.junit.Test;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public class FrameSizeTest {
+    public static class CoordMessage implements Message {
+        @FrameSize
+        @UInt32
+        public int size;
+        @UInt32
+        public int x;
+        @UInt8
+        public int y;
+    }
+
+    public static class RecursiveMessage implements Message {
+        @FrameSize
+        @UInt32
+        public int size;
+
+        @ZeroTerminatedString
+        public String data;
+
+        @NestedMessage(newFrame = true, optional = true)
+        public RecursiveMessage rec;
+
+    }
+
+    @Test
+    public void test_simple() {
+        CoordMessage m = new CoordMessage();
+        Construct.patch(m);
+        Assert.assertEquals(9, m.size);
+    }
+
+
+    //@Test
+    public void test_recursive_1() {
+        RecursiveMessage rm = new RecursiveMessage();
+        rm.data = "foo";
+        Construct.patch(rm);
+    }
+}
diff --git a/test/org/gnunet/construct/QueryMessage.java b/test/org/gnunet/construct/QueryMessage.java
index 2accd42..4bf9af5 100644
--- a/test/org/gnunet/construct/QueryMessage.java
+++ b/test/org/gnunet/construct/QueryMessage.java
@@ -26,6 +26,6 @@ public class QueryMessage implements Message {
     @UInt8
     public int query;
 
-    @ByteFill
+    @FillWith @UInt8
     public byte[] varsize;
 }
diff --git a/test/org/gnunet/construct/SendMessageTest.java b/test/org/gnunet/construct/SendMessageTest.java
new file mode 100644
index 0000000..b95cc78
--- /dev/null
+++ b/test/org/gnunet/construct/SendMessageTest.java
@@ -0,0 +1,34 @@
+package org.gnunet.construct;
+
+import org.gnunet.core.SendMessage;
+import org.gnunet.util.AbsoluteTime;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.PeerIdentity;
+import org.gnunet.util.TestMessage;
+import org.junit.Test;
+
+/**
+ * Regression test for a message class in org.gnunet.core
+ *
+ * todo: should this test be really here?
+ *
+ * @author Florian Dold
+ */
+public class SendMessageTest {
+
+    @Test
+    public void test_patch() {
+        SendMessage m = new SendMessage();
+        m.deadline = AbsoluteTime.FOREVER.asMessage();
+        m.peer = new PeerIdentity(); // null identity
+        m.payloadMessage = new GnunetMessage();
+        m.payloadMessage.body = new TestMessage();
+        m.payloadMessage.header = new GnunetMessage.Header();
+
+        GnunetMessage container = new GnunetMessage();
+        container.body = m;
+        container.header = new GnunetMessage.Header();
+
+        Construct.patch(container);
+    }
+}
diff --git a/test/org/gnunet/construct/SimpleTestMessage.java b/test/org/gnunet/construct/SimpleTestMessage.java
deleted file mode 100644
index e55b3b0..0000000
--- a/test/org/gnunet/construct/SimpleTestMessage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.construct;
-
-public class SimpleTestMessage implements Message {
-
-    @UInt8
-    public short v1;
-
-    @UInt8
-    public short v2;
-
-    @NestedMessage
-    public SimpleTestMessage2 mn;
-    
-    @FixedSizeArray(length=5)
-    public SimpleTestMessage2[] mns;
-}
diff --git a/test/org/gnunet/construct/SimpleTestMessage2.java b/test/org/gnunet/construct/SimpleTestMessage2.java
deleted file mode 100644
index a6433d6..0000000
--- a/test/org/gnunet/construct/SimpleTestMessage2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.construct;
-
-//@MessageId(321)
-public class SimpleTestMessage2 implements Message {
-
-    @UInt32
-    public long value;
-
-}
diff --git a/test/org/gnunet/construct/SizeTestMessage.java b/test/org/gnunet/construct/SizeTestMessage.java
deleted file mode 100644
index 4710ede..0000000
--- a/test/org/gnunet/construct/SizeTestMessage.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.construct;
-
-public class SizeTestMessage implements Message {
-
-    @FrameSize
-    @UInt16
-    public long totalSize;
-
-    @UInt16
-    public long someValue;
-    
-    @ByteFill
-    public byte[] rest;
-}
diff --git a/test/org/gnunet/construct/StringTest.java b/test/org/gnunet/construct/StringTest.java
new file mode 100644
index 0000000..7839f8b
--- /dev/null
+++ b/test/org/gnunet/construct/StringTest.java
@@ -0,0 +1,50 @@
+package org.gnunet.construct;
+
+import junit.framework.Assert;
+import org.junit.Test;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public class StringTest {
+    public static class StrMsg implements Message {
+        @FrameSize
+        @UInt32
+        public int len;
+        @ZeroTerminatedString(optional = false)
+        public String str1;
+        @ZeroTerminatedString(optional = true)
+        public String str2;
+    }
+
+
+    @Test
+    public void test_empty() {
+        StrMsg m = new StrMsg();
+        m.str1 = "";
+        m.str2 = "";
+        Construct.patch(m);
+        byte[] data = Construct.toBinary(m);
+        Assert.assertEquals(4+1+1, data.length);
+        StrMsg m2 = Construct.parseAs(data, StrMsg.class);
+        Assert.assertEquals("", m2.str1);
+        Assert.assertEquals("", m2.str2);
+    }
+
+    @Test
+    public void test_null() {
+        StrMsg m = new StrMsg();
+        m.str1 = "";
+        m.str2 = null;
+        Construct.patch(m);
+        byte[] data = Construct.toBinary(m);
+        Assert.assertEquals(4+1, data.length);
+        Assert.assertEquals(4+1, m.len);
+        StrMsg m2 = Construct.parseAs(data, StrMsg.class);
+        Assert.assertEquals("", m2.str1);
+        Assert.assertEquals(null, m2.str2);
+    }
+}
+
diff --git a/test/org/gnunet/construct/StringTuple.java b/test/org/gnunet/construct/StringTuple.java
new file mode 100644
index 0000000..085b7a9
--- /dev/null
+++ b/test/org/gnunet/construct/StringTuple.java
@@ -0,0 +1,29 @@
+package org.gnunet.construct;
+
+/**
+* ...
+*
+* @author Florian Dold
+*/
+public class StringTuple implements Message {
+    @ZeroTerminatedString
+    public String str1;
+    @ZeroTerminatedString
+    public String str2;
+
+    public StringTuple() {
+        // empty default ctor needed by Construct
+    }
+    public StringTuple(String str1, String str2) {
+        this.str1 = str1;
+        this.str2 = str2;
+    }
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof StringTuple)) {
+            return false;
+        }
+        StringTuple otherT = (StringTuple) other;
+        return otherT.str1.equals(this.str1) && otherT.str2.equals(this.str2);
+    }
+}
diff --git a/test/org/gnunet/construct/VarTestMessage.java b/test/org/gnunet/construct/VarTestMessage.java
deleted file mode 100644
index 25e5bbc..0000000
--- a/test/org/gnunet/construct/VarTestMessage.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-package org.gnunet.construct;
-
-public class VarTestMessage implements Message {
-    @UInt16
-    public long length;
-    
-    @VariableSizeArray(lengthField="length")
-    public SimpleTestMessage2[] msgs;
-}
diff --git a/test/org/gnunet/construct/VariableSizeArrayTest.java b/test/org/gnunet/construct/VariableSizeArrayTest.java
new file mode 100644
index 0000000..f1d19c1
--- /dev/null
+++ b/test/org/gnunet/construct/VariableSizeArrayTest.java
@@ -0,0 +1,33 @@
+package org.gnunet.construct;
+
+import junit.framework.Assert;
+import org.junit.Test;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public class VariableSizeArrayTest {
+    public static class VariableTestMessage implements Message {
+        @UInt32
+        public int num;
+        @VariableSizeArray(lengthField = "num")
+        public StringTuple[] msgs;
+    }
+
+    @Test
+    public void test_variableSizeArray() {
+        VariableTestMessage m = new VariableTestMessage();
+        m.msgs = new StringTuple[]{new StringTuple("foo", "bar"), new StringTuple("quux", "baz"), new StringTuple("spam", "eggs")};
+        Construct.patch(m);
+        Assert.assertEquals(3, m.num);
+        byte[] data = Construct.toBinary(m);
+        VariableTestMessage m2 = Construct.parseAs(data, VariableTestMessage.class);
+        Assert.assertEquals(m2.num, 3);
+        Assert.assertEquals(m.msgs[0], m2.msgs[0]);
+        Assert.assertEquals(m.msgs[1], m2.msgs[1]);
+        Assert.assertEquals(m.msgs[2], m2.msgs[2]);
+
+    }
+}
diff --git a/test/org/gnunet/core/CoreTest.java b/test/org/gnunet/core/CoreTest.java
index e4a9142..5e066ed 100644
--- a/test/org/gnunet/core/CoreTest.java
+++ b/test/org/gnunet/core/CoreTest.java
@@ -26,18 +26,15 @@ import org.gnunet.testing.TestingSubsystem;
 import org.gnunet.util.*;
 import org.grothoff.Runabout;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
 public class CoreTest {
-    TestingSetup testing = new TestingSetup();
-
     @Test(timeout = 500)
     public void test_core_init() {
 
-        TestingSubsystem ts = testing.startSubsystem("core");
+        TestingSubsystem ts = new TestingSubsystem("core");
 
         final Wrapper<Boolean> res = new Wrapper<Boolean>(false);
 
@@ -68,13 +65,13 @@ public class CoreTest {
     @Test(timeout = 5000)
     public void test_core_echo() {
 
-        TestingSubsystem ts = testing.startSubsystem("core");
+        TestingSubsystem ts = new TestingSubsystem("core");
 
         final Wrapper<Boolean> gotResponse = new Wrapper<Boolean>(false);
 
         final Core core = new Core(ts.getConfiguration());
         core.setMessageHandler(new Runabout() {
-            public void visit(TESTMessage t) {
+            public void visit(TestMessage t) {
                 gotResponse.set(true);
                 core.disconnect();
             }
@@ -86,7 +83,7 @@ public class CoreTest {
                 core.notifyTransmitReady(0, RelativeTime.FOREVER, myIdentity, 4, new MessageTransmitter() {
                     @Override
                     public void transmit(Connection.MessageSink sink) {
-                        sink.send(new TESTMessage());
+                        sink.send(new TestMessage());
                     }
 
                     @Override
diff --git a/test/org/gnunet/dht/DHTTest.java b/test/org/gnunet/dht/DHTTest.java
index b684aef..6c93356 100644
--- a/test/org/gnunet/dht/DHTTest.java
+++ b/test/org/gnunet/dht/DHTTest.java
@@ -33,9 +33,7 @@ public class DHTTest {
     public void test_dht_put() {
         final Wrapper<Boolean> putFinished = new Wrapper<Boolean>(true);
 
-        TestingSetup testing = new TestingSetup();
-
-        TestingSubsystem ts = testing.startSubsystem("dht");
+        TestingSubsystem ts = new TestingSubsystem("dht");
 
         final DistributedHashTable dht = new DistributedHashTable(ts.getConfiguration());
         dht.put(new HashCode("gnj-test"), new byte[]{1, 2, 3}, 1, EnumSet.noneOf(RouteOption.class),
diff --git a/test/org/gnunet/nse/NSETest.java b/test/org/gnunet/nse/NSETest.java
new file mode 100644
index 0000000..c3e6512
--- /dev/null
+++ b/test/org/gnunet/nse/NSETest.java
@@ -0,0 +1,56 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.nse;
+
+import org.gnunet.testing.TestingSetup;
+import org.gnunet.testing.TestingSubsystem;
+import org.gnunet.util.AbsoluteTime;
+import org.gnunet.util.Scheduler;
+import org.gnunet.util.Wrapper;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Florian Dold
+ */
+public class NSETest {
+    @Test
+    public void test_nse() {
+        final Wrapper<Boolean> gotResult = new Wrapper<Boolean>(false);
+        TestingSubsystem ts = new TestingSubsystem("nse");
+
+        final NetworkSizeEstimation nse = new NetworkSizeEstimation(ts.getConfiguration());
+        nse.subscribe(new NetworkSizeEstimation.Subscriber() {
+            @Override
+            public void update(AbsoluteTime timestamp, double estimate, double deviation) {
+                assertNotNull(timestamp);
+                gotResult.set(true);
+                nse.disconnect();
+            }
+        });
+
+        Scheduler.run();
+
+        assertTrue(gotResult.get());
+    }
+}
diff --git a/test/org/gnunet/statistics/StatisticsTest.java b/test/org/gnunet/statistics/StatisticsTest.java
index ddba478..780a2e1 100644
--- a/test/org/gnunet/statistics/StatisticsTest.java
+++ b/test/org/gnunet/statistics/StatisticsTest.java
@@ -27,9 +27,6 @@ import org.gnunet.util.*;
 import org.junit.Test;
 
 public class StatisticsTest {
-    TestingSetup testing = new TestingSetup();
-
-
     public interface Next {
         void next();
     }
@@ -64,7 +61,8 @@ public class StatisticsTest {
 
     @Test(timeout = 1000)
     public void test_simple() {
-        final TestingSubsystem ts = testing.startSubsystem("statistics");
+        Program.configureLogging("DEBUG", null);
+        final TestingSubsystem ts = new TestingSubsystem("statistics");
 
         final Statistics stat = new Statistics(ts.getConfiguration());
 
@@ -97,7 +95,7 @@ public class StatisticsTest {
 
     @Test(timeout = 1000)
     public void test_statistics_get_set() {
-        final TestingSubsystem ts = testing.startSubsystem("statistics");
+        final TestingSubsystem ts = new TestingSubsystem("statistics");
 
         final AssertionList assertions = new AssertionList();
 
@@ -149,7 +147,7 @@ public class StatisticsTest {
 
     @Test(timeout = 1000)
     public void test_watch() {
-        final TestingSubsystem ts = testing.startSubsystem("statistics");
+        final TestingSubsystem ts = new TestingSubsystem("statistics");
 
         final Wrapper<Integer> updates = new Wrapper<Integer>(0);
 
diff --git a/test/org/gnunet/testing/TestingSetupTest.java b/test/org/gnunet/testing/TestingSetupTest.java
index b23b543..2bfe0ae 100644
--- a/test/org/gnunet/testing/TestingSetupTest.java
+++ b/test/org/gnunet/testing/TestingSetupTest.java
@@ -29,8 +29,7 @@ public class TestingSetupTest {
     @Test(timeout = 1000)
     public void test_testing() {
         // could be any service, just use statistics
-        TestingSetup testing = new TestingSetup();
-        TestingSubsystem ts = testing.startSubsystem("statistics");
+        TestingSubsystem ts = new TestingSubsystem("statistics");
         String port = ts.getConfiguration().getValueString("statistics", "PORT");
         org.junit.Assert.assertTrue(port != null);
 
@@ -39,16 +38,13 @@ public class TestingSetupTest {
 
     @Test(expected = TestingSetup.SetupException.class)
     public void test_no_service() {
-        TestingSetup testing = new TestingSetup();
-        testing.startSubsystem("foobar _ !!!");
+        new TestingSubsystem("foobar _ !!!");
     }
 
     @Test(timeout = 1000)
     public void test_restart() {
-        // could be any service, just use statistics
-        TestingSetup testing = new TestingSetup();
-        TestingSubsystem ts = testing.startSubsystem("statistics");
-        //ts.restart();
+        TestingSubsystem ts = new TestingSubsystem("statistics");
+        ts.restart();
         ts.destroy();
     }
 }
diff --git a/test/org/gnunet/util/ClientServerTest.java b/test/org/gnunet/util/ClientServerTest.java
index f073a3c..f8b5d4e 100644
--- a/test/org/gnunet/util/ClientServerTest.java
+++ b/test/org/gnunet/util/ClientServerTest.java
@@ -1,10 +1,16 @@
 package org.gnunet.util;
 
+import com.google.common.collect.Lists;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
 import org.gnunet.testing.TestingServer;
 import org.gnunet.testing.TestingSetup;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.net.*;
+import java.util.ArrayList;
+
 /**
  * ...
  *
@@ -12,20 +18,26 @@ import org.junit.Test;
  */
 public class ClientServerTest {
 
+    @Test
+    public void test_start_stop() {
+        Program.configureLogging("DEBUG", null);
+        final TestingServer srv = new TestingServer();
+        srv.server.stopListening();
+    }
+
     /**
      * Test if the server receives a message sent by a client.
      */
-    @Test(timeout = 1000)
+    @Test
     public void test_testing_server() {
-        final TestingSetup setup = new TestingSetup();
         Program.configureLogging("DEBUG", null);
 
-        final TestingServer srv = setup.createServer();
+        final TestingServer srv = new TestingServer();
 
         final Wrapper<Boolean> gotMessage = new Wrapper<Boolean>(false);
 
         srv.server.setHandler(new Server.MessageRunabout() {
-            public void visit(TESTMessage tm) {
+            public void visit(TestMessage tm) {
                 gotMessage.set(true);
                 srv.server.destroy();
             }
@@ -39,7 +51,7 @@ public class ClientServerTest {
                     @Override
                     public void transmit(Connection.MessageSink sink) {
                         System.out.println("ntr!");
-                        sink.send(new TESTMessage());
+                        sink.send(new TestMessage());
                     }
 
                     @Override
@@ -57,13 +69,12 @@ public class ClientServerTest {
 
     /**
      * Test what happens when a client calls notifyTransmitReady, but does not send
-     * a message in the callback but disconnects.
+     * a message in the callback and disconnects.
      */
     @Test(timeout = 1000)
     public void test_premature_disconnect() {
-        final TestingSetup setup = new TestingSetup();
         Program.configureLogging("DEBUG", null);
-        final TestingServer srv = setup.createServer();
+        final TestingServer srv = new TestingServer();
 
         srv.server.notifyDisconnect(new Server.DisconnectHandler() {
             @Override
@@ -79,7 +90,7 @@ public class ClientServerTest {
                 cli.notifyTransmitReady(RelativeTime.FOREVER,true, 0, new MessageTransmitter() {
                     @Override
                     public void transmit(Connection.MessageSink sink) {
-                        sink.send(new TESTMessage());
+                        sink.send(new TestMessage());
                         cli.disconnect();
                     }
 
@@ -91,4 +102,146 @@ public class ClientServerTest {
             }
         });
     }
+
+
+    @Test
+    public void test_receiveDone() {
+        Program.configureLogging("DEBUG", null);
+        final TestingServer srv = new TestingServer();
+
+        final Wrapper<Integer> msgCount = new Wrapper<Integer>(0);
+
+        srv.server.setHandler(new Server.MessageRunabout() {
+            public void visit(TestMessage tm) {
+                msgCount.set(msgCount.get() + 1);
+                if (msgCount.get() == 3) {
+                    getSender().receiveDone(false);
+                    srv.server.stopListening();
+                } else {
+                    getSender().receiveDone(true);
+                }
+            }
+        });
+
+        Scheduler.run(new Scheduler.Task() {
+            @Override
+            public void run(Scheduler.RunContext ctx) {
+                final Client cli = srv.createClient();
+
+                cli.transmitWhenReady(RelativeTime.FOREVER, new TestMessage(), new Continuation() {
+                    @Override
+                    public void cont(boolean success) {
+                        cli.transmitWhenReady(RelativeTime.FOREVER, new TestMessage(), new Continuation() {
+                            @Override
+                            public void cont(boolean success) {
+                                cli.transmitWhenReady(RelativeTime.FOREVER, new TestMessage(), null);
+                            }
+                        });
+                    }
+                });
+            }
+        });
+    }
+
+    @Test
+    public void test_acceptFromAddresses() {
+        Program.configureLogging("DEBUG", null);
+
+        InetAddress localhost = null;
+        try {
+           localhost = Inet4Address.getLocalHost();
+        } catch (UnknownHostException e) {
+            Assert.fail();
+        }
+
+        // does this work on all operating systems?
+        SocketAddress addr = new InetSocketAddress(localhost, 0);
+
+        Server server = new Server(Lists.newArrayList(addr), RelativeTime.FOREVER, false);
+
+        server.destroy();
+
+    }
+
+
+    @Test
+    public void test_keep_drop() {
+        Program.configureLogging("DEBUG", null);
+        final TestingServer srv = new TestingServer();
+
+        final Wrapper<Integer> msgCount = new Wrapper<Integer>(0);
+
+
+
+        srv.server.setHandler(new Server.MessageRunabout() {
+            public void visit(TestMessage tm) {
+                srv.server.stopListening();
+                if (msgCount.get() == 0) {
+                    getSender().keep();
+                    getSender().drop();
+                    getSender().receiveDone(true);
+                } else if (msgCount.get() == 1) {
+                    getSender().receiveDone(false);
+
+                } else {
+                    Assert.fail();
+                }
+
+                msgCount.set(msgCount.get() + 1);
+            }
+        });
+
+        Scheduler.run(new Scheduler.Task() {
+            @Override
+            public void run(Scheduler.RunContext ctx) {
+                final Client cli = srv.createClient();
+                cli.transmitWhenReady(new TestMessage(), new Continuation() {
+                    @Override
+                    public void cont(boolean success) {
+                        cli.transmitWhenReady(new TestMessage(), null);
+                    }
+                });
+            }
+        });
+    }
+
+
+
+    /**
+    * test if markMonitor / soft shutdown works.
+    */
+    @Test
+    public void test_monitor_clients() {
+        Program.configureLogging("DEBUG", null);
+        final TestingServer srv = new TestingServer();
+
+        final Wrapper<Integer> msgCount = new Wrapper<Integer>(0);
+
+        srv.server.setHandler(new Server.MessageRunabout() {
+            public void visit(TestMessage tm) {
+                if (msgCount.get() == 0) {
+                    getSender().markMonitor();
+                    getSender().receiveDone(true);
+                } else if (msgCount.get() == 1) {
+                    srv.server.stopListening();
+                    getSender().receiveDone(false);
+                } else {
+                    Assert.fail();
+                }
+
+                msgCount.set(msgCount.get() + 1);
+            }
+        });
+
+        Scheduler.run(new Scheduler.Task() {
+            @Override
+            public void run(Scheduler.RunContext ctx) {
+                final Client cli1 = srv.createClient();
+                final Client cli2 = srv.createClient();
+
+                cli1.transmitWhenReady(new TestMessage(), null);
+                cli2.transmitWhenReady(new TestMessage(), null);
+            }
+        });
+    }
 }
diff --git a/test/org/gnunet/util/FilePipeExample.java b/test/org/gnunet/util/FilePipeExample.java
index 4b72163..94696c9 100644
--- a/test/org/gnunet/util/FilePipeExample.java
+++ b/test/org/gnunet/util/FilePipeExample.java
@@ -13,8 +13,9 @@ import java.nio.ByteBuffer;
 public class FilePipeExample {
     public static void main(String... args) {
 
+        Program.configureLogging("DEBUG", null);
 
-        final Scheduler.FilePipe fp = Scheduler.createFilePipe(new File("test.pipe"));
+        final Scheduler.FilePipe fp = Scheduler.openFilePipe(new File("test.pipe"));
 
 
         Scheduler.addRead(RelativeTime.FOREVER, fp.getSource(), new Scheduler.Task() {
diff --git a/test/org/gnunet/util/MeshTest.java b/test/org/gnunet/util/MeshTest.java
new file mode 100644
index 0000000..919d812
--- /dev/null
+++ b/test/org/gnunet/util/MeshTest.java
@@ -0,0 +1,36 @@
+package org.gnunet.util;
+
+import org.gnunet.mesh.Mesh;
+import org.gnunet.testing.TestingSubsystem;
+import org.junit.Test;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public class MeshTest {
+
+    @Test
+    public void test_tunnel_create() {
+        /*
+        Program.configureLogging("DEBUG", null);
+        TestingSubsystem ts = new TestingSubsystem("mesh");
+
+        Mesh m = new Mesh(ts.getConfiguration(), null, null, new RunaboutMessageReceiver() {
+            public void visit(TestMessage tm) {
+
+            }
+            @Override
+            public void handleError() {
+
+            }
+        });
+
+        m.createTunnel(null, null);
+
+        Sc
+        Sheduler.run();
+        */
+    }
+}
diff --git a/test/org/gnunet/util/ResolverTest.java b/test/org/gnunet/util/ResolverTest.java
index 07f694a..ae56b79 100644
--- a/test/org/gnunet/util/ResolverTest.java
+++ b/test/org/gnunet/util/ResolverTest.java
@@ -43,9 +43,7 @@ public class ResolverTest {
         final Wrapper<Boolean> finished1 = new Wrapper<Boolean>(true);
         final Wrapper<Boolean> finished2 = new Wrapper<Boolean>(true);
 
-        TestingSetup testing = new TestingSetup();
-
-        TestingSubsystem ts = testing.startSubsystem("resolver");
+        TestingSubsystem ts = new TestingSubsystem("resolver");
 
 
         Resolver r = Resolver.getInstance();
diff --git a/test/org/gnunet/util/ServerExample.java b/test/org/gnunet/util/ServerExample.java
index be74b61..a344e2a 100644
--- a/test/org/gnunet/util/ServerExample.java
+++ b/test/org/gnunet/util/ServerExample.java
@@ -23,7 +23,6 @@ package org.gnunet.util;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.Arrays;
-import java.util.LinkedList;
 
 import static org.gnunet.util.Server.*;
 
@@ -43,13 +42,13 @@ public class ServerExample {
                         RelativeTime.MINUTE,
                         false);
                 s.setHandler(new Server.MessageRunabout() {
-                    public void visit(TESTMessage tm) {
+                    public void visit(TestMessage tm) {
                         System.out.println("got TEST message");
                         final Server.ClientHandle sender = getSender();
                         sender.notifyTransmitReady(4, RelativeTime.FOREVER, new MessageTransmitter() {
                             @Override
                             public void transmit(Connection.MessageSink sink) {
-                                sink.send(new TESTMessage());
+                                sink.send(new TestMessage());
                                 System.out.println("TEST message sent");
                                 sender.receiveDone(true);
                             }
diff --git a/test/org/gnunet/util/StringsTest.java b/test/org/gnunet/util/StringsTest.java
new file mode 100644
index 0000000..49cbfe9
--- /dev/null
+++ b/test/org/gnunet/util/StringsTest.java
@@ -0,0 +1,20 @@
+package org.gnunet.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public class StringsTest {
+    @Test
+    public void test_inverse() {
+        byte[] data = "asdfgASDD$!123".getBytes();
+        String str = Strings.dataToString(data);
+        byte[] data2 = Strings.stringToData(str, data.length);
+        Assert.assertArrayEquals(data, data2);
+    }
+}
+
diff --git a/test/org/gnunet/util/getopt/GetoptTest.java b/test/org/gnunet/util/getopt/GetoptTest.java
index 81a10a8..e60757e 100644
--- a/test/org/gnunet/util/getopt/GetoptTest.java
+++ b/test/org/gnunet/util/getopt/GetoptTest.java
@@ -25,8 +25,8 @@ import org.junit.Assert;
 import org.junit.Test;
 
 class Target {
-    @Option(
-            action = OptionAction.STORE_STRING,
+    @Argument(
+            action = ArgumentAction.STORE_STRING,
             shortname = "s",
             longname = "string",
             argumentName = "SOME_STRING",
@@ -34,16 +34,16 @@ class Target {
     )
     String someString;
 
-    @Option(
-            action = OptionAction.SET,
+    @Argument(
+            action = ArgumentAction.SET,
             shortname = "y",
             longname = "set",
             description = "enable, default disabled"
     )
     boolean set = false;
 
-    @Option(
-            action = OptionAction.RESET,
+    @Argument(
+            action = ArgumentAction.RESET,
             shortname = "n",
             longname = "reset",
             description = "disable, default enabled"
@@ -51,21 +51,20 @@ class Target {
     boolean reset = true;
 
 
-    @Option(
-            action = OptionAction.INCREMENT,
-            shortname = "i",
-            longname = "inc",
-            description = "increment a counter"
-    )
-    int counter = 0;
-
-    @Option(
-            action = OptionAction.STORE_NUMBER,
+    @Argument(
+            action = ArgumentAction.STORE_NUMBER,
             shortname = "w",
             longname = "value",
             description = "some value"
     )
     int intVal = 0;
+
+    static int someConstant = 42;
+}
+
+class InvalidTarget {
+    @Argument(action = ArgumentAction.SET, shortname = "foo", longname = "bar", description = "bla bla")
+    boolean foo;
 }
 
 public class GetoptTest {
@@ -74,12 +73,7 @@ public class GetoptTest {
         Target t = new Target();
         Parser p = new Parser(t);
 
-        t.someString = null;
 
-        // argument after shortopt
-        p.parse(new String[]{"-s", "foo"});
-        Assert.assertEquals("foo", t.someString);
-        
         t.someString = null;
         
         // argument directly with shortopt
@@ -88,6 +82,12 @@ public class GetoptTest {
 
         t.someString = null;
 
+        // argument after shortopt
+        p.parse(new String[]{"-s", "foo"});
+        Assert.assertEquals("foo", t.someString);
+
+        t.someString = null;
+
         p.parse(new String[]{"--string=foo"});
         Assert.assertEquals("foo", t.someString);
 
@@ -186,6 +186,21 @@ public class GetoptTest {
         Assert.assertArrayEquals(new String[]{"foo", "bar", "--reset", "baz"}, rest);
     }
 
+
+    @Test(expected = Parser.ArgumentError.class)
+    public void test_missingLongopt() {
+        Target t = new Target();
+        Parser p = new Parser(t);
+        p.parse(new String[]{"--foobar"});
+    }
+
+    @Test(expected = Parser.ArgumentError.class)
+    public void test_missingShortopt_1() {
+        Target t = new Target();
+        Parser p = new Parser(t);
+        p.parse(new String[]{"-x"});
+    }
+
     @Test
     public void test_long() {
         Target t = new Target();
@@ -196,6 +211,9 @@ public class GetoptTest {
         rest = p.parse(new String[]{"-w5"});
         Assert.assertEquals(5, t.intVal);
 
+        rest = p.parse(new String[]{"-w", "5"});
+        Assert.assertEquals(5, t.intVal);
+
         rest = p.parse(new String[]{"--value=6"});
         Assert.assertEquals(6, t.intVal);
 
@@ -213,4 +231,57 @@ public class GetoptTest {
         }
         Assert.assertTrue(thrown);
     }
+
+
+    @Test(expected = Parser.ArgumentError.class)
+    public void test_missingNumberArgument_short() {
+        Target t = new Target();
+        Parser p = new Parser(t);
+
+        p.parse(new String[]{"-w"});
+        Assert.assertEquals(5, t.intVal);
+    }
+
+    @Test(expected = Parser.ArgumentError.class)
+    public void test_missingNumberArgument_long() {
+        Target t = new Target();
+        Parser p = new Parser(t);
+
+
+        p.parse(new String[]{"--w"});
+        Assert.assertEquals(5, t.intVal);
+    }
+
+
+    @Test(expected = Parser.ArgumentError.class)
+    public void test_invalidNumberFormat() {
+        Target t = new Target();
+        Parser p = new Parser(t);
+
+        String[] rest;
+
+        rest = p.parse(new String[]{"-w", "abc"});
+        Assert.assertEquals(5, t.intVal);
+    }
+
+
+    @Test
+    public void test_dashRest() {
+        Target t = new Target();
+        Parser p = new Parser(t);
+
+        String[] rest;
+
+        rest = p.parse(new String[]{"-w", "123", "-"});
+        Assert.assertArrayEquals(new String[]{"-"}, rest);
+    }
+
+
+    @Test(expected = AssertionError.class)
+    public void test_invalid() {
+        InvalidTarget it = new InvalidTarget();
+        Parser p = new Parser(it);
+
+        p.parse(new String[]{"-foo"});
+    }
 }