You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2017/06/14 07:57:30 UTC
[07/12] commons-cli git commit: Merge branch 'master' into patch-1
Merge branch 'master' into patch-1
Project: http://git-wip-us.apache.org/repos/asf/commons-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-cli/commit/aea58f86
Tree: http://git-wip-us.apache.org/repos/asf/commons-cli/tree/aea58f86
Diff: http://git-wip-us.apache.org/repos/asf/commons-cli/diff/aea58f86
Branch: refs/heads/master
Commit: aea58f8677e55513ae281c49b91a3abce5ee7d1b
Parents: fac3330 70a3927
Author: Bela Schaum <sc...@users.noreply.github.com>
Authored: Fri Jun 9 11:23:10 2017 +0200
Committer: GitHub <no...@github.com>
Committed: Fri Jun 9 11:23:10 2017 +0200
----------------------------------------------------------------------
.gitignore | 17 +
.travis.yml | 2 +-
README.md | 3 +
pom.xml | 8 +-
src/changes/changes.xml | 3 +
.../commons/cli/AlreadySelectedException.java | 4 +-
.../commons/cli/AmbiguousOptionException.java | 8 +-
.../org/apache/commons/cli/BasicParser.java | 6 +-
.../org/apache/commons/cli/CommandLine.java | 78 ++---
.../org/apache/commons/cli/DefaultParser.java | 104 +++---
.../java/org/apache/commons/cli/GnuParser.java | 8 +-
.../org/apache/commons/cli/HelpFormatter.java | 124 ++++----
.../commons/cli/MissingArgumentException.java | 4 +-
.../commons/cli/MissingOptionException.java | 10 +-
.../java/org/apache/commons/cli/Option.java | 49 ++-
.../org/apache/commons/cli/OptionBuilder.java | 24 +-
.../org/apache/commons/cli/OptionGroup.java | 12 +-
.../org/apache/commons/cli/OptionValidator.java | 10 +-
.../java/org/apache/commons/cli/Options.java | 26 +-
.../org/apache/commons/cli/ParseException.java | 2 +-
.../java/org/apache/commons/cli/Parser.java | 54 ++--
.../commons/cli/PatternOptionBuilder.java | 10 +-
.../org/apache/commons/cli/PosixParser.java | 26 +-
.../org/apache/commons/cli/TypeHandler.java | 28 +-
.../cli/UnrecognizedOptionException.java | 4 +-
src/main/java/org/apache/commons/cli/Util.java | 4 +-
src/site/xdoc/index.xml | 4 +-
.../org/apache/commons/cli/ApplicationTest.java | 58 ++--
.../commons/cli/ArgumentIsOptionTest.java | 12 +-
.../org/apache/commons/cli/CommandLineTest.java | 62 ++--
.../apache/commons/cli/HelpFormatterTest.java | 202 ++++++------
.../apache/commons/cli/OptionBuilderTest.java | 26 +-
.../org/apache/commons/cli/OptionGroupTest.java | 70 ++--
.../java/org/apache/commons/cli/OptionTest.java | 30 +-
.../org/apache/commons/cli/OptionsTest.java | 46 +--
.../org/apache/commons/cli/ParserTestCase.java | 318 +++++++++----------
.../commons/cli/PatternOptionBuilderTest.java | 56 ++--
.../java/org/apache/commons/cli/ValueTest.java | 100 +++---
.../java/org/apache/commons/cli/ValuesTest.java | 6 +-
.../apache/commons/cli/bug/BugCLI133Test.java | 8 +-
.../apache/commons/cli/bug/BugCLI13Test.java | 5 +-
.../apache/commons/cli/bug/BugCLI148Test.java | 12 +-
.../apache/commons/cli/bug/BugCLI162Test.java | 22 +-
.../apache/commons/cli/bug/BugCLI18Test.java | 6 +-
.../apache/commons/cli/bug/BugCLI252Test.java | 2 +-
.../apache/commons/cli/bug/BugCLI265Test.java | 14 +-
.../apache/commons/cli/bug/BugCLI266Test.java | 30 +-
.../apache/commons/cli/bug/BugCLI71Test.java | 16 +-
.../org/apache/commons/cli/bug/BugsTest.java | 112 +++----
49 files changed, 935 insertions(+), 910 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-cli/blob/aea58f86/src/main/java/org/apache/commons/cli/TypeHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-cli/blob/aea58f86/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
----------------------------------------------------------------------
diff --cc src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
index 0ee56a1,b9e7a15..82eacb5
--- a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
+++ b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
@@@ -161,12 -159,13 +161,12 @@@ public class PatternOptionBuilderTes
@Test
public void testExistingFilePattern() throws Exception
{
- Options options = PatternOptionBuilder.parsePattern("f<g<");
- CommandLineParser parser = new PosixParser();
- CommandLine line = parser.parse(options, new String[] { "-f", "test.properties", "-g", "/dev/null" });
- final Options options = PatternOptionBuilder.parsePattern("f<");
++ final Options options = PatternOptionBuilder.parsePattern("f<g<");
+ final CommandLineParser parser = new PosixParser();
- final CommandLine line = parser.parse(options, new String[] { "-f", "test.properties" });
-
- assertEquals("f value", new File("test.properties"), line.getOptionObject("f"));
-
- // todo test if an error is returned if the file doesn't exists (when it's implemented)
++ final CommandLine line = parser.parse(options, new String[] { "-f", "test.properties", "-g", "/dev/null" });
+
+ assertNotNull("option g not parsed, or not FileInputStream", (FileInputStream) line.getOptionObject("g"));
+ assertNull("option f parsed", (FileInputStream) line.getOptionObject("f"));
}
@Test