some more tests

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

Author: John Keyes

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

@@ -14,6 +14,7 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+import java.util.Arrays;
 import java.util.Properties;
 
 public class ValueTest extends TestCase
@@ -73,6 +74,9 @@ public void setUp()
         opts.addOption( OptionBuilder.hasOptionalArgs( )
                         .create( 'j' ) );
 
+        opts.addOption( OptionBuilder.hasArgs( ).withValueSeparator( ',' )
+                        .create( 'k' ) );
+
         String[] args = new String[] { "-a",
             "-b", "foo",
             "--c",
@@ -253,11 +257,14 @@ public void testShortOptionalNArgValues()
 
     public void testLongOptionalNArgValues()
     {
-        String[] args = new String[] { "--hide", "house", "hair", "head"
+        String[] args = new String[] { 
+            "--hide", "house", "hair", "head"
         };
+
+        CommandLineParser parser = new PosixParser();
+
         try
         {
-            CommandLineParser parser = new PosixParser();
             CommandLine cmd = parser.parse(opts,args);
             assertTrue( cmd.hasOption("hide") );
             assertEquals( "house", cmd.getOptionValue("hide") );
@@ -272,13 +279,15 @@ public void testLongOptionalNArgValues()
         }
     }
 
-    public void testPropertyValues()
+    public void testPropertyOptionSingularValue()
     {
         Properties properties = new Properties();
         properties.setProperty( "hide", "seek" );
+
+        CommandLineParser parser = new PosixParser();
+        
         try
         {
-            CommandLineParser parser = new PosixParser();
             CommandLine cmd = parser.parse(opts, null, properties);
             assertTrue( cmd.hasOption("hide") );
             assertEquals( "seek", cmd.getOptionValue("hide") );
@@ -288,8 +297,100 @@ public void testPropertyValues()
         {
             fail("Cannot setUp() CommandLine: " + e.toString());
         }
+    }
+
+    public void testPropertyOptionFlags()
+    {
+        Properties properties = new Properties();
+        properties.setProperty( "a", "true" );
+        properties.setProperty( "c", "yes" );
+        properties.setProperty( "e", "1" );
+
+        CommandLineParser parser = new PosixParser();
+        
+        try
+        {
+            CommandLine cmd = parser.parse(opts, null, properties);
+            assertTrue( cmd.hasOption("a") );
+            assertTrue( cmd.hasOption("c") );
+            assertTrue( cmd.hasOption("e") );
+        }
+        catch (ParseException e)
+        {
+            fail("Cannot setUp() CommandLine: " + e.toString());
+        }
+
+        properties = new Properties();
+        properties.setProperty( "a", "false" );
+        properties.setProperty( "c", "no" );
+        properties.setProperty( "e", "0" );
+        try
+        {
+            CommandLine cmd = parser.parse(opts, null, properties);
+            assertTrue( !cmd.hasOption("a") );
+            assertTrue( !cmd.hasOption("c") );
+            assertTrue( !cmd.hasOption("e") );
+        }
+        catch (ParseException e)
+        {
+            fail("Cannot setUp() CommandLine: " + e.toString());
+        }
+
+        properties = new Properties();
+        properties.setProperty( "a", "TRUE" );
+        properties.setProperty( "c", "nO" );
+        properties.setProperty( "e", "TrUe" );
+        try
+        {
+            CommandLine cmd = parser.parse(opts, null, properties);
+            assertTrue( cmd.hasOption("a") );
+            assertTrue( !cmd.hasOption("c") );
+            assertTrue( cmd.hasOption("e") );
+        }
+        catch (ParseException e)
+        {
+            fail("Cannot setUp() CommandLine: " + e.toString());
+        }
+
+        properties = new Properties();
+        properties.setProperty( "a", "just a string" );
+        properties.setProperty( "e", "" );
+        try
+        {
+            CommandLine cmd = parser.parse(opts, null, properties);
+            assertTrue( !cmd.hasOption("a") );
+            assertTrue( !cmd.hasOption("c") );
+            assertTrue( !cmd.hasOption("e") );
+        }
+        catch (ParseException e)
+        {
+            fail("Cannot setUp() CommandLine: " + e.toString());
+        }
+
     } 
 
+    public void testPropertyOptionMultipleValues()
+    {
+        Properties properties = new Properties();
+        properties.setProperty( "k", "one,two" );
+
+        CommandLineParser parser = new PosixParser();
+        
+        String[] values = new String[] {
+            "one", "two"
+        };
+        try
+        {
+            CommandLine cmd = parser.parse(opts, null, properties);
+            assertTrue( cmd.hasOption("k") );
+            assertTrue( Arrays.equals( values, cmd.getOptionValues('k') ) );
+        }
+        catch (ParseException e)
+        {
+            fail("Cannot setUp() CommandLine: " + e.toString());
+        }
+    }
+
     public void testPropertyOverrideValues()
     {
         String[] args = new String[] {