Fixed: Commands with same prefix as options were not working properly.

1 files changed, 31 insertions, 11 deletions

diff --git a/src/test/java/com/beust/jcommander/JCommanderTest.java b/src/test/java/com/beust/jcommander/JCommanderTest.java
index 4f1a6d5..02a7099 100644
--- a/src/test/java/com/beust/jcommander/JCommanderTest.java
+++ b/src/test/java/com/beust/jcommander/JCommanderTest.java
@@ -615,19 +615,39 @@ public class JCommanderTest {
     new JCommander(a).parse("b");
   }
 
-  @Test(enabled = false)
-  public static void main(String[] args) throws Exception {
+  @Parameters(commandNames = { "--configure" })
+  public static class ConfigureArgs {
+  }
 
-    System.out.println("A");
-    class A {
-      @Parameter
-      List<String> parameters;
+  public static class BaseArgs {
+    @Parameter(names = { "-h", "--help" }, description = "Show this help screen")
+    private boolean help = false;
 
-      @Parameter(names = "-long")
-      public long l;
-    }
-    A a = new A();
-    new JCommander(a).parse("-long", "32");
+    @Parameter(names = { "--version", "-version" }, description = "Show the program version")
+    private boolean version;
+  }
+
+  public void commandsWithSamePrefixAsOptionsShouldWork() {
+    BaseArgs a = new BaseArgs();
+    ConfigureArgs conf = new ConfigureArgs();
+    JCommander jc = new JCommander(a);
+    jc.addCommand(conf);
+    jc.parse("--configure");
+  }
+
+  @Test(enabled = false)
+  public static void main(String[] args) throws Exception {
+//    System.out.println("Help:" + a.help);
+//    System.out.println("A");
+//    class A {
+//      @Parameter
+//      List<String> parameters;
+//
+//      @Parameter(names = "-long")
+//      public long l;
+//    }
+//    A a = new A();
+//    new JCommander(a).parse("-long", "32");
 //    System.out.println(a.l);
 //    System.out.println(a.parameters);
 //    ArgsList al = new ArgsList();