Fixed the bugs with the default options and the option groups (CLI-203 and CLI-204)

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

Author: ebourg

src/main/java/org/apache/commons/cli/DefaultParser.java

@@ -147,10 +147,18 @@ private void handleProperties(Properties properties) throws ParseException
         {
             String option = e.nextElement().toString();
 
-            if (!cmd.hasOption(option))
+            Option opt = options.getOption(option);
+            if (opt == null)
+            {
+                throw new UnrecognizedOptionException("Default option wasn't defined", option);
+            }
+            
+            // if the option is part of a group, check if another option of the group has been selected
+            OptionGroup group = options.getOptionGroup(opt);
+            boolean selected = group != null && group.getSelected() != null;
+            
+            if (!cmd.hasOption(option) && !selected)
             {
-                Option opt = options.getOption(option);
-                
                 // get the value from the properties
                 String value = properties.getProperty(option);
 

src/main/java/org/apache/commons/cli/Parser.java

@@ -259,11 +259,19 @@ protected void processProperties(Properties properties) throws ParseException
         for (Enumeration e = properties.propertyNames(); e.hasMoreElements();)
         {
             String option = e.nextElement().toString();
-
-            if (!cmd.hasOption(option))
+            
+            Option opt = options.getOption(option);
+            if (opt == null)
+            {
+                throw new UnrecognizedOptionException("Default option wasn't defined", option);
+            }
+            
+            // if the option is part of a group, check if another option of the group has been selected
+            OptionGroup group = options.getOptionGroup(opt);
+            boolean selected = group != null && group.getSelected() != null;
+            
+            if (!cmd.hasOption(option) && !selected)
             {
-                Option opt = getOptions().getOption(option);
-
                 // get the value from the properties instance
                 String value = properties.getProperty(option);
 

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

@@ -17,6 +17,8 @@
 
 package org.apache.commons.cli;
 
+import java.util.Properties;
+
 import junit.framework.TestCase;
 
 /**
@@ -26,7 +28,7 @@
 public class OptionGroupTest extends TestCase
 {
     private Options _options = null;
-    private CommandLineParser parser = new PosixParser();
+    private Parser parser = new PosixParser();
 
     public void setUp()
     {
@@ -186,6 +188,18 @@ public void testTwoOptionsFromDifferentGroup() throws Exception
         assertTrue( "Confirm NO extra args", cl.getArgList().size() == 0);
     }
 
+    public void testTwoOptionsFromGroupWithProperties() throws Exception
+    {
+        String[] args = new String[] { "-f" };
+        
+        Properties properties = new Properties();
+        properties.put("d", "true");
+        
+        CommandLine cl = parser.parse( _options, args, properties);
+        assertTrue(cl.hasOption("f"));
+        assertTrue(!cl.hasOption("d"));
+    }
+
     public void testValidLongOnlyOptions() throws Exception
     {
         CommandLine cl1 = parser.parse(_options, new String[]{"--export"});

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

@@ -998,4 +998,47 @@ public void testPropertyOptionRequired() throws Exception
         CommandLine cmd = parse(parser, opts, null, properties);
         assertTrue(cmd.hasOption("f"));
     }
+
+    public void testPropertyOptionUnexpected() throws Exception
+    {
+        Options opts = new Options();
+        
+        Properties properties = new Properties();
+        properties.setProperty("f", "true");
+        
+        try {
+            parse(parser, opts, null, properties);
+            fail("UnrecognizedOptionException expected");
+        } catch (UnrecognizedOptionException e) {
+            // expected
+        }
+    }
+
+    public void testPropertyOptionGroup() throws Exception
+    {
+        Options opts = new Options();
+        
+        OptionGroup group1 = new OptionGroup();
+        group1.addOption(new Option("a", null));
+        group1.addOption(new Option("b", null));
+        opts.addOptionGroup(group1);
+        
+        OptionGroup group2 = new OptionGroup();
+        group2.addOption(new Option("x", null));
+        group2.addOption(new Option("y", null));
+        opts.addOptionGroup(group2);
+        
+        String[] args = new String[] { "-a" };
+        
+        Properties properties = new Properties();
+        properties.put("b", "true");
+        properties.put("x", "true");
+        
+        CommandLine cmd = parse(parser, opts, args, properties);
+        
+        assertTrue(cmd.hasOption("a"));
+        assertFalse(cmd.hasOption("b"));
+        assertTrue(cmd.hasOption("x"));
+        assertFalse(cmd.hasOption("y"));
+    }
 }