Merge pull request #267 from mbenson/varargs

FORGE-743: NamedValueOptionParser should reject varargs options
forge · Jan 10, 2013 · e2d7d1d · e2d7d1d
2 parents 2c8a777 + e51d4dd
commit e2d7d1d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/shell/src/main/java/org/jboss/forge/shell/command/parser/NamedValueOptionParser.java b/shell/src/main/java/org/jboss/forge/shell/command/parser/NamedValueOptionParser.java
@@ -35,10 +35,10 @@ public CommandParserContext parse(final CommandMetadata command, final Queue<Str
             if (command.hasOption(currentToken))
             {
                OptionMetadata option = command.getNamedOption(currentToken);
-               tokens.remove();
 
-               if (!option.isBoolean())
+               if (!option.isBoolean() && !option.isVarargs())
                {
+                  tokens.remove();
                   String value = null;
                   if (!tokens.isEmpty())
                   {

diff --git a/shell/src/test/java/org/jboss/forge/shell/test/ExecutionParserTest.java b/shell/src/test/java/org/jboss/forge/shell/test/ExecutionParserTest.java
@@ -71,4 +71,17 @@ public void testVarargsTakesUnusedParameters() throws Exception
       assertTrue(plugin.getVarargsOptions().contains("--bar"));
       assertTrue(plugin.getVarargsOptions().contains("-ext"));
    }
+
+   @Test
+   public void testNamedVarargs() throws Exception
+   {
+      getShell().execute("motp namedVarargsOption --opt foo bar baz");
+      assertEquals(3, plugin.getVarargsOptions().size());
+      assertTrue(plugin.getVarargsOptions().contains("foo"));
+      assertTrue(plugin.getVarargsOptions().contains("bar"));
+      assertTrue(plugin.getVarargsOptions().contains("baz"));
+
+      getShell().execute("motp namedVarargsOption");
+      assertNull(plugin.getVarargsOptions());
+   }
 }
diff --git a/shell/src/test/java/org/jboss/forge/shell/test/command/MockOptionTestPlugin.java b/shell/src/test/java/org/jboss/forge/shell/test/command/MockOptionTestPlugin.java
@@ -60,6 +60,12 @@ public void requiredOption(@Option final String... options)
       varargsOptions = options;
    }
 
+   @Command("namedVarargsOption")
+   public void namedVarargsOption(@Option(name = "opt") final String... options)
+   {
+      varargsOptions = options;
+   }
+
    @Command("booleanOptionOmitted")
    public void booleanOptionOmitted(@Option(required = false,
             description = "Some boolean flag") final boolean option)
@@ -109,6 +115,6 @@ public String getDefaultCommandArg()
 
    public List<String> getVarargsOptions()
    {
-      return Arrays.asList(varargsOptions);
+      return varargsOptions == null ? null : Arrays.asList(varargsOptions);
    }
 }