You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/02/27 02:10:09 UTC

(commons-cli) 02/05: Sort members

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

commit 4d0f3d55891b6dff0f304c76885a0370d23650dc
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Feb 26 21:06:27 2024 -0500

    Sort members
---
 .../java/org/apache/commons/cli/CommandLine.java   |  92 ++++++-------
 .../org/apache/commons/cli/OptionValidator.java    |  30 ++---
 src/main/java/org/apache/commons/cli/Options.java  |  38 +++---
 .../org/apache/commons/cli/ParseException.java     |  16 +--
 .../apache/commons/cli/AbstractParserTestCase.java |  96 ++++++-------
 .../org/apache/commons/cli/CommandLineTest.java    |  56 ++++----
 .../apache/commons/cli/OptionValidatorTest.java    |  74 +++++------
 .../java/org/apache/commons/cli/OptionsTest.java   | 148 ++++++++++-----------
 .../org/apache/commons/cli/bug/BugCLI312Test.java  |  22 +--
 9 files changed, 286 insertions(+), 286 deletions(-)

diff --git a/src/main/java/org/apache/commons/cli/CommandLine.java b/src/main/java/org/apache/commons/cli/CommandLine.java
index c736c64..bb553b3 100644
--- a/src/main/java/org/apache/commons/cli/CommandLine.java
+++ b/src/main/java/org/apache/commons/cli/CommandLine.java
@@ -170,23 +170,6 @@ public class CommandLine implements Serializable {
         }
     }
 
-    /**
-     * Parses a list of values as properties.  All odd numbered values are property keys
-     * and even numbered values are property values.  If there are an odd number of values
-     * the last value is assumed to be a boolean with a value of "true".
-     * @param props the properties to update.
-     * @param values the list of values to parse.
-     */
-    private void processPropertiesFromValues(final Properties props, final List<String> values) {
-        for (int i = 0; i < values.size(); i += 2) {
-            if (i + 1 < values.size()) {
-                props.put(values.get(i), values.get(i + 1));
-            } else {
-                props.put(values.get(i), "true");
-            }
-        }
-    }
-
     /**
      * Gets the map of values associated to the option. This is convenient for options specifying Java properties like
      * <code>-Dparam1=value1
@@ -345,7 +328,6 @@ public class CommandLine implements Serializable {
         return getOptionValue(resolveOption(opt), defaultValue);
     }
 
-
     /**
      * Gets the array of values, if any, of an option.
      *
@@ -356,6 +338,7 @@ public class CommandLine implements Serializable {
         return getOptionValues(String.valueOf(opt));
     }
 
+
     /**
      * Gets the array of values, if any, of an option.
      *
@@ -410,7 +393,7 @@ public class CommandLine implements Serializable {
      * @see PatternOptionBuilder
      * @since 1.7.0
      */
-    public <T> T getParsedOptionValue(final char opt, final T defaultValue) throws ParseException {
+    public <T> T getParsedOptionValue(final char opt, final Supplier<T> defaultValue) throws ParseException {
         return getParsedOptionValue(String.valueOf(opt), defaultValue);
     }
 
@@ -425,7 +408,7 @@ public class CommandLine implements Serializable {
      * @see PatternOptionBuilder
      * @since 1.7.0
      */
-    public <T> T getParsedOptionValue(final char opt, final Supplier<T> defaultValue) throws ParseException {
+    public <T> T getParsedOptionValue(final char opt, final T defaultValue) throws ParseException {
         return getParsedOptionValue(String.valueOf(opt), defaultValue);
     }
 
@@ -454,8 +437,18 @@ public class CommandLine implements Serializable {
      * @see PatternOptionBuilder
      * @since 1.7.0
      */
-    public <T> T getParsedOptionValue(final Option option, final T defaultValue) throws ParseException {
-        return getParsedOptionValue(option, () -> defaultValue);
+    @SuppressWarnings("unchecked")
+    public <T> T getParsedOptionValue(final Option option, final Supplier<T> defaultValue) throws ParseException {
+        final String res = option == null ? null : getOptionValue(option);
+
+        try {
+            if (res == null) {
+                return defaultValue == null ? null : defaultValue.get();
+            }
+            return (T) option.getConverter().apply(res);
+        } catch (final Throwable e) {
+            throw ParseException.wrap(e);
+        }
     }
 
     /**
@@ -469,18 +462,8 @@ public class CommandLine implements Serializable {
      * @see PatternOptionBuilder
      * @since 1.7.0
      */
-    @SuppressWarnings("unchecked")
-    public <T> T getParsedOptionValue(final Option option, final Supplier<T> defaultValue) throws ParseException {
-        final String res = option == null ? null : getOptionValue(option);
-
-        try {
-            if (res == null) {
-                return defaultValue == null ? null : defaultValue.get();
-            }
-            return (T) option.getConverter().apply(res);
-        } catch (final Throwable e) {
-            throw ParseException.wrap(e);
-        }
+    public <T> T getParsedOptionValue(final Option option, final T defaultValue) throws ParseException {
+        return getParsedOptionValue(option, () -> defaultValue);
     }
 
     /**
@@ -508,7 +491,7 @@ public class CommandLine implements Serializable {
      * @see PatternOptionBuilder
      * @since 1.7.0
      */
-    public <T> T getParsedOptionValue(final String opt, final T defaultValue) throws ParseException {
+    public <T> T getParsedOptionValue(final String opt, final Supplier<T> defaultValue) throws ParseException {
         return getParsedOptionValue(resolveOption(opt), defaultValue);
     }
 
@@ -523,10 +506,20 @@ public class CommandLine implements Serializable {
      * @see PatternOptionBuilder
      * @since 1.7.0
      */
-    public <T> T getParsedOptionValue(final String opt, final Supplier<T> defaultValue) throws ParseException {
+    public <T> T getParsedOptionValue(final String opt, final T defaultValue) throws ParseException {
         return getParsedOptionValue(resolveOption(opt), defaultValue);
     }
 
+    /**
+     * Tests to see if an option has been set.
+     *
+     * @param opt character name of the option.
+     * @return true if set, false if not.
+     */
+    public boolean hasOption(final char opt) {
+        return hasOption(String.valueOf(opt));
+    }
+
     /**
      * jkeyes - commented out until it is implemented properly
      * <p>
@@ -545,16 +538,6 @@ public class CommandLine implements Serializable {
      * return buf.toString(); }
      */
 
-    /**
-     * Tests to see if an option has been set.
-     *
-     * @param opt character name of the option.
-     * @return true if set, false if not.
-     */
-    public boolean hasOption(final char opt) {
-        return hasOption(String.valueOf(opt));
-    }
-
     /**
      * Tests to see if an option has been set.
      *
@@ -585,6 +568,23 @@ public class CommandLine implements Serializable {
         return options.iterator();
     }
 
+    /**
+     * Parses a list of values as properties.  All odd numbered values are property keys
+     * and even numbered values are property values.  If there are an odd number of values
+     * the last value is assumed to be a boolean with a value of "true".
+     * @param props the properties to update.
+     * @param values the list of values to parse.
+     */
+    private void processPropertiesFromValues(final Properties props, final List<String> values) {
+        for (int i = 0; i < values.size(); i += 2) {
+            if (i + 1 < values.size()) {
+                props.put(values.get(i), values.get(i + 1));
+            } else {
+                props.put(values.get(i), "true");
+            }
+        }
+    }
+
     /**
      * Retrieves the option object given the long or short option as a String
      *
diff --git a/src/main/java/org/apache/commons/cli/OptionValidator.java b/src/main/java/org/apache/commons/cli/OptionValidator.java
index 110ffdc..b85f76b 100644
--- a/src/main/java/org/apache/commons/cli/OptionValidator.java
+++ b/src/main/java/org/apache/commons/cli/OptionValidator.java
@@ -29,21 +29,6 @@ final class OptionValidator {
     /** The array of additional characters allowed in the rest of the option but not in the first position */
     static final char[] ADDITIONAL_LONG_CHARS = {'-'};
 
-    /**
-     * Checks the char array for a matching char.
-     * @param chars the char array to search
-     * @param c the char to look for.
-     * @return {@code true} if {@code c} was in {@code ary}, {@code false} otherwise.
-     */
-    private static boolean search(final char[] chars, final char c) {
-        for (char a : chars) {
-            if (a == c) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     /**
      * Returns whether the specified character is a valid character.
      * A character is valid if any of the following conditions are true:
@@ -86,6 +71,21 @@ final class OptionValidator {
         return Character.isJavaIdentifierPart(c) || search(ADDITIONAL_OPTION_CHARS, c);
     }
 
+    /**
+     * Checks the char array for a matching char.
+     * @param chars the char array to search
+     * @param c the char to look for.
+     * @return {@code true} if {@code c} was in {@code ary}, {@code false} otherwise.
+     */
+    private static boolean search(final char[] chars, final char c) {
+        for (char a : chars) {
+            if (a == c) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Validates whether {@code opt} is a permissible Option shortOpt. The rules that specify if the {@code opt}
      * is valid are:
diff --git a/src/main/java/org/apache/commons/cli/Options.java b/src/main/java/org/apache/commons/cli/Options.java
index 6fff20b..f886e7b 100644
--- a/src/main/java/org/apache/commons/cli/Options.java
+++ b/src/main/java/org/apache/commons/cli/Options.java
@@ -54,25 +54,6 @@ public class Options implements Serializable {
     /** A map of the option groups */
     private final Map<String, OptionGroup> optionGroups = new LinkedHashMap<>();
 
-    /**
-     * Adds options to this option.  If any Option in {@code options} already exists
-     * in this Options an IllegalArgumentException is thrown
-     *
-     * @param options the options to add.
-     * @return The resulting Options instance.
-     * @since 1.7.0
-     */
-    public Options addOptions(final Options options) {
-        for (Option opt : options.getOptions()) {
-            if (hasOption(opt.getKey())) {
-                throw new IllegalArgumentException("Duplicate key: " + opt.getKey());
-            }
-            addOption(opt);
-        }
-        options.getOptionGroups().forEach(this::addOptionGroup);
-        return this;
-    }
-
     /**
      * Adds an option instance
      *
@@ -169,6 +150,25 @@ public class Options implements Serializable {
         return this;
     }
 
+    /**
+     * Adds options to this option.  If any Option in {@code options} already exists
+     * in this Options an IllegalArgumentException is thrown
+     *
+     * @param options the options to add.
+     * @return The resulting Options instance.
+     * @since 1.7.0
+     */
+    public Options addOptions(final Options options) {
+        for (Option opt : options.getOptions()) {
+            if (hasOption(opt.getKey())) {
+                throw new IllegalArgumentException("Duplicate key: " + opt.getKey());
+            }
+            addOption(opt);
+        }
+        options.getOptionGroups().forEach(this::addOptionGroup);
+        return this;
+    }
+
     /**
      * Add an option that contains a short-name and a long-name.
      *
diff --git a/src/main/java/org/apache/commons/cli/ParseException.java b/src/main/java/org/apache/commons/cli/ParseException.java
index 25e4596..2af1614 100644
--- a/src/main/java/org/apache/commons/cli/ParseException.java
+++ b/src/main/java/org/apache/commons/cli/ParseException.java
@@ -49,14 +49,6 @@ public class ParseException extends Exception {
         }
         return new ParseException(e);
     }
-    /**
-     * Constructs a new {@code ParseException} wrapping the specified exception.
-     * @param e the Exception to wrap.
-     */
-    public ParseException(final Throwable e) {
-        super(e);
-    }
-
     /**
      * Constructs a new {@code ParseException} with the specified detail message.
      *
@@ -65,4 +57,12 @@ public class ParseException extends Exception {
     public ParseException(final String message) {
         super(message);
     }
+
+    /**
+     * Constructs a new {@code ParseException} wrapping the specified exception.
+     * @param e the Exception to wrap.
+     */
+    public ParseException(final Throwable e) {
+        super(e);
+    }
 }
diff --git a/src/test/java/org/apache/commons/cli/AbstractParserTestCase.java b/src/test/java/org/apache/commons/cli/AbstractParserTestCase.java
index 2965787..69b1646 100644
--- a/src/test/java/org/apache/commons/cli/AbstractParserTestCase.java
+++ b/src/test/java/org/apache/commons/cli/AbstractParserTestCase.java
@@ -480,6 +480,54 @@ public abstract class AbstractParserTestCase {
         assertEquals("-1", cl.getOptionValue("b"));
     }
 
+    @Test
+    public void testOptionalArgsOptionBuilder() throws Exception {
+        final Options opts = new Options();
+        opts.addOption(OptionBuilder.hasOptionalArgs(2).create('i'));
+        final Properties properties = new Properties();
+
+        CommandLine cmd = parse(parser, opts, new String[]{"-i"}, properties);
+        assertTrue(cmd.hasOption("i"));
+        assertNull(null, cmd.getOptionValues("i"));
+
+        cmd = parse(parser, opts, new String[]{"-i", "paper"}, properties);
+        assertTrue(cmd.hasOption("i"));
+        assertArrayEquals(new String[]{"paper"}, cmd.getOptionValues("i"));
+
+        cmd = parse(parser, opts, new String[]{"-i", "paper", "scissors"}, properties);
+        assertTrue(cmd.hasOption("i"));
+        assertArrayEquals(new String[]{"paper", "scissors"}, cmd.getOptionValues("i"));
+
+        cmd = parse(parser, opts, new String[]{"-i", "paper", "scissors", "rock"}, properties);
+        assertTrue(cmd.hasOption("i"));
+        assertArrayEquals(new String[]{"paper", "scissors"}, cmd.getOptionValues("i"));
+        assertArrayEquals(new String[]{"rock"}, cmd.getArgs());
+    }
+
+    @Test
+    public void testOptionalArgsOptionDotBuilder() throws Exception {
+        final Options opts = new Options();
+        opts.addOption(Option.builder("i").numberOfArgs(2).optionalArg(true).build());
+        final Properties properties = new Properties();
+
+        CommandLine cmd = parse(parser, opts, new String[]{"-i"}, properties);
+        assertTrue(cmd.hasOption("i"));
+        assertNull(null, cmd.getOptionValues("i"));
+
+        cmd = parse(parser, opts, new String[]{"-i", "paper"}, properties);
+        assertTrue(cmd.hasOption("i"));
+        assertArrayEquals(new String[]{"paper"}, cmd.getOptionValues("i"));
+
+        cmd = parse(parser, opts, new String[]{"-i", "paper", "scissors"}, properties);
+        assertTrue(cmd.hasOption("i"));
+        assertArrayEquals(new String[]{"paper", "scissors"}, cmd.getOptionValues("i"));
+
+        cmd = parse(parser, opts, new String[]{"-i", "paper", "scissors", "rock"}, properties);
+        assertTrue(cmd.hasOption("i"));
+        assertArrayEquals(new String[]{"paper", "scissors"}, cmd.getOptionValues("i"));
+        assertArrayEquals(new String[]{"rock"}, cmd.getArgs());
+    }
+
     @Test
     public void testOptionAndRequiredOption() throws Exception {
         final String[] args = {"-a", "-b", "file"};
@@ -738,54 +786,6 @@ public abstract class AbstractParserTestCase {
         assertFalse(cmd.hasOption("fake"));
     }
 
-    @Test
-    public void testOptionalArgsOptionBuilder() throws Exception {
-        final Options opts = new Options();
-        opts.addOption(OptionBuilder.hasOptionalArgs(2).create('i'));
-        final Properties properties = new Properties();
-
-        CommandLine cmd = parse(parser, opts, new String[]{"-i"}, properties);
-        assertTrue(cmd.hasOption("i"));
-        assertNull(null, cmd.getOptionValues("i"));
-
-        cmd = parse(parser, opts, new String[]{"-i", "paper"}, properties);
-        assertTrue(cmd.hasOption("i"));
-        assertArrayEquals(new String[]{"paper"}, cmd.getOptionValues("i"));
-
-        cmd = parse(parser, opts, new String[]{"-i", "paper", "scissors"}, properties);
-        assertTrue(cmd.hasOption("i"));
-        assertArrayEquals(new String[]{"paper", "scissors"}, cmd.getOptionValues("i"));
-
-        cmd = parse(parser, opts, new String[]{"-i", "paper", "scissors", "rock"}, properties);
-        assertTrue(cmd.hasOption("i"));
-        assertArrayEquals(new String[]{"paper", "scissors"}, cmd.getOptionValues("i"));
-        assertArrayEquals(new String[]{"rock"}, cmd.getArgs());
-    }
-
-    @Test
-    public void testOptionalArgsOptionDotBuilder() throws Exception {
-        final Options opts = new Options();
-        opts.addOption(Option.builder("i").numberOfArgs(2).optionalArg(true).build());
-        final Properties properties = new Properties();
-
-        CommandLine cmd = parse(parser, opts, new String[]{"-i"}, properties);
-        assertTrue(cmd.hasOption("i"));
-        assertNull(null, cmd.getOptionValues("i"));
-
-        cmd = parse(parser, opts, new String[]{"-i", "paper"}, properties);
-        assertTrue(cmd.hasOption("i"));
-        assertArrayEquals(new String[]{"paper"}, cmd.getOptionValues("i"));
-
-        cmd = parse(parser, opts, new String[]{"-i", "paper", "scissors"}, properties);
-        assertTrue(cmd.hasOption("i"));
-        assertArrayEquals(new String[]{"paper", "scissors"}, cmd.getOptionValues("i"));
-
-        cmd = parse(parser, opts, new String[]{"-i", "paper", "scissors", "rock"}, properties);
-        assertTrue(cmd.hasOption("i"));
-        assertArrayEquals(new String[]{"paper", "scissors"}, cmd.getOptionValues("i"));
-        assertArrayEquals(new String[]{"rock"}, cmd.getArgs());
-    }
-
     @Test
     public void testReuseOptionsTwice() throws Exception {
         final Options opts = new Options();
diff --git a/src/test/java/org/apache/commons/cli/CommandLineTest.java b/src/test/java/org/apache/commons/cli/CommandLineTest.java
index 98c02ca..1354c78 100644
--- a/src/test/java/org/apache/commons/cli/CommandLineTest.java
+++ b/src/test/java/org/apache/commons/cli/CommandLineTest.java
@@ -138,34 +138,6 @@ public class CommandLineTest {
         assertEquals("foo", cmd.getParsedOptionValue("f"));
     }
 
-    @Test
-    public void testGetParsedOptionValueWithChar() throws Exception {
-        final Options options = new Options();
-        options.addOption(Option.builder("i").hasArg().type(Number.class).build());
-        options.addOption(Option.builder("f").hasArg().build());
-
-        final CommandLineParser parser = new DefaultParser();
-        final CommandLine cmd = parser.parse(options, new String[] {"-i", "123", "-f", "foo"});
-
-        assertEquals(123, ((Number) cmd.getParsedOptionValue('i')).intValue());
-        assertEquals("foo", cmd.getParsedOptionValue('f'));
-    }
-
-    @Test
-    public void testGetParsedOptionValueWithOption() throws Exception {
-        final Options options = new Options();
-        final Option optI = Option.builder("i").hasArg().type(Number.class).build();
-        final Option optF = Option.builder("f").hasArg().build();
-        options.addOption(optI);
-        options.addOption(optF);
-
-        final CommandLineParser parser = new DefaultParser();
-        final CommandLine cmd = parser.parse(options, new String[] {"-i", "123", "-f", "foo"});
-
-        assertEquals(123, ((Number) cmd.getParsedOptionValue(optI)).intValue());
-        assertEquals("foo", cmd.getParsedOptionValue(optF));
-    }
-
     @Test
     public void testGetParsedOptionValueUsingDefault() throws Exception {
         final Options options = new Options();
@@ -199,6 +171,34 @@ public class CommandLineTest {
 
     }
 
+    @Test
+    public void testGetParsedOptionValueWithChar() throws Exception {
+        final Options options = new Options();
+        options.addOption(Option.builder("i").hasArg().type(Number.class).build());
+        options.addOption(Option.builder("f").hasArg().build());
+
+        final CommandLineParser parser = new DefaultParser();
+        final CommandLine cmd = parser.parse(options, new String[] {"-i", "123", "-f", "foo"});
+
+        assertEquals(123, ((Number) cmd.getParsedOptionValue('i')).intValue());
+        assertEquals("foo", cmd.getParsedOptionValue('f'));
+    }
+
+    @Test
+    public void testGetParsedOptionValueWithOption() throws Exception {
+        final Options options = new Options();
+        final Option optI = Option.builder("i").hasArg().type(Number.class).build();
+        final Option optF = Option.builder("f").hasArg().build();
+        options.addOption(optI);
+        options.addOption(optF);
+
+        final CommandLineParser parser = new DefaultParser();
+        final CommandLine cmd = parser.parse(options, new String[] {"-i", "123", "-f", "foo"});
+
+        assertEquals(123, ((Number) cmd.getParsedOptionValue(optI)).intValue());
+        assertEquals("foo", cmd.getParsedOptionValue(optF));
+    }
+
     @Test
     public void testNullOption() throws Exception {
         final Options options = new Options();
diff --git a/src/test/java/org/apache/commons/cli/OptionValidatorTest.java b/src/test/java/org/apache/commons/cli/OptionValidatorTest.java
index c5ddd1f..aa1e212 100644
--- a/src/test/java/org/apache/commons/cli/OptionValidatorTest.java
+++ b/src/test/java/org/apache/commons/cli/OptionValidatorTest.java
@@ -70,6 +70,43 @@ public class OptionValidatorTest {
     private static String restChars;
     private static String notRestChars;
 
+    private static Stream<Arguments> optionParameters() {
+
+        List<Arguments> args = new ArrayList<>();
+
+        args.add(Arguments.of("CamelCase", true, "Camel case error"));
+        args.add(Arguments.of("Snake_case", true, "Snake case error"));
+        args.add(Arguments.of("_leadingUnderscore", true, "Leading underscore error"));
+        args.add(Arguments.of("kabob-case", true, "Kabob case error"));
+        args.add(Arguments.of("-leadingDash", false, "Leading dash error"));
+        args.add(Arguments.of("lowercase", true, "Lower case error"));
+        args.add(Arguments.of("UPPERCASE", true, "Upper case error"));
+
+        // build passing test cases
+        for (char c : firstChars.toCharArray()) {
+            String s = String.format("%sMoreText", c);
+            args.add(Arguments.of(s, true, String.format("testing: First character '%s'", c)));
+        }
+
+        for (char c : restChars.toCharArray()) {
+            String s = String.format("Some%sText", c);
+            args.add(Arguments.of(s, true, String.format("testing: Middle character '%s'", c)));
+        }
+
+        // build failing test cases
+        for (char c : notFirstChars.toCharArray()) {
+            String s = String.format("%sMoreText", c);
+            args.add(Arguments.of(s, false, String.format("testing: Bad first character '%s'", c)));
+        }
+
+        for (char c : notRestChars.toCharArray()) {
+            String s = String.format("Some%sText", c);
+            args.add(Arguments.of(s, false, String.format("testing: Bad middle character '%s'", c)));
+        }
+
+        return args.stream();
+    }
+
     @BeforeAll
     public static void setup() {
         StringBuilder sb = new StringBuilder();
@@ -143,41 +180,4 @@ public class OptionValidatorTest {
             assertThrows(IllegalArgumentException.class, () -> OptionValidator.validate(str));
         }
     }
-
-    private static Stream<Arguments> optionParameters() {
-
-        List<Arguments> args = new ArrayList<>();
-
-        args.add(Arguments.of("CamelCase", true, "Camel case error"));
-        args.add(Arguments.of("Snake_case", true, "Snake case error"));
-        args.add(Arguments.of("_leadingUnderscore", true, "Leading underscore error"));
-        args.add(Arguments.of("kabob-case", true, "Kabob case error"));
-        args.add(Arguments.of("-leadingDash", false, "Leading dash error"));
-        args.add(Arguments.of("lowercase", true, "Lower case error"));
-        args.add(Arguments.of("UPPERCASE", true, "Upper case error"));
-
-        // build passing test cases
-        for (char c : firstChars.toCharArray()) {
-            String s = String.format("%sMoreText", c);
-            args.add(Arguments.of(s, true, String.format("testing: First character '%s'", c)));
-        }
-
-        for (char c : restChars.toCharArray()) {
-            String s = String.format("Some%sText", c);
-            args.add(Arguments.of(s, true, String.format("testing: Middle character '%s'", c)));
-        }
-
-        // build failing test cases
-        for (char c : notFirstChars.toCharArray()) {
-            String s = String.format("%sMoreText", c);
-            args.add(Arguments.of(s, false, String.format("testing: Bad first character '%s'", c)));
-        }
-
-        for (char c : notRestChars.toCharArray()) {
-            String s = String.format("Some%sText", c);
-            args.add(Arguments.of(s, false, String.format("testing: Bad middle character '%s'", c)));
-        }
-
-        return args.stream();
-    }
 }
diff --git a/src/test/java/org/apache/commons/cli/OptionsTest.java b/src/test/java/org/apache/commons/cli/OptionsTest.java
index 1f93bc7..187ff46 100644
--- a/src/test/java/org/apache/commons/cli/OptionsTest.java
+++ b/src/test/java/org/apache/commons/cli/OptionsTest.java
@@ -36,52 +36,54 @@ import org.junit.Test;
 @SuppressWarnings("deprecation") // tests some deprecated classes
 public class OptionsTest {
     @Test
-    public void testDuplicateLong() {
-        final Options opts = new Options();
-        opts.addOption("a", "--a", false, "toggle -a");
-        opts.addOption("a", "--a", false, "toggle -a*");
-        assertEquals("last one in wins", "toggle -a*", opts.getOption("a").getDescription());
-    }
-
-    @Test
-    public void testDuplicateSimple() {
-        final Options opts = new Options();
-        opts.addOption("a", false, "toggle -a");
-        opts.addOption("a", true, "toggle -a*");
-
-        assertEquals("last one in wins", "toggle -a*", opts.getOption("a").getDescription());
-    }
+    public void testAddConflictingOptions() {
+        final Options options1 = new Options();
+        final OptionGroup group1 = new OptionGroup();
+        group1.addOption(Option.builder("a").build());
+        group1.addOption(Option.builder("b").build());
+        options1.addOptionGroup(group1);
+        options1.addOption(Option.builder("x").build());
+        options1.addOption(Option.builder("y").build());
 
-    @Test
-    public void testGetMatchingOpts() {
-        final Options options = new Options();
-        OptionBuilder.withLongOpt("version");
-        options.addOption(OptionBuilder.create());
-        OptionBuilder.withLongOpt("verbose");
-        options.addOption(OptionBuilder.create());
+        final Options options2 = new Options();
+        final OptionGroup group2 = new OptionGroup();
+        group2.addOption(Option.builder("x").type(Integer.class).build());
+        group2.addOption(Option.builder("b").type(Integer.class).build());
+        options2.addOptionGroup(group2);
+        options2.addOption(Option.builder("c").build());
 
-        assertTrue(options.getMatchingOptions("foo").isEmpty());
-        assertEquals(1, options.getMatchingOptions("version").size());
-        assertEquals(2, options.getMatchingOptions("ver").size());
+        assertThrows(IllegalArgumentException.class, () -> options1.addOptions(options2));
     }
 
     @Test
-    public void testGetOptionsGroups() {
-        final Options options = new Options();
-
+    public void testAddNonConflictingOptions() {
+        final Options options1 = new Options();
         final OptionGroup group1 = new OptionGroup();
-        group1.addOption(OptionBuilder.create('a'));
-        group1.addOption(OptionBuilder.create('b'));
+        group1.addOption(Option.builder("a").build());
+        group1.addOption(Option.builder("b").build());
+        options1.addOptionGroup(group1);
+        options1.addOption(Option.builder("x").build());
+        options1.addOption(Option.builder("y").build());
 
+        final Options options2 = new Options();
         final OptionGroup group2 = new OptionGroup();
-        group2.addOption(OptionBuilder.create('x'));
-        group2.addOption(OptionBuilder.create('y'));
+        group2.addOption(Option.builder("c").type(Integer.class).build());
+        group2.addOption(Option.builder("d").type(Integer.class).build());
+        options2.addOptionGroup(group2);
+        options1.addOption(Option.builder("e").build());
+        options1.addOption(Option.builder("f").build());
 
-        options.addOptionGroup(group1);
-        options.addOptionGroup(group2);
+        Options underTest = new Options();
+        underTest.addOptions(options1);
+        underTest.addOptions(options2);
 
-        assertNotNull(options.getOptionGroups());
-        assertEquals(2, options.getOptionGroups().size());
+        List<OptionGroup> expected = Arrays.asList(group1, group2);
+        assertTrue(expected.size() == underTest.getOptionGroups().size() && expected.containsAll(underTest.getOptionGroups()));
+        Set<Option> expectOpt = new HashSet<>();
+        expectOpt.addAll(options1.getOptions());
+        expectOpt.addAll(options2.getOptions());
+        assertEquals(8, expectOpt.size());
+        assertTrue(expectOpt.size() == underTest.getOptions().size() && expectOpt.containsAll(underTest.getOptions()));
     }
 
     @Test
@@ -121,54 +123,52 @@ public class OptionsTest {
     }
 
     @Test
-    public void testAddConflictingOptions() {
-        final Options options1 = new Options();
-        final OptionGroup group1 = new OptionGroup();
-        group1.addOption(Option.builder("a").build());
-        group1.addOption(Option.builder("b").build());
-        options1.addOptionGroup(group1);
-        options1.addOption(Option.builder("x").build());
-        options1.addOption(Option.builder("y").build());
+    public void testDuplicateLong() {
+        final Options opts = new Options();
+        opts.addOption("a", "--a", false, "toggle -a");
+        opts.addOption("a", "--a", false, "toggle -a*");
+        assertEquals("last one in wins", "toggle -a*", opts.getOption("a").getDescription());
+    }
 
-        final Options options2 = new Options();
-        final OptionGroup group2 = new OptionGroup();
-        group2.addOption(Option.builder("x").type(Integer.class).build());
-        group2.addOption(Option.builder("b").type(Integer.class).build());
-        options2.addOptionGroup(group2);
-        options2.addOption(Option.builder("c").build());
+    @Test
+    public void testDuplicateSimple() {
+        final Options opts = new Options();
+        opts.addOption("a", false, "toggle -a");
+        opts.addOption("a", true, "toggle -a*");
 
-        assertThrows(IllegalArgumentException.class, () -> options1.addOptions(options2));
+        assertEquals("last one in wins", "toggle -a*", opts.getOption("a").getDescription());
     }
 
     @Test
-    public void testAddNonConflictingOptions() {
-        final Options options1 = new Options();
+    public void testGetMatchingOpts() {
+        final Options options = new Options();
+        OptionBuilder.withLongOpt("version");
+        options.addOption(OptionBuilder.create());
+        OptionBuilder.withLongOpt("verbose");
+        options.addOption(OptionBuilder.create());
+
+        assertTrue(options.getMatchingOptions("foo").isEmpty());
+        assertEquals(1, options.getMatchingOptions("version").size());
+        assertEquals(2, options.getMatchingOptions("ver").size());
+    }
+
+    @Test
+    public void testGetOptionsGroups() {
+        final Options options = new Options();
+
         final OptionGroup group1 = new OptionGroup();
-        group1.addOption(Option.builder("a").build());
-        group1.addOption(Option.builder("b").build());
-        options1.addOptionGroup(group1);
-        options1.addOption(Option.builder("x").build());
-        options1.addOption(Option.builder("y").build());
+        group1.addOption(OptionBuilder.create('a'));
+        group1.addOption(OptionBuilder.create('b'));
 
-        final Options options2 = new Options();
         final OptionGroup group2 = new OptionGroup();
-        group2.addOption(Option.builder("c").type(Integer.class).build());
-        group2.addOption(Option.builder("d").type(Integer.class).build());
-        options2.addOptionGroup(group2);
-        options1.addOption(Option.builder("e").build());
-        options1.addOption(Option.builder("f").build());
+        group2.addOption(OptionBuilder.create('x'));
+        group2.addOption(OptionBuilder.create('y'));
 
-        Options underTest = new Options();
-        underTest.addOptions(options1);
-        underTest.addOptions(options2);
+        options.addOptionGroup(group1);
+        options.addOptionGroup(group2);
 
-        List<OptionGroup> expected = Arrays.asList(group1, group2);
-        assertTrue(expected.size() == underTest.getOptionGroups().size() && expected.containsAll(underTest.getOptionGroups()));
-        Set<Option> expectOpt = new HashSet<>();
-        expectOpt.addAll(options1.getOptions());
-        expectOpt.addAll(options2.getOptions());
-        assertEquals(8, expectOpt.size());
-        assertTrue(expectOpt.size() == underTest.getOptions().size() && expectOpt.containsAll(underTest.getOptions()));
+        assertNotNull(options.getOptionGroups());
+        assertEquals(2, options.getOptionGroups().size());
     }
 
     @Test
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI312Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI312Test.java
index 6de9501..e110e5a 100644
--- a/src/test/java/org/apache/commons/cli/bug/BugCLI312Test.java
+++ b/src/test/java/org/apache/commons/cli/bug/BugCLI312Test.java
@@ -36,6 +36,17 @@ import org.junit.Test;
  * Demonstrates inconsistencies in parsing Java property-style options.
  */
 public class BugCLI312Test {
+    @Test
+    public void testNoOptionValues() {
+        final Option o1 = Option.builder("A").build();
+        final Option o2 = Option.builder().option("D").longOpt("define").numberOfArgs(2).valueSeparator('=').build();
+        Options options = new Options().addOption(o1).addOption(o2);
+
+        final CommandLineParser parser = new DefaultParser();
+
+        assertThrows(MissingArgumentException.class, () -> parser.parse(options, "-D -A".split(" ")));
+    }
+
     @Test
     public void testPropertyStyleOption_withGetOptionProperties() throws ParseException {
         final Option o1 = Option.builder().option("D").longOpt("define").numberOfArgs(2).valueSeparator('=').build();
@@ -92,15 +103,4 @@ public class BugCLI312Test {
         }
         assertEquals("other", cl.getArgList().get(0));
     }
-
-    @Test
-    public void testNoOptionValues() {
-        final Option o1 = Option.builder("A").build();
-        final Option o2 = Option.builder().option("D").longOpt("define").numberOfArgs(2).valueSeparator('=').build();
-        Options options = new Options().addOption(o1).addOption(o2);
-
-        final CommandLineParser parser = new DefaultParser();
-
-        assertThrows(MissingArgumentException.class, () -> parser.parse(options, "-D -A".split(" ")));
-    }
 }