Fixed the parsing of --foo=bar and -f=bar options with the GnuParser (CLI-157)

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/branches/cli-1.x@662192 13f79535-47bb-0310-9956-ffa450edef68

Author: ebourg

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

@@ -70,32 +70,32 @@ else if ("-".equals(arg))
             }
             else if (arg.startsWith("-"))
             {
-                Option option = options.getOption(arg);
+                String opt = Util.stripLeadingHyphens(arg);
 
-                String head = arg.substring(0, 2); // "--" if --foo, "-f" if -foo
-                String tail = arg.substring(2);    // "foo" if -foo, "oo" if -foo
-
-                // this is not an Option
-                if (option == null)
+                if (options.hasOption(opt))
                 {
-                    // handle special properties Option (-Dproperty=value for example)
-                    Option specialOption = options.getOption(head);
-
-                    if (specialOption != null)
+                    tokens.add(arg);
+                }
+                else
+                {
+                    if (opt.indexOf('=') != -1 && options.hasOption(opt.substring(0, opt.indexOf('='))))
                     {
-                        tokens.add(head); // -D
-                        tokens.add(tail); // property=value
+                        // the format is --foo=value or -foo=value
+                        tokens.add(arg.substring(0, arg.indexOf('='))); // --foo
+                        tokens.add(arg.substring(arg.indexOf('=') + 1)); // value
+                    }
+                    else if (options.hasOption(arg.substring(0, 2)))
+                    {
+                        // the format is a special properties option (-Dproperty=value)
+                        tokens.add(arg.substring(0, 2)); // -D
+                        tokens.add(arg.substring(2)); // property=value
                     }
                     else
                     {
                         eatTheRest = stopAtNonOption;
                         tokens.add(arg);
                     }
                 }
-                else
-                {
-                    tokens.add(arg);
-                }
             }
             else
             {

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

@@ -195,4 +195,56 @@ public void testNegativeArgument() throws Exception
         CommandLine cl = parser.parse(options, args);
         assertEquals("-1", cl.getOptionValue("a"));
     }
+
+    public void testShortWithEqual() throws Exception
+    {
+        String[] args = new String[] { "-f=bar" };
+
+        Options options = new Options();
+        options.addOption(OptionBuilder.withLongOpt("foo").hasArg().create('f'));
+
+        Parser parser = new GnuParser();
+        CommandLine cl = parser.parse(options, args);
+
+        assertEquals("bar", cl.getOptionValue("foo"));
+    }
+
+    public void testShortWithoutEqual() throws Exception
+    {
+        String[] args = new String[] { "-fbar" };
+
+        Options options = new Options();
+        options.addOption(OptionBuilder.withLongOpt("foo").hasArg().create('f'));
+
+        Parser parser = new GnuParser();
+        CommandLine cl = parser.parse(options, args);
+
+        assertEquals("bar", cl.getOptionValue("foo"));
+    }
+
+    public void testLongWithEqual() throws Exception
+    {
+        String[] args = new String[] { "--foo=bar" };
+
+        Options options = new Options();
+        options.addOption(OptionBuilder.withLongOpt("foo").hasArg().create('f'));
+
+        Parser parser = new GnuParser();
+        CommandLine cl = parser.parse(options, args);
+
+        assertEquals("bar", cl.getOptionValue("foo"));
+    }
+
+    public void testLongWithEqualSingleDash() throws Exception
+    {
+        String[] args = new String[] { "-foo=bar" };
+
+        Options options = new Options();
+        options.addOption(OptionBuilder.withLongOpt("foo").hasArg().create('f'));
+
+        Parser parser = new GnuParser();
+        CommandLine cl = parser.parse(options, args);
+
+        assertEquals("bar", cl.getOptionValue("foo"));
+    }
 }