Added a test for the -Dflag case

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

Author: ebourg

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

@@ -29,11 +29,16 @@ public void setUp()
         parser = new BasicParser();
     }
 
-    public void testPropertiesOption() throws Exception
+    public void testPropertiesOption1() throws Exception
     {
         // not supported by the BasicParser
     }
 
+    public void testPropertiesOption2() throws Exception
+    {
+        // not supported by the BasicParser
+    }    
+
     public void testShortWithEqual() throws Exception
     {
         // not supported by the BasicParser

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

@@ -19,6 +19,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Properties;
 
 import junit.framework.TestCase;
 
@@ -283,7 +284,7 @@ public void testLongWithEqualSingleDash() throws Exception
         assertEquals("bar", cl.getOptionValue("foo"));
     }
 
-    public void testPropertiesOption() throws Exception
+    public void testPropertiesOption1() throws Exception
     {
         String[] args = new String[] { "-Jsource=1.5", "-J", "target", "1.5", "foo" };
 
@@ -299,11 +300,31 @@ public void testPropertiesOption() throws Exception
         assertEquals("value 2", "1.5", values.get(1));
         assertEquals("value 3", "target", values.get(2));
         assertEquals("value 4", "1.5", values.get(3));
+        
         List argsleft = cl.getArgList();
-        assertEquals("Should be 1 arg left",1,argsleft.size());
-        assertEquals("Expecting foo","foo",argsleft.get(0));
+        assertEquals("Should be 1 arg left", 1, argsleft.size());
+        assertEquals("Expecting foo", "foo", argsleft.get(0));
     }
-    
+
+    public void testPropertiesOption2() throws Exception
+    {
+        String[] args = new String[] { "-Dparam1", "-Dparam2=value2", "-D"};
+
+        Options options = new Options();
+        options.addOption(OptionBuilder.withValueSeparator().hasOptionalArgs(2).create('D'));
+
+        CommandLine cl = parser.parse(options, args);
+        
+        Properties props = cl.getOptionProperties("D");
+        assertNotNull("null properties", props);
+        assertEquals("number of properties in " + props, 2, props.size());
+        assertEquals("property 1", "true", props.getProperty("param1"));
+        assertEquals("property 2", "value2", props.getProperty("param2"));
+        
+        List argsleft = cl.getArgList();
+        assertEquals("Should be no arg left", 0, argsleft.size());
+    }
+
     public void testUnambiguousPartialLongOption1() throws Exception
     {
         String[] args = new String[] { "--ver" };