More tests

Author: garydgregory

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

@@ -35,6 +35,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
  * Abstract test case testing common parser features.
+ *
+ * TODO Needs a rework using JUnit parameterized tests.
  */
 public abstract class AbstractParserTestCase {
 
@@ -499,6 +501,9 @@ public void testOptionalArgsOptionDotBuilder() throws Exception {
         assertTrue(cmd.hasOption("i"));
         assertArrayEquals(new String[] { "paper", "scissors" }, cmd.getOptionValues("i"));
         assertArrayEquals(new String[] { "rock" }, cmd.getArgs());
+
+        options.addOption(Option.builder("j").numberOfArgs(3).optionalArg(true).build());
+        cmd = parse(parser, options, new String[] { "-j" }, properties);
     }
 
     @Test

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

@@ -21,6 +21,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+/**
+ * TODO Needs a rework using JUnit parameterized tests.
+ */
 @SuppressWarnings("deprecation") // tests some deprecated classes
 public class BasicParserTest extends AbstractParserTestCase {
     @Override

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

@@ -69,29 +69,29 @@ public void testBuilderNullOption() {
     }
 
     @Test
-    public void testDeprecatedOption() {
+    public void testDeprecatedDefaultOption() {
         final CommandLine.Builder builder = new CommandLine.Builder();
         builder.addArg("foo").addArg("bar");
         final Option opt = Option.builder().option("T").deprecated().build();
         builder.addOption(opt);
         final AtomicReference<Option> handler = new AtomicReference<>();
-        final CommandLine cmd = builder.setDeprecatedHandler(handler::set).build();
+        final CommandLine cmd = builder.build();
         cmd.getOptionValue(opt.getOpt());
-        assertSame(opt, handler.get());
         handler.set(null);
         cmd.getOptionValue("Nope");
         assertNull(handler.get());
     }
 
     @Test
-    public void testDeprecatedDefaultOption() {
+    public void testDeprecatedOption() {
         final CommandLine.Builder builder = new CommandLine.Builder();
         builder.addArg("foo").addArg("bar");
         final Option opt = Option.builder().option("T").deprecated().build();
         builder.addOption(opt);
         final AtomicReference<Option> handler = new AtomicReference<>();
-        final CommandLine cmd = builder.build();
+        final CommandLine cmd = builder.setDeprecatedHandler(handler::set).build();
         cmd.getOptionValue(opt.getOpt());
+        assertSame(opt, handler.get());
         handler.set(null);
         cmd.getOptionValue("Nope");
         assertNull(handler.get());

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

@@ -27,6 +27,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+/**
+ * TODO Needs a rework using JUnit parameterized tests.
+ */
 public class DefaultParserTest extends AbstractParserTestCase {
 
     @Override

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

@@ -21,6 +21,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+/**
+ * TODO Needs a rework using JUnit parameterized tests.
+ */
 @SuppressWarnings("deprecation") // tests some deprecated classes
 public class GnuParserTest extends AbstractParserTestCase {
     @Override

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

@@ -23,6 +23,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
  * Test case for the PosixParser.
+ *
+ * TODO Needs a rework using JUnit parameterized tests.
  */
 public class PosixParserTest extends AbstractParserTestCase {
     @Override

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

@@ -186,13 +186,6 @@ public void testCreateFile() {
         assertEquals(file, TypeHandler.createFile(file.toString()));
     }
 
-    @Test
-    public void testOpenFile() throws ParseException, IOException {
-        try (FileInputStream fis = TypeHandler.openFile("src/test/resources/org/apache/commons/cli/existing-readable.file")) {
-            IOUtils.consume(fis);
-        }
-    }
-
     @Test
     public void testCreateFiles() {
         assertThrows(UnsupportedOperationException.class, () -> TypeHandler.createFiles(null));
@@ -220,7 +213,7 @@ public void testCreateURL() throws ParseException, MalformedURLException {
     @MethodSource("createValueTestParameters")
     public void testCreateValue(final String str, final Class<?> type, final Object expected) throws Exception {
         @SuppressWarnings("cast")
-        final Object objectApiTest = (Object) type; // KEEP this cast
+        final Object objectApiTest = type; // KEEP this cast
         if (expected instanceof Class<?> && Throwable.class.isAssignableFrom((Class<?>) expected)) {
             assertThrows((Class<Throwable>) expected, () -> TypeHandler.createValue(str, type));
             assertThrows((Class<Throwable>) expected, () -> TypeHandler.createValue(str, objectApiTest));
@@ -244,6 +237,13 @@ public void testnstantiableEquals() {
         assertEquals(new Instantiable(), new Instantiable());
     }
 
+    @Test
+    public void testOpenFile() throws ParseException, IOException {
+        try (FileInputStream fis = TypeHandler.openFile("src/test/resources/org/apache/commons/cli/existing-readable.file")) {
+            IOUtils.consume(fis);
+        }
+    }
+
     @Test
     public void testRegister() {
         final Map<Class<?>, Converter<?, ? extends Throwable>> map = TypeHandler.createDefaultMap();