Moved the method tests in their own class.

2 files changed, 67 insertions, 50 deletions

diff --git a/src/test/java/com/beust/jcommander/JCommanderTest.java b/src/test/java/com/beust/jcommander/JCommanderTest.java
index 8b1e761..428fdfe 100644
--- a/src/test/java/com/beust/jcommander/JCommanderTest.java
+++ b/src/test/java/com/beust/jcommander/JCommanderTest.java
@@ -242,38 +242,6 @@ public class JCommanderTest {
     Assert.assertEquals(args.rest.get(0), "rest");
   }
 
-  public void arityStringsSetter() {
-    class ArgsArityStringSetter {
-
-      @Parameter(names = "-pairs", arity = 2, description = "Pairs")
-      public void setPairs(List<String> pairs) {
-        this.pairs = pairs;
-      }
-      public List<String> getPairs() {
-        return this.pairs;
-      }
-      public List<String> pairs;
-
-      @Parameter(description = "Rest")
-      public void setRest(List<String> rest) {
-        this.rest = rest;
-      }
-      public List<String> getRest() {
-        return this.rest;
-      }
-      public List<String> rest;
-    }
-    ArgsArityStringSetter args = new ArgsArityStringSetter();
-    String[] argv = { "-pairs", "pair0", "pair1", "rest" };
-    new JCommander(args, argv);
-
-    Assert.assertEquals(args.pairs.size(), 2);
-    Assert.assertEquals(args.pairs.get(0), "pair0");
-    Assert.assertEquals(args.pairs.get(1), "pair1");
-    Assert.assertEquals(args.rest.size(), 1);
-    Assert.assertEquals(args.rest.get(0), "rest");
-  }
-
   @Test(expectedExceptions = ParameterException.class)
   public void arity2Fail() {
     ArgsArityString args = new ArgsArityString();
@@ -837,26 +805,9 @@ public class JCommanderTest {
     Assert.assertTrue(arg.help);
   }
 
-  public void setterThatThrows() {
-    class Arg {
-      @Parameter(names = "--host")
-      public void setHost(String host) {
-        throw new ParameterException("Illegal host");
-      }
-    }
-    boolean passed = false;
-    try {
-      new JCommander(new Arg(), new String[] { "--host", "host" });
-    } catch(ParameterException ex) {
-      Assert.assertEquals(ex.getCause(), null);
-      passed = true;
-    }
-    Assert.assertTrue(passed, "Should have thrown an exception");
-  }
-
   @Test(enabled = false)
   public static void main(String[] args) throws Exception {
-    new JCommanderTest().setterThatThrows();
+    new JCommanderTest().verifyHelp();
 //    class A {
 //      @Parameter(names = "-short", required = true)
 //      List<String> parameters;
diff --git a/src/test/java/com/beust/jcommander/MethodSetterTest.java b/src/test/java/com/beust/jcommander/MethodSetterTest.java
new file mode 100644
index 0000000..8790e4c
--- /dev/null
+++ b/src/test/java/com/beust/jcommander/MethodSetterTest.java
@@ -0,0 +1,66 @@
+package com.beust.jcommander;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+/**
+ * Tests for @Parameter on top of methods.
+ */
+@Test
+public class MethodSetterTest {
+  public void arityStringsSetter() {
+    class ArgsArityStringSetter {
+
+      @Parameter(names = "-pairs", arity = 2, description = "Pairs")
+      public void setPairs(List<String> pairs) {
+        this.pairs = pairs;
+      }
+      public List<String> getPairs() {
+        return this.pairs;
+      }
+      public List<String> pairs;
+
+      @Parameter(description = "Rest")
+      public void setRest(List<String> rest) {
+        this.rest = rest;
+      }
+//      public List<String> getRest() {
+//        return this.rest;
+//      }
+      public List<String> rest;
+    }
+    ArgsArityStringSetter args = new ArgsArityStringSetter();
+    String[] argv = { "-pairs", "pair0", "pair1", "rest" };
+    new JCommander(args, argv);
+
+    Assert.assertEquals(args.pairs.size(), 2);
+    Assert.assertEquals(args.pairs.get(0), "pair0");
+    Assert.assertEquals(args.pairs.get(1), "pair1");
+    Assert.assertEquals(args.rest.size(), 1);
+    Assert.assertEquals(args.rest.get(0), "rest");
+  }
+
+  public void setterThatThrows() {
+    class Arg {
+      @Parameter(names = "--host")
+      public void setHost(String host) {
+        throw new ParameterException("Illegal host");
+      }
+    }
+    boolean passed = false;
+    try {
+      new JCommander(new Arg(), new String[] { "--host", "host" });
+    } catch(ParameterException ex) {
+      Assert.assertEquals(ex.getCause(), null);
+      passed = true;
+    }
+    Assert.assertTrue(passed, "Should have thrown an exception");
+  }
+
+  @Test(enabled = false)
+  public static void main(String[] args) throws Exception {
+    new MethodSetterTest().arityStringsSetter();
+  }
+}