CLI-252: LongOpt falsely detected as ambiguous. This closes apache#2 from github. Thanks to Simon Harrer.

britter · britter · commit 085a1538fa20 · 2015-06-09T05:18:22.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/trunk@1684315 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -23,6 +23,9 @@
   <body>
 
     <release version="1.4" date="tba" description="tba">
+      <action type="fix" dev="britter" issue="CLI-252" due-to="Simon Harrer">
+        LongOpt falsely detected as ambiguous
+      </action>
     </release>
 
     <release version="1.3" date="2015-05-09" description="This is a feature and maintenance bug fix release.">
diff --git a/src/main/java/org/apache/commons/cli/Options.java b/src/main/java/org/apache/commons/cli/Options.java
@@ -235,7 +235,12 @@ public List<String> getMatchingOptions(String opt)
         opt = Util.stripLeadingHyphens(opt);
         
         List<String> matchingOpts = new ArrayList<String>();
-        
+
+        // for a perfect match return the single option only
+        if(longOpts.keySet().contains(opt)) {
+            return Collections.singletonList(opt);
+        }
+
         for (String longOpt : longOpts.keySet())
         {
             if (longOpt.startsWith(opt))
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI252Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI252Test.java
@@ -0,0 +1,25 @@
+package org.apache.commons.cli.bug;
+
+import org.apache.commons.cli.*;
+import org.junit.Test;
+
+public class BugCLI252Test extends DefaultParserTest {
+
+    @Test
+    public void testExactOptionNameMatch() throws ParseException {
+        new DefaultParser().parse(getOptions(), new String[]{"--prefix"});
+    }
+
+    @Test(expected = AmbiguousOptionException.class)
+    public void testAmbiquousOptionName() throws ParseException {
+        new DefaultParser().parse(getOptions(), new String[]{"--pref"});
+    }
+
+    private Options getOptions() {
+        Options options = new Options();
+        options.addOption(Option.builder().longOpt("prefix").build());
+        options.addOption(Option.builder().longOpt("prefixplusplus").build());
+        return options;
+    }
+
+}
