Skip to content

Commit 0158f77

Browse files
committed
Merged BuildTest into OptionsTest
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/branches/cli-1.x@661813 13f79535-47bb-0310-9956-ffa450edef68
1 parent d029367 commit 0158f77

2 files changed

Lines changed: 57 additions & 90 deletions

File tree

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

Lines changed: 0 additions & 81 deletions
This file was deleted.

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

Lines changed: 57 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,47 @@
2828
*/
2929
public class OptionsTest extends TestCase
3030
{
31-
public void testHelpOptions(){
32-
31+
public void testSimple()
32+
{
33+
Options opts = new Options();
34+
35+
opts.addOption("a", false, "toggle -a");
36+
opts.addOption("b", true, "toggle -b");
37+
38+
assertTrue(opts.hasOption("a"));
39+
assertTrue(opts.hasOption("b"));
40+
}
41+
42+
public void testDuplicateSimple()
43+
{
44+
Options opts = new Options();
45+
opts.addOption("a", false, "toggle -a");
46+
opts.addOption("a", true, "toggle -a*");
47+
48+
assertEquals("last one in wins", "toggle -a*", opts.getOption("a").getDescription());
49+
}
50+
51+
public void testLong()
52+
{
53+
Options opts = new Options();
54+
55+
opts.addOption("a", "--a", false, "toggle -a");
56+
opts.addOption("b", "--b", true, "set -b");
57+
58+
assertTrue(opts.hasOption("a"));
59+
assertTrue(opts.hasOption("b"));
60+
}
61+
62+
public void testDuplicateLong()
63+
{
64+
Options opts = new Options();
65+
opts.addOption("a", "--a", false, "toggle -a");
66+
opts.addOption("a", "--a", false, "toggle -a*");
67+
assertEquals("last one in wins", "toggle -a*", opts.getOption("a").getDescription());
68+
}
69+
70+
public void testHelpOptions()
71+
{
3372
Option longOnly1 = OptionBuilder.withLongOpt("long-only1").create();
3473
Option longOnly2 = OptionBuilder.withLongOpt("long-only2").create();
3574
Option shortOnly1 = OptionBuilder.create("1");
@@ -59,30 +98,39 @@ public void testHelpOptions(){
5998
assertTrue("Everything in help should be in all", allOptions.containsAll(helpOptions));
6099
}
61100

62-
public void testMissingOptionException() throws ParseException {
101+
public void testMissingOptionException() throws ParseException
102+
{
63103
Options options = new Options();
64104
options.addOption(OptionBuilder.isRequired().create("f"));
65-
try {
105+
try
106+
{
66107
new PosixParser().parse(options, new String[0]);
67108
fail("Expected MissingOptionException to be thrown");
68-
} catch (MissingOptionException e) {
109+
}
110+
catch (MissingOptionException e)
111+
{
69112
assertEquals("Missing required option: f", e.getMessage());
70113
}
71114
}
72115

73-
public void testMissingOptionsException() throws ParseException {
116+
public void testMissingOptionsException() throws ParseException
117+
{
74118
Options options = new Options();
75119
options.addOption(OptionBuilder.isRequired().create("f"));
76120
options.addOption(OptionBuilder.isRequired().create("x"));
77-
try {
121+
try
122+
{
78123
new PosixParser().parse(options, new String[0]);
79124
fail("Expected MissingOptionException to be thrown");
80-
} catch (MissingOptionException e) {
125+
}
126+
catch (MissingOptionException e)
127+
{
81128
assertEquals("Missing required options: f, x", e.getMessage());
82129
}
83130
}
84131

85-
public void testToString() {
132+
public void testToString()
133+
{
86134
Options options = new Options();
87135
options.addOption("f", "foo", true, "Foo");
88136
options.addOption("b", "bar", false, "Bar");

0 commit comments

Comments
 (0)