GroupImpl now respects the required attribute of the child options (bug identified by Andrew Ferguson)

Switch only adds the option to the commandline once.


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

Author: Robert James Oxspring

src/java/org/apache/commons/cli2/option/GroupImpl.java

@@ -223,6 +223,11 @@ public void validate(final WriteableCommandLine commandLine)
 
         for (final Iterator i = options.iterator(); i.hasNext();) {
             final Option option = (Option) i.next();
+            // if the child option is required then validate it
+            if(option.isRequired()){
+                option.validate(commandLine);
+            }
+            // if the child option is present then validate it
             if (commandLine.hasOption(option)) {
                 if (++present > maximum) {
                     unexpected = option;

src/java/org/apache/commons/cli2/option/Switch.java

@@ -140,7 +140,6 @@ public void processParent(
         final String arg = (String)arguments.next();
 
         if (canProcess(arg)) {
-            commandLine.addOption(this);
             if (arg.startsWith(enabledPrefix)) {
                 commandLine.addSwitch(this, true);
                 arguments.set(enabledPrefix + preferredName);

src/test/org/apache/commons/cli2/CommandLineTestCase.java

@@ -440,6 +440,7 @@ public final void testGetOptionCount() throws OptionException {
                     "--help",
                     "login",
                     "rob",
+                    "+display",
                     "--help",
                     "--help",
                     "target1",
@@ -448,7 +449,7 @@ public final void testGetOptionCount() throws OptionException {
         assertEquals(1, cl.getOptionCount(login));
         assertEquals(3, cl.getOptionCount(help));
         assertEquals(2, cl.getOptionCount(targets));
-        assertEquals(0, cl.getOptionCount(display));
+        assertEquals(1, cl.getOptionCount(display));
     }
 
     public final void testGetOptionCount_Strings() throws OptionException {
@@ -473,13 +474,14 @@ public final void testGetOptionCount_Strings() throws OptionException {
                     "--help",
                     "login",
                     "rob",
+                    "+display",
                     "--help",
                     "--help",
                     "target1",
                     "target2" });
 
         assertEquals(1, cl.getOptionCount("login"));
         assertEquals(3, cl.getOptionCount("-?"));
-        assertEquals(0, cl.getOptionCount("+display"));
+        assertEquals(1, cl.getOptionCount("+display"));
     }
 }

src/test/org/apache/commons/cli2/option/GroupTest.java

@@ -28,6 +28,8 @@
 import org.apache.commons.cli2.Option;
 import org.apache.commons.cli2.OptionException;
 import org.apache.commons.cli2.WriteableCommandLine;
+import org.apache.commons.cli2.builder.DefaultOptionBuilder;
+import org.apache.commons.cli2.builder.GroupBuilder;
 
 /**
  * @author Rob Oxspring
@@ -246,6 +248,42 @@ public void testValidate_MissingOption() throws OptionException {
             assertEquals(option, moe.getOption());
         }
     }
+    
+    public void testValidate_RequiredChild() throws OptionException {
+        final Option required = new DefaultOptionBuilder().withLongName("required").withRequired(true).create();
+        final Option optional = new DefaultOptionBuilder().withLongName("optional").withRequired(false).create();
+        final Group group = new GroupBuilder()
+            .withOption(required)
+            .withOption(optional)
+            .withMinimum(1)
+            .create();
+
+        WriteableCommandLine commandLine;
+        
+        commandLine = commandLine(group, list());
+        try {
+            group.validate(commandLine);
+            fail("Missing option 'required'");
+        }
+        catch (OptionException moe) {
+            assertEquals(required, moe.getOption());
+        }
+        
+        commandLine = commandLine(group, list());
+        commandLine.addOption(optional);
+        try {
+            group.validate(commandLine);
+            fail("Missing option 'required'");
+        }
+        catch (OptionException moe) {
+            assertEquals(required, moe.getOption());
+        }
+        
+        commandLine = commandLine(group, list());
+        commandLine.addOption(required);
+        group.validate(commandLine);
+        
+    }
 
     /*
      * (non-Javadoc)