You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2010/06/16 02:00:14 UTC
svn commit: r955096 - in /commons/proper/cli/trunk/src:
java/org/apache/commons/cli/Parser.java
test/org/apache/commons/cli/ValueTest.java
Author: ebourg
Date: Wed Jun 16 00:00:14 2010
New Revision: 955096
URL: http://svn.apache.org/viewvc?rev=955096&view=rev
Log:
The processing of the default options is no longer stopped by a flag with a false value (CLI-201)
Modified:
commons/proper/cli/trunk/src/java/org/apache/commons/cli/Parser.java
commons/proper/cli/trunk/src/test/org/apache/commons/cli/ValueTest.java
Modified: commons/proper/cli/trunk/src/java/org/apache/commons/cli/Parser.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/java/org/apache/commons/cli/Parser.java?rev=955096&r1=955095&r2=955096&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/java/org/apache/commons/cli/Parser.java (original)
+++ commons/proper/cli/trunk/src/java/org/apache/commons/cli/Parser.java Wed Jun 16 00:00:14 2010
@@ -287,7 +287,7 @@ public abstract class Parser implements
{
// if the value is not yes, true or 1 then don't add the
// option to the CommandLine
- break;
+ continue;
}
cmd.addOption(opt);
Modified: commons/proper/cli/trunk/src/test/org/apache/commons/cli/ValueTest.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/test/org/apache/commons/cli/ValueTest.java?rev=955096&r1=955095&r2=955096&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/test/org/apache/commons/cli/ValueTest.java (original)
+++ commons/proper/cli/trunk/src/test/org/apache/commons/cli/ValueTest.java Wed Jun 16 00:00:14 2010
@@ -212,7 +212,7 @@ public class ValueTest extends TestCase
cmd = parser.parse(opts, null, properties);
assertTrue( !cmd.hasOption("a") );
assertTrue( !cmd.hasOption("c") );
- assertTrue( !cmd.hasOption("e") );
+ assertTrue( cmd.hasOption("e") ); // this option accepts as argument
properties = new Properties();
@@ -233,7 +233,7 @@ public class ValueTest extends TestCase
cmd = parser.parse(opts, null, properties);
assertTrue( !cmd.hasOption("a") );
assertTrue( !cmd.hasOption("c") );
- assertTrue( !cmd.hasOption("e") );
+ assertTrue( cmd.hasOption("e") );
}
public void testPropertyOptionMultipleValues() throws Exception