Parser now correctly allows option arguments to be the same as other options, less the initial '-'. E.g. with options -a, the value 'a' is now allowed.

Also corrected typo in test: testNoCyclesPresnet().

PR: 25044
Submitted by:	David Morris


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk@130109 13f79535-47bb-0310-9956-ffa450edef68

Author: Robert James Oxspring

src/java/org/apache/commons/cli/Parser.java

@@ -27,7 +27,7 @@
  *
  * @author John Keyes (john at integralsource.com)
  * @see Parser
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
  */
 public abstract class Parser implements CommandLineParser {
 
@@ -319,7 +319,8 @@ public void processArgs(Option opt, ListIterator iter)
         {
             String str = (String) iter.next();
 
-            // found an Option
+            // found an Option, not an argument
+            //if (options.hasOption(str) && str.startsWith("-"))
             if (options.hasOption(str))
             {
                 iter.previous();

src/test/org/apache/commons/cli/ArgumentIsOptionTest.java

@@ -46,15 +46,15 @@ public void testOptionAndOptionWithArgument() {
         String[] args = new String[] {
                 "-p",
                 "-attr",
-                "value"
+                "p"
             };
 
         try {
             CommandLine cl = parser.parse(options, args);
             assertTrue("Confirm -p is set", cl.hasOption("p"));
             assertTrue("Confirm -attr is set", cl.hasOption("attr"));
             assertTrue("Confirm arg of -attr",
-                cl.getOptionValue("attr").equals("value"));
+                cl.getOptionValue("attr").equals("p"));
             assertTrue("Confirm all arguments recognized", cl.getArgs().length == 0);
         }
         catch (ParseException e) {
@@ -65,15 +65,15 @@ public void testOptionAndOptionWithArgument() {
     public void testOptionWithArgument() {
         String[] args = new String[] {
                 "-attr",
-                "value"
+                "p"
             };
 
         try {
             CommandLine cl = parser.parse(options, args);
             assertFalse("Confirm -p is set", cl.hasOption("p"));
             assertTrue("Confirm -attr is set", cl.hasOption("attr"));
             assertTrue("Confirm arg of -attr",
-                cl.getOptionValue("attr").equals("value"));
+                cl.getOptionValue("attr").equals("p"));
             assertTrue("Confirm all arguments recognized", cl.getArgs().length == 0);
         }
         catch (ParseException e) {

src/test/org/apache/commons/cli2/CommandLineTestCase.java

@@ -19,6 +19,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.cli2.builder.ArgumentBuilder;
 import org.apache.commons.cli2.builder.DefaultOptionBuilder;
 import org.apache.commons.cli2.builder.GroupBuilder;
 import org.apache.commons.cli2.commandline.Parser;
@@ -484,4 +485,30 @@ public final void testGetOptionCount_Strings() throws OptionException {
         assertEquals(3, cl.getOptionCount("-?"));
         assertEquals(1, cl.getOptionCount("+display"));
     }
+
+    public final void testOptionAsArgument() throws OptionException {
+    	final Option bool = new DefaultOptionBuilder().withShortName("p").create();
+    	final Argument argument = new ArgumentBuilder().create();
+    	final Option withArgument = new DefaultOptionBuilder().withShortName("attr").withArgument(argument).create();
+
+    	final Group group =
+            new GroupBuilder()
+                .withOption(bool)
+                .withOption(withArgument)
+                .create();
+
+        final Parser parser = new Parser();
+        parser.setGroup(group);
+        final CommandLine cl =
+            parser.parse(
+                new String[] {
+                    "-p",
+                    "-attr",
+                    "p" });
+
+        assertEquals(1, cl.getOptionCount("-p"));
+        assertTrue(cl.hasOption("-p"));
+        assertTrue(cl.hasOption("-attr"));
+        assertTrue(cl.getValue("-attr").equals("p"));
+    }
 }

src/test/org/apache/commons/cli2/jdepend/JDependTest.java

@@ -71,7 +71,7 @@ public void testAcceptableDistance() {
         }
     }
 
-    public void testNoCyclesPresnet() {
+    public void testNoCyclesPresent() {
         assertEquals("Cycles exist", false, dependancies.containsCycles());
     }