1 files changed, 92 insertions, 21 deletions

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"});
+    }
 }