many bugfixes, dht api almost working

1 files changed, 30 insertions, 2 deletions

diff --git a/test/org/gnunet/construct/GetoptTest.java b/test/org/gnunet/util/GetoptTest.java
index 3822613..81c5949 100644
--- a/test/org/gnunet/construct/GetoptTest.java
+++ b/test/org/gnunet/util/GetoptTest.java
@@ -1,4 +1,4 @@
-package org.gnunet.construct;
+package org.gnunet.util;
 
 
 import org.gnunet.util.getopt.Option;
@@ -43,7 +43,7 @@ class Target {
     int counter = 0;
 
     @Option(
-            action = OptionAction.STORE_INT,
+            action = OptionAction.STORE_NUMBER,
             shortname = "w",
             longname = "value",
             description = "some value"
@@ -169,4 +169,32 @@ public class GetoptTest {
         
         Assert.assertArrayEquals(new String[]{"foo", "bar", "--reset", "baz"}, rest);
     }
+
+    @Test
+    public void test_long() {
+        Target t = new Target();
+        Parser p = new Parser(t);
+
+        String[] rest;
+
+        rest = p.parse(new String[]{"-w5"});
+        Assert.assertEquals(5, t.intVal);
+
+        rest = p.parse(new String[]{"--value=6"});
+        Assert.assertEquals(6, t.intVal);
+
+        rest = p.parse(new String[]{"--value", "7"});
+        Assert.assertEquals(7, t.intVal);
+
+        rest = p.parse(new String[]{"--value", "-7"});
+        Assert.assertEquals(-7, t.intVal);
+
+        boolean thrown = false;
+        try {
+            rest = p.parse(new String[]{"--value", "x"});
+        } catch (Parser.ArgumentError e) {
+            thrown = true;
+        }
+        Assert.assertTrue(thrown);
+    }
 }