This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-cli.git
The following commit(s) were added to refs/heads/master by this push:
new a122214 Replace assert by simpler but equivalent calls. (#69)
a122214 is described below
commit a1222147c2d3a99aa19776ee2dea30974d57571a
Author: Arturo Bernal <[email protected]>
AuthorDate: Thu Oct 7 03:09:50 2021 +0200
Replace assert by simpler but equivalent calls. (#69)
---
.../apache/commons/cli/ArgumentIsOptionTest.java | 11 +--
.../org/apache/commons/cli/HelpFormatterTest.java | 3 +-
.../org/apache/commons/cli/OptionBuilderTest.java | 9 ++-
.../org/apache/commons/cli/OptionGroupTest.java | 57 +++++++-------
.../java/org/apache/commons/cli/OptionTest.java | 3 +-
.../org/apache/commons/cli/ParserTestCase.java | 89 +++++++++++-----------
.../java/org/apache/commons/cli/ValuesTest.java | 4 +-
.../java/org/apache/commons/cli/bug/BugsTest.java | 3 +-
8 files changed, 93 insertions(+), 86 deletions(-)
diff --git a/src/test/java/org/apache/commons/cli/ArgumentIsOptionTest.java
b/src/test/java/org/apache/commons/cli/ArgumentIsOptionTest.java
index d613f0b..1e2c4bb 100644
--- a/src/test/java/org/apache/commons/cli/ArgumentIsOptionTest.java
+++ b/src/test/java/org/apache/commons/cli/ArgumentIsOptionTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.cli;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -42,7 +43,7 @@ public class ArgumentIsOptionTest {
final CommandLine cl = parser.parse(options, args);
assertTrue("Confirm -p is set", cl.hasOption("p"));
assertFalse("Confirm -attr is not set", cl.hasOption("attr"));
- assertTrue("Confirm all arguments recognized", cl.getArgs().length ==
0);
+ assertEquals("Confirm all arguments recognized", 0,
cl.getArgs().length);
}
@Test
@@ -52,8 +53,8 @@ public class ArgumentIsOptionTest {
final CommandLine cl = parser.parse(options, args);
assertTrue("Confirm -p is set", cl.hasOption("p"));
assertTrue("Confirm -attr is set", cl.hasOption("attr"));
- assertTrue("Confirm arg of -attr",
cl.getOptionValue("attr").equals("p"));
- assertTrue("Confirm all arguments recognized", cl.getArgs().length ==
0);
+ assertEquals("Confirm arg of -attr", "p", cl.getOptionValue("attr"));
+ assertEquals("Confirm all arguments recognized", 0,
cl.getArgs().length);
}
@Test
@@ -63,7 +64,7 @@ public class ArgumentIsOptionTest {
final CommandLine cl = parser.parse(options, args);
assertFalse("Confirm -p is set", cl.hasOption("p"));
assertTrue("Confirm -attr is set", cl.hasOption("attr"));
- assertTrue("Confirm arg of -attr",
cl.getOptionValue("attr").equals("p"));
- assertTrue("Confirm all arguments recognized", cl.getArgs().length ==
0);
+ assertEquals("Confirm arg of -attr", "p", cl.getOptionValue("attr"));
+ assertEquals("Confirm all arguments recognized", 0,
cl.getArgs().length);
}
}
diff --git a/src/test/java/org/apache/commons/cli/HelpFormatterTest.java
b/src/test/java/org/apache/commons/cli/HelpFormatterTest.java
index 6ed3d66..d391b8a 100644
--- a/src/test/java/org/apache/commons/cli/HelpFormatterTest.java
+++ b/src/test/java/org/apache/commons/cli/HelpFormatterTest.java
@@ -18,6 +18,7 @@
package org.apache.commons.cli;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import java.io.ByteArrayOutputStream;
@@ -559,7 +560,7 @@ public class HelpFormatterTest {
public void testRtrim() {
final HelpFormatter formatter = new HelpFormatter();
- assertEquals(null, formatter.rtrim(null));
+ assertNull(formatter.rtrim(null));
assertEquals("", formatter.rtrim(""));
assertEquals(" foo", formatter.rtrim(" foo "));
}
diff --git a/src/test/java/org/apache/commons/cli/OptionBuilderTest.java
b/src/test/java/org/apache/commons/cli/OptionBuilderTest.java
index d976b77..1df79dd 100644
--- a/src/test/java/org/apache/commons/cli/OptionBuilderTest.java
+++ b/src/test/java/org/apache/commons/cli/OptionBuilderTest.java
@@ -18,6 +18,7 @@
package org.apache.commons.cli;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -32,7 +33,7 @@ public class OptionBuilderTest {
assertEquals("o", base.getOpt());
assertEquals("option description", base.getDescription());
- assertTrue(!base.hasArg());
+ assertFalse(base.hasArg());
}
@Test
@@ -41,7 +42,7 @@ public class OptionBuilderTest {
assertEquals("o", base.getOpt());
assertEquals("option description", base.getDescription());
- assertTrue(!base.hasArg());
+ assertFalse(base.hasArg());
}
@Test
@@ -185,7 +186,7 @@ public class OptionBuilderTest {
assertEquals("this is a dimple option", simple.getDescription());
assertEquals(String.class, simple.getType());
assertTrue(simple.hasArg());
- assertTrue(!simple.isRequired());
- assertTrue(!simple.hasArgs());
+ assertFalse(simple.isRequired());
+ assertFalse(simple.hasArgs());
}
}
diff --git a/src/test/java/org/apache/commons/cli/OptionGroupTest.java
b/src/test/java/org/apache/commons/cli/OptionGroupTest.java
index bbfe9df..f182beb 100644
--- a/src/test/java/org/apache/commons/cli/OptionGroupTest.java
+++ b/src/test/java/org/apache/commons/cli/OptionGroupTest.java
@@ -18,6 +18,7 @@
package org.apache.commons.cli;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -77,12 +78,12 @@ public class OptionGroupTest {
final CommandLine cl = parser.parse(options, args);
- assertTrue("Confirm -r is NOT set", !cl.hasOption("r"));
- assertTrue("Confirm -f is NOT set", !cl.hasOption("f"));
- assertTrue("Confirm -d is NOT set", !cl.hasOption("d"));
- assertTrue("Confirm -s is NOT set", !cl.hasOption("s"));
- assertTrue("Confirm -c is NOT set", !cl.hasOption("c"));
- assertTrue("Confirm TWO extra args", cl.getArgList().size() == 2);
+ assertFalse("Confirm -r is NOT set", cl.hasOption("r"));
+ assertFalse("Confirm -f is NOT set", cl.hasOption("f"));
+ assertFalse("Confirm -d is NOT set", cl.hasOption("d"));
+ assertFalse("Confirm -s is NOT set", cl.hasOption("s"));
+ assertFalse("Confirm -c is NOT set", cl.hasOption("c"));
+ assertEquals("Confirm TWO extra args", 2, cl.getArgList().size());
}
@Test
@@ -91,11 +92,11 @@ public class OptionGroupTest {
final CommandLine cl = parser.parse(options, args);
- assertTrue("Confirm -r is NOT set", !cl.hasOption("r"));
+ assertFalse("Confirm -r is NOT set", cl.hasOption("r"));
assertTrue("Confirm -f is set", cl.hasOption("f"));
- assertTrue("Confirm -d is NOT set", !cl.hasOption("d"));
- assertTrue("Confirm -s is NOT set", !cl.hasOption("s"));
- assertTrue("Confirm -c is NOT set", !cl.hasOption("c"));
+ assertFalse("Confirm -d is NOT set", cl.hasOption("d"));
+ assertFalse("Confirm -s is NOT set", cl.hasOption("s"));
+ assertFalse("Confirm -c is NOT set", cl.hasOption("c"));
assertTrue("Confirm no extra args", cl.getArgList().isEmpty());
}
@@ -106,10 +107,10 @@ public class OptionGroupTest {
final CommandLine cl = parser.parse(options, args);
assertTrue("Confirm -r is set", cl.hasOption("r"));
- assertTrue("Confirm -f is NOT set", !cl.hasOption("f"));
- assertTrue("Confirm -d is NOT set", !cl.hasOption("d"));
- assertTrue("Confirm -s is NOT set", !cl.hasOption("s"));
- assertTrue("Confirm -c is NOT set", !cl.hasOption("c"));
+ assertFalse("Confirm -f is NOT set", cl.hasOption("f"));
+ assertFalse("Confirm -d is NOT set", cl.hasOption("d"));
+ assertFalse("Confirm -s is NOT set", cl.hasOption("s"));
+ assertFalse("Confirm -c is NOT set", cl.hasOption("c"));
assertTrue("Confirm no extra args", cl.getArgList().isEmpty());
}
@@ -119,11 +120,11 @@ public class OptionGroupTest {
final CommandLine cl = parser.parse(options, args);
- assertTrue("Confirm -r is NOT set", !cl.hasOption("r"));
+ assertFalse("Confirm -r is NOT set", cl.hasOption("r"));
assertTrue("Confirm -f is set", cl.hasOption("f"));
- assertTrue("Confirm -d is NOT set", !cl.hasOption("d"));
- assertTrue("Confirm -s is NOT set", !cl.hasOption("s"));
- assertTrue("Confirm -c is NOT set", !cl.hasOption("c"));
+ assertFalse("Confirm -d is NOT set", cl.hasOption("d"));
+ assertFalse("Confirm -s is NOT set", cl.hasOption("s"));
+ assertFalse("Confirm -c is NOT set", cl.hasOption("c"));
assertTrue("Confirm no extra args", cl.getArgList().isEmpty());
}
@@ -165,11 +166,11 @@ public class OptionGroupTest {
final String[] args = {"-f", "-s"};
final CommandLine cl = parser.parse(options, args);
- assertTrue("Confirm -r is NOT set", !cl.hasOption("r"));
+ assertFalse("Confirm -r is NOT set", cl.hasOption("r"));
assertTrue("Confirm -f is set", cl.hasOption("f"));
- assertTrue("Confirm -d is NOT set", !cl.hasOption("d"));
+ assertFalse("Confirm -d is NOT set", cl.hasOption("d"));
assertTrue("Confirm -s is set", cl.hasOption("s"));
- assertTrue("Confirm -c is NOT set", !cl.hasOption("c"));
+ assertFalse("Confirm -c is NOT set", cl.hasOption("c"));
assertTrue("Confirm NO extra args", cl.getArgList().isEmpty());
}
@@ -196,7 +197,7 @@ public class OptionGroupTest {
final CommandLine cl = parser.parse(options, args, properties);
assertTrue(cl.hasOption("f"));
- assertTrue(!cl.hasOption("d"));
+ assertFalse(cl.hasOption("d"));
}
@Test
@@ -207,9 +208,9 @@ public class OptionGroupTest {
assertTrue("Confirm -r is set", cl.hasOption("r"));
assertTrue("Confirm -f is set", cl.hasOption("f"));
- assertTrue("Confirm -d is NOT set", !cl.hasOption("d"));
- assertTrue("Confirm -s is NOT set", !cl.hasOption("s"));
- assertTrue("Confirm -c is NOT set", !cl.hasOption("c"));
+ assertFalse("Confirm -d is NOT set", cl.hasOption("d"));
+ assertFalse("Confirm -s is NOT set", cl.hasOption("s"));
+ assertFalse("Confirm -c is NOT set", cl.hasOption("c"));
assertTrue("Confirm no extra args", cl.getArgList().isEmpty());
}
@@ -221,9 +222,9 @@ public class OptionGroupTest {
assertTrue("Confirm -r is set", cl.hasOption("r"));
assertTrue("Confirm -f is set", cl.hasOption("f"));
- assertTrue("Confirm -d is NOT set", !cl.hasOption("d"));
- assertTrue("Confirm -s is NOT set", !cl.hasOption("s"));
- assertTrue("Confirm -c is NOT set", !cl.hasOption("c"));
+ assertFalse("Confirm -d is NOT set", cl.hasOption("d"));
+ assertFalse("Confirm -s is NOT set", cl.hasOption("s"));
+ assertFalse("Confirm -c is NOT set", cl.hasOption("c"));
assertTrue("Confirm no extra args", cl.getArgList().isEmpty());
}
diff --git a/src/test/java/org/apache/commons/cli/OptionTest.java
b/src/test/java/org/apache/commons/cli/OptionTest.java
index 839cd39..286aa3a 100644
--- a/src/test/java/org/apache/commons/cli/OptionTest.java
+++ b/src/test/java/org/apache/commons/cli/OptionTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -143,7 +144,7 @@ public class OptionTest {
option.setArgs(Option.UNLIMITED_VALUES);
assertEquals("default", option.getValue("default"));
- assertEquals(null, option.getValue(0));
+ assertNull(option.getValue(0));
option.addValueForProcessing("foo");
diff --git a/src/test/java/org/apache/commons/cli/ParserTestCase.java
b/src/test/java/org/apache/commons/cli/ParserTestCase.java
index b85adcd..f74b651 100644
--- a/src/test/java/org/apache/commons/cli/ParserTestCase.java
+++ b/src/test/java/org/apache/commons/cli/ParserTestCase.java
@@ -17,6 +17,7 @@
package org.apache.commons.cli;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -179,8 +180,8 @@ public abstract class ParserTestCase {
assertTrue("Confirm -a is set", cl.hasOption("a"));
assertTrue("Confirm -b is set", cl.hasOption("b"));
assertTrue("Confirm -c is set", cl.hasOption("c"));
- assertTrue("Confirm arg of -b",
cl.getOptionValue("b").equals("toast"));
- assertTrue("Confirm size of extra args", cl.getArgList().size() == 2);
+ assertEquals("Confirm arg of -b", "toast", cl.getOptionValue("b"));
+ assertEquals("Confirm size of extra args", 2, cl.getArgList().size());
}
@Test
@@ -190,8 +191,8 @@ public abstract class ParserTestCase {
final CommandLine cl = parser.parse(options, args);
assertTrue("Confirm -c is set", cl.hasOption("c"));
- assertTrue("Confirm -b is not set", !cl.hasOption("b"));
- assertTrue("Confirm 2 extra args: " + cl.getArgList().size(),
cl.getArgList().size() == 2);
+ assertFalse("Confirm -b is not set", cl.hasOption("b"));
+ assertEquals("Confirm 2 extra args: " + cl.getArgList().size(), 2,
cl.getArgList().size());
}
@Test
@@ -391,15 +392,15 @@ public abstract class ParserTestCase {
CommandLine cl = parser.parse(options, args, true);
assertTrue("Confirm -c is set", cl.hasOption("c"));
- assertTrue("Confirm 3 extra args: " + cl.getArgList().size(),
cl.getArgList().size() == 3);
+ assertEquals("Confirm 3 extra args: " + cl.getArgList().size(), 3,
cl.getArgList().size());
cl = parser.parse(options, cl.getArgs());
- assertTrue("Confirm -c is not set", !cl.hasOption("c"));
+ assertFalse("Confirm -c is not set", cl.hasOption("c"));
assertTrue("Confirm -b is set", cl.hasOption("b"));
- assertTrue("Confirm arg of -b",
cl.getOptionValue("b").equals("toast"));
- assertTrue("Confirm 1 extra arg: " + cl.getArgList().size(),
cl.getArgList().size() == 1);
- assertTrue("Confirm value of extra arg: " + cl.getArgList().get(0),
cl.getArgList().get(0).equals("foobar"));
+ assertEquals("Confirm arg of -b", "toast", cl.getOptionValue("b"));
+ assertEquals("Confirm 1 extra arg: " + cl.getArgList().size(), 1,
cl.getArgList().size());
+ assertEquals("Confirm value of extra arg: " + cl.getArgList().get(0),
"foobar", cl.getArgList().get(0));
}
@Test
@@ -408,15 +409,15 @@ public abstract class ParserTestCase {
CommandLine cl = parser.parse(options, args, true);
assertTrue("Confirm -c is set", cl.hasOption("c"));
- assertTrue("Confirm 3 extra args: " + cl.getArgList().size(),
cl.getArgList().size() == 3);
+ assertEquals("Confirm 3 extra args: " + cl.getArgList().size(), 3,
cl.getArgList().size());
cl = parser.parse(options, cl.getArgs());
- assertTrue("Confirm -c is not set", !cl.hasOption("c"));
+ assertFalse("Confirm -c is not set", cl.hasOption("c"));
assertTrue("Confirm -b is set", cl.hasOption("b"));
- assertTrue("Confirm arg of -b",
cl.getOptionValue("b").equals("toast"));
- assertTrue("Confirm 1 extra arg: " + cl.getArgList().size(),
cl.getArgList().size() == 1);
- assertTrue("Confirm value of extra arg: " + cl.getArgList().get(0),
cl.getArgList().get(0).equals("foobar"));
+ assertEquals("Confirm arg of -b", "toast", cl.getOptionValue("b"));
+ assertEquals("Confirm 1 extra arg: " + cl.getArgList().size(), 1,
cl.getArgList().size());
+ assertEquals("Confirm value of extra arg: " + cl.getArgList().get(0),
"foobar", cl.getArgList().get(0));
}
@Test
@@ -449,7 +450,7 @@ public abstract class ParserTestCase {
assertTrue("Confirm -a is set", cl.hasOption("a"));
assertTrue("Confirm -b is set", cl.hasOption("b"));
- assertTrue("Confirm arg of -b", cl.getOptionValue("b").equals("file"));
+ assertEquals("Confirm arg of -b", "file", cl.getOptionValue("b"));
assertTrue("Confirm NO of extra args", cl.getArgList().isEmpty());
}
@@ -493,7 +494,7 @@ public abstract class ParserTestCase {
final CommandLine cl = parser.parse(options, args);
assertTrue("Confirm --version is set", cl.hasOption("version"));
- assertTrue("Confirm -v is not set", !cl.hasOption("v"));
+ assertFalse("Confirm -v is not set", cl.hasOption("v"));
}
@Test
@@ -560,8 +561,8 @@ public abstract class ParserTestCase {
properties.setProperty("e", "0");
cmd = parse(parser, opts, null, properties);
- assertTrue(!cmd.hasOption("a"));
- assertTrue(!cmd.hasOption("c"));
+ assertFalse(cmd.hasOption("a"));
+ assertFalse(cmd.hasOption("c"));
assertTrue(cmd.hasOption("e")); // this option accepts an argument
properties = new Properties();
@@ -571,7 +572,7 @@ public abstract class ParserTestCase {
cmd = parse(parser, opts, null, properties);
assertTrue(cmd.hasOption("a"));
- assertTrue(!cmd.hasOption("c"));
+ assertFalse(cmd.hasOption("c"));
assertTrue(cmd.hasOption("e"));
properties = new Properties();
@@ -579,8 +580,8 @@ public abstract class ParserTestCase {
properties.setProperty("e", "");
cmd = parse(parser, opts, null, properties);
- assertTrue(!cmd.hasOption("a"));
- assertTrue(!cmd.hasOption("c"));
+ assertFalse(cmd.hasOption("a"));
+ assertFalse(cmd.hasOption("c"));
assertTrue(cmd.hasOption("e"));
properties = new Properties();
@@ -588,7 +589,7 @@ public abstract class ParserTestCase {
properties.setProperty("c", "1");
cmd = parse(parser, opts, null, properties);
- assertTrue(!cmd.hasOption("a"));
+ assertFalse(cmd.hasOption("a"));
assertTrue(cmd.hasOption("c"));
}
@@ -632,7 +633,7 @@ public abstract class ParserTestCase {
final CommandLine cmd = parse(parser, opts, null, properties);
assertTrue(cmd.hasOption("k"));
- assertTrue(Arrays.equals(values, cmd.getOptionValues('k')));
+ assertArrayEquals(values, cmd.getOptionValues('k'));
}
@Test
@@ -658,7 +659,7 @@ public abstract class ParserTestCase {
final CommandLine cmd = parse(parser, opts, null, properties);
assertTrue(cmd.hasOption("hide"));
assertEquals("seek", cmd.getOptionValue("hide"));
- assertTrue(!cmd.hasOption("fake"));
+ assertFalse(cmd.hasOption("fake"));
}
@Test
@@ -692,7 +693,7 @@ public abstract class ParserTestCase {
assertEquals("found", cmd.getOptionValue("j"));
assertTrue(cmd.hasOption("i"));
assertEquals("ink", cmd.getOptionValue("i"));
- assertTrue(!cmd.hasOption("fake"));
+ assertFalse(cmd.hasOption("fake"));
}
@Test
@@ -761,9 +762,9 @@ public abstract class ParserTestCase {
assertTrue("Confirm -a is set", cl.hasOption("a"));
assertTrue("Confirm -b is set", cl.hasOption("b"));
- assertTrue("Confirm arg of -b",
cl.getOptionValue("b").equals("toast"));
- assertTrue("Confirm arg of --bfile",
cl.getOptionValue("bfile").equals("toast"));
- assertTrue("Confirm size of extra args", cl.getArgList().size() == 2);
+ assertEquals("Confirm arg of -b", "toast", cl.getOptionValue("b"));
+ assertEquals("Confirm arg of --bfile", "toast",
cl.getOptionValue("bfile"));
+ assertEquals("Confirm size of extra args", 2, cl.getArgList().size());
}
@Test
@@ -774,8 +775,8 @@ public abstract class ParserTestCase {
assertTrue("Confirm -a is set", cl.hasOption("a"));
assertTrue("Confirm -b is set", cl.hasOption("b"));
- assertTrue("Confirm arg of -b",
cl.getOptionValue("b").equals("toast"));
- assertTrue("Confirm size of extra args", cl.getArgList().size() == 2);
+ assertEquals("Confirm arg of -b", "toast", cl.getOptionValue("b"));
+ assertEquals("Confirm size of extra args", 2, cl.getArgList().size());
}
@Test
@@ -786,9 +787,9 @@ public abstract class ParserTestCase {
assertTrue("Confirm -a is set", cl.hasOption("a"));
assertTrue("Confirm -b is set", cl.hasOption("b"));
- assertTrue("Confirm arg of -b", cl.getOptionValue("b").equals("-"));
- assertTrue("Confirm 1 extra arg: " + cl.getArgList().size(),
cl.getArgList().size() == 1);
- assertTrue("Confirm value of extra arg: " + cl.getArgList().get(0),
cl.getArgList().get(0).equals("-"));
+ assertEquals("Confirm arg of -b", "-", cl.getOptionValue("b"));
+ assertEquals("Confirm 1 extra arg: " + cl.getArgList().size(), 1,
cl.getArgList().size());
+ assertEquals("Confirm value of extra arg: " + cl.getArgList().get(0),
"-", cl.getArgList().get(0));
}
@Test
@@ -810,7 +811,7 @@ public abstract class ParserTestCase {
assertFalse("Confirm -a is not set", cl.hasOption("a"));
assertFalse("Confirm -b is not set", cl.hasOption("b"));
- assertTrue("Confirm 3 extra args: " + cl.getArgList().size(),
cl.getArgList().size() == 3);
+ assertEquals("Confirm 3 extra args: " + cl.getArgList().size(), 3,
cl.getArgList().size());
}
@Test
@@ -819,7 +820,7 @@ public abstract class ParserTestCase {
final CommandLine cl = parser.parse(options, args, true);
assertFalse("Confirm -a is not set", cl.hasOption("a"));
- assertTrue("Confirm 3 extra args: " + cl.getArgList().size(),
cl.getArgList().size() == 3);
+ assertEquals("Confirm 3 extra args: " + cl.getArgList().size(), 3,
cl.getArgList().size());
}
@Test
@@ -828,7 +829,7 @@ public abstract class ParserTestCase {
final CommandLine cl = parser.parse(options, args, true);
assertTrue("Confirm -c is set", cl.hasOption("c"));
- assertTrue("Confirm 3 extra args: " + cl.getArgList().size(),
cl.getArgList().size() == 3);
+ assertEquals("Confirm 3 extra args: " + cl.getArgList().size(), 3,
cl.getArgList().size());
}
@Test
@@ -839,7 +840,7 @@ public abstract class ParserTestCase {
assertTrue("Confirm -a is set", cl.hasOption("a"));
assertFalse("Confirm -c is not set", cl.hasOption("c"));
- assertTrue("Confirm 1 extra arg: " + cl.getArgList().size(),
cl.getArgList().size() == 1);
+ assertEquals("Confirm 1 extra arg: " + cl.getArgList().size(), 1,
cl.getArgList().size());
assertTrue(cl.getArgList().contains("zc"));
}
@@ -849,15 +850,15 @@ public abstract class ParserTestCase {
CommandLine cl = parser.parse(options, args, true);
assertTrue("Confirm -c is set", cl.hasOption("c"));
- assertTrue("Confirm 2 extra args: " + cl.getArgList().size(),
cl.getArgList().size() == 2);
+ assertEquals("Confirm 2 extra args: " + cl.getArgList().size(), 2,
cl.getArgList().size());
cl = parser.parse(options, cl.getArgs());
- assertTrue("Confirm -c is not set", !cl.hasOption("c"));
+ assertFalse("Confirm -c is not set", cl.hasOption("c"));
assertTrue("Confirm -b is set", cl.hasOption("b"));
- assertTrue("Confirm arg of -b",
cl.getOptionValue("b").equals("toast"));
- assertTrue("Confirm 1 extra arg: " + cl.getArgList().size(),
cl.getArgList().size() == 1);
- assertTrue("Confirm value of extra arg: " + cl.getArgList().get(0),
cl.getArgList().get(0).equals("foobar"));
+ assertEquals("Confirm arg of -b", "toast", cl.getOptionValue("b"));
+ assertEquals("Confirm 1 extra arg: " + cl.getArgList().size(), 1,
cl.getArgList().size());
+ assertEquals("Confirm value of extra arg: " + cl.getArgList().get(0),
"foobar", cl.getArgList().get(0));
}
@Test
@@ -964,9 +965,9 @@ public abstract class ParserTestCase {
final CommandLine cl = parser.parse(options, args);
- assertTrue("Confirm -a is NOT set", !cl.hasOption("a"));
+ assertFalse("Confirm -a is NOT set", cl.hasOption("a"));
assertTrue("Confirm -b is set", cl.hasOption("b"));
- assertTrue("Confirm arg of -b", cl.getOptionValue("b").equals("file"));
+ assertEquals("Confirm arg of -b", "file", cl.getOptionValue("b"));
assertTrue("Confirm NO of extra args", cl.getArgList().isEmpty());
}
}
diff --git a/src/test/java/org/apache/commons/cli/ValuesTest.java
b/src/test/java/org/apache/commons/cli/ValuesTest.java
index 548f1f0..2e0928b 100644
--- a/src/test/java/org/apache/commons/cli/ValuesTest.java
+++ b/src/test/java/org/apache/commons/cli/ValuesTest.java
@@ -121,11 +121,11 @@ public class ValuesTest {
@Test
public void testShortArgsWithValue() {
assertTrue("Option b is not set", cmd.hasOption("b"));
- assertTrue(cmd.getOptionValue("b").equals("foo"));
+ assertEquals("foo", cmd.getOptionValue("b"));
assertEquals(1, cmd.getOptionValues("b").length);
assertTrue("Option d is not set", cmd.hasOption("d"));
- assertTrue(cmd.getOptionValue("d").equals("bar"));
+ assertEquals("bar", cmd.getOptionValue("d"));
assertEquals(1, cmd.getOptionValues("d").length);
}
diff --git a/src/test/java/org/apache/commons/cli/bug/BugsTest.java
b/src/test/java/org/apache/commons/cli/bug/BugsTest.java
index 983c535..2eb6ea7 100644
--- a/src/test/java/org/apache/commons/cli/bug/BugsTest.java
+++ b/src/test/java/org/apache/commons/cli/bug/BugsTest.java
@@ -18,6 +18,7 @@
package org.apache.commons.cli.bug;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -316,7 +317,7 @@ public class BugsTest {
options.addOption("c", "conflict", true, "conflict option");
final CommandLine line = parser.parse(options, cliArgs);
assertEquals(line.getOptionValue('z'), "c");
- assertTrue(!line.hasOption("c"));
+ assertFalse(line.hasOption("c"));
}
@Test
