More tests for the partial option matching

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

Author: ebourg

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

@@ -44,7 +44,7 @@ public void testShortWithoutEqual() throws Exception
         // not supported by the BasicParser
     }
 
-    public void testLongWithEqual() throws Exception
+    public void testLongWithEqualDoubleDash() throws Exception
     {
         // not supported by the BasicParser
     }
@@ -64,6 +64,16 @@ public void testUnambiguousPartialLongOption2() throws Exception
         // not supported by the BasicParser
     }
 
+    public void testUnambiguousPartialLongOption3() throws Exception
+    {
+        // not supported by the BasicParser
+    }
+
+    public void testUnambiguousPartialLongOption4() throws Exception
+    {
+        // not supported by the BasicParser
+    }
+
     public void testAmbiguousPartialLongOption1() throws Exception
     {
         // not supported by the BasicParser
@@ -74,7 +84,17 @@ public void testAmbiguousPartialLongOption2() throws Exception
         // not supported by the BasicParser
     }
 
-    public void testPartialLongOptionWithShort() throws Exception
+    public void testAmbiguousPartialLongOption3() throws Exception
+    {
+        // not supported by the BasicParser
+    }
+
+    public void testAmbiguousPartialLongOption4() throws Exception
+    {
+        // not supported by the BasicParser
+    }
+
+    public void testPartialLongOptionSingleDash() throws Exception
     {
         // not supported by the BasicParser
     }

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

@@ -35,6 +35,16 @@ public void testUnambiguousPartialLongOption2() throws Exception
         // not supported by the GnuParser
     }
 
+    public void testUnambiguousPartialLongOption3() throws Exception
+    {
+        // not supported by the GnuParser
+    }
+
+    public void testUnambiguousPartialLongOption4() throws Exception
+    {
+        // not supported by the GnuParser
+    }
+
     public void testAmbiguousPartialLongOption1() throws Exception
     {
         // not supported by the GnuParser
@@ -45,7 +55,17 @@ public void testAmbiguousPartialLongOption2() throws Exception
         // not supported by the GnuParser
     }
 
-    public void testPartialLongOptionWithShort() throws Exception
+   public void testAmbiguousPartialLongOption3() throws Exception
+    {
+        // not supported by the GnuParser
+    }
+
+    public void testAmbiguousPartialLongOption4() throws Exception
+    {
+        // not supported by the GnuParser
+    }
+
+    public void testPartialLongOptionSingleDash() throws Exception
     {
         // not supported by the GnuParser
     }

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

@@ -122,7 +122,7 @@ public void testUnrecognizedOption() throws Exception
         {
             assertEquals("-d", e.getOption());
         }
-    }    
+    }
 
     public void testMissingArg() throws Exception
     {
@@ -259,7 +259,7 @@ public void testShortWithoutEqual() throws Exception
         assertEquals("bar", cl.getOptionValue("foo"));
     }
 
-    public void testLongWithEqual() throws Exception
+    public void testLongWithEqualDoubleDash() throws Exception
     {
         String[] args = new String[] { "--foo=bar" };
 
@@ -330,6 +330,34 @@ public void testUnambiguousPartialLongOption2() throws Exception
         assertTrue("Confirm --version is set", cl.hasOption("version"));
     }
 
+    public void testUnambiguousPartialLongOption3() throws Exception
+    {
+        String[] args = new String[] { "--ver=1" };
+        
+        Options options = new Options();
+        options.addOption(OptionBuilder.withLongOpt("verbose").hasOptionalArg().create());
+        options.addOption(OptionBuilder.withLongOpt("help").create());
+        
+        CommandLine cl = parser.parse(options, args);
+        
+        assertTrue("Confirm --verbose is set", cl.hasOption("verbose"));
+        assertEquals("1", cl.getOptionValue("verbose"));
+    }
+
+    public void testUnambiguousPartialLongOption4() throws Exception
+    {
+        String[] args = new String[] { "-ver=1" };
+        
+        Options options = new Options();
+        options.addOption(OptionBuilder.withLongOpt("verbose").hasOptionalArg().create());
+        options.addOption(OptionBuilder.withLongOpt("help").create());
+        
+        CommandLine cl = parser.parse(options, args);
+        
+        assertTrue("Confirm --verbose is set", cl.hasOption("verbose"));
+        assertEquals("1", cl.getOptionValue("verbose"));
+    }
+    
     public void testAmbiguousPartialLongOption1() throws Exception
     {
         String[] args = new String[] { "--ver" };
@@ -379,8 +407,58 @@ public void testAmbiguousPartialLongOption2() throws Exception
 
         assertTrue( "Confirm MissingArgumentException caught", caught );
     }
+
+    public void testAmbiguousPartialLongOption3() throws Exception
+    {
+        String[] args = new String[] { "--ver=1" };
+        
+        Options options = new Options();
+        options.addOption(OptionBuilder.withLongOpt("version").create());
+        options.addOption(OptionBuilder.withLongOpt("verbose").hasOptionalArg().create());
+        
+        boolean caught = false;
+        
+        try 
+        {
+            parser.parse(options, args);
+        }
+        catch (AmbiguousOptionException e) 
+        {
+            caught = true;
+            assertEquals("Partial option", "--ver", e.getOption());
+            assertNotNull("Matching options null", e.getMatchingOptions());
+            assertEquals("Matching options size", 2, e.getMatchingOptions().size());
+        }
+        
+        assertTrue( "Confirm MissingArgumentException caught", caught );
+    }
+
+    public void testAmbiguousPartialLongOption4() throws Exception
+    {
+        String[] args = new String[] { "-ver=1" };
+        
+        Options options = new Options();
+        options.addOption(OptionBuilder.withLongOpt("version").create());
+        options.addOption(OptionBuilder.withLongOpt("verbose").hasOptionalArg().create());
+        
+        boolean caught = false;
+        
+        try 
+        {
+            parser.parse(options, args);
+        }
+        catch (AmbiguousOptionException e) 
+        {
+            caught = true;
+            assertEquals("Partial option", "-ver", e.getOption());
+            assertNotNull("Matching options null", e.getMatchingOptions());
+            assertEquals("Matching options size", 2, e.getMatchingOptions().size());
+        }
+        
+        assertTrue( "Confirm MissingArgumentException caught", caught );
+    }
 
-    public void testPartialLongOptionWithShort() throws Exception
+    public void testPartialLongOptionSingleDash() throws Exception
     {
         String[] args = new String[] { "-ver" };
 

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

@@ -185,4 +185,14 @@ public void testShortWithEqual() throws Exception
     {
         // not supported by the PosixParser
     }
+
+    public void testUnambiguousPartialLongOption4() throws Exception
+    {
+        // not supported by the PosixParser
+    }
+
+    public void testAmbiguousPartialLongOption4() throws Exception
+    {
+        // not supported by the PosixParser
+    }
 }