fix pr 13935 - still need to improve the exception message

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

Author: John Keyes

src/java/org/apache/commons/cli/OptionGroup.java

@@ -78,6 +78,9 @@ public class OptionGroup {
     /** the name of the selected option */
     private String selected;
 
+    /** specified whether this group is required */
+    private boolean required;
+
     /**
      * add <code>opt</code> to this group
      *
@@ -136,6 +139,22 @@ public String getSelected() {
         return selected;
     }
 
+    /**
+     * @param required specifies if this group is required
+     */
+    public void setRequired( boolean required ) {
+        this.required = required;
+    }
+
+    /**
+     * Returns whether this option group is required.
+     *
+     * @returns whether this option group is required
+     */
+    public boolean isRequired() {
+        return this.required;
+    }
+
     /**
      * <p>Returns the stringified version of this OptionGroup.</p>
      * @return the stringified representation of this group

src/java/org/apache/commons/cli/Options.java

@@ -113,8 +113,16 @@ public Options() {
     public Options addOptionGroup( OptionGroup group ) {
         Iterator options = group.getOptions().iterator();
 
+        if( group.isRequired() ) {
+            requiredOpts.add( group );
+        }
+
         while( options.hasNext() ) {
             Option option = (Option)options.next();
+            // an Option cannot be required if it is in an
+            // OptionGroup, either the group is required or
+            // nothing is required
+            option.setRequired( false );
             addOption( option );
 
             optionGroups.put( option.getOpt(), group );

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

@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/Parser.java,v 1.6 2002/10/08 21:24:11 jkeyes Exp $
- * $Revision: 1.6 $
- * $Date: 2002/10/08 21:24:11 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/Parser.java,v 1.7 2002/10/24 23:17:49 jkeyes Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/10/24 23:17:49 $
  *
  * ====================================================================
  *
@@ -72,7 +72,7 @@
  *
  * @author John Keyes (john at integralsource.com)
  * @see Parser
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
  */
 public abstract class Parser implements CommandLineParser {
 
@@ -265,7 +265,11 @@ private void processOption( String arg, ListIterator iter )
         // if the option is in an OptionGroup make that option the selected
         // option of the group
         if ( options.getOptionGroup( opt ) != null ) {
-            ( (OptionGroup)( options.getOptionGroup( opt ) ) ).setSelected( opt );
+            OptionGroup group = ( OptionGroup ) options.getOptionGroup( opt );
+            if( group.isRequired() ) {
+                requiredOptions.remove( group );
+            }
+            group.setSelected( opt );
         }
 
         // if the option takes an argument value

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

@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  * 
- * $Id: BugsTest.java,v 1.9 2002/10/19 21:18:26 jkeyes Exp $
+ * $Id: BugsTest.java,v 1.10 2002/10/24 23:17:49 jkeyes Exp $
  */
 
 package org.apache.commons.cli;
@@ -278,4 +278,69 @@ public void test13666() {
         }
     }
 
+    public void test13935() {
+        OptionGroup directions = new OptionGroup();
+
+        Option left = new Option( "l", "left", false, "go left" );
+        Option right = new Option( "r", "right", false, "go right" );
+        Option straight = new Option( "s", "straight", false, "go straight" );
+        Option forward = new Option( "f", "forward", false, "go forward" );
+        forward.setRequired( true );
+
+        directions.addOption( left );
+        directions.addOption( right );
+        directions.setRequired( true );
+
+        Options opts = new Options();
+        opts.addOptionGroup( directions );
+        opts.addOption( straight );
+
+        CommandLineParser parser = new PosixParser();
+        boolean exception = false;
+
+        String[] args = new String[] {  };
+        try {
+            CommandLine line = parser.parse( opts, args );
+        }
+        catch( ParseException exp ) {
+            exception = true;
+        }
+
+        if( !exception ) {
+            fail( "Expected exception not caught.");
+        }
+
+        exception = false;
+
+        args = new String[] { "-s" };
+        try {
+            CommandLine line = parser.parse( opts, args );
+        }
+        catch( ParseException exp ) {
+            exception = true;
+        }
+
+        if( !exception ) {
+            fail( "Expected exception not caught.");
+        }
+
+        exception = false;
+
+        args = new String[] { "-s", "-l" };
+        try {
+            CommandLine line = parser.parse( opts, args );
+        }
+        catch( ParseException exp ) {
+            fail( "Unexpected exception: " + exp.getMessage() );
+        }
+
+        opts.addOption( forward );
+        args = new String[] { "-s", "-l", "-f" };
+        try {
+            CommandLine line = parser.parse( opts, args );
+        }
+        catch( ParseException exp ) {
+            fail( "Unexpected exception: " + exp.getMessage() );
+        }
+    }
 }