Use JUnit 5 convention for class visibility

garydgregory · garydgregory · commit cd272c310f84 · 2025-06-08T13:43:49.000-04:00
diff --git a/src/test/java/org/apache/commons/cli/AlreadySelectedExceptionTest.java b/src/test/java/org/apache/commons/cli/AlreadySelectedExceptionTest.java
@@ -26,7 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * Tests {@link AlreadySelectedException}.
  */
-public class AlreadySelectedExceptionTest {
+class AlreadySelectedExceptionTest {
 
     @Test
     void testConstructor() {
diff --git a/src/test/java/org/apache/commons/cli/ApplicationTest.java b/src/test/java/org/apache/commons/cli/ApplicationTest.java
@@ -39,7 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * </p>
  */
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class ApplicationTest {
+class ApplicationTest {
     /**
      * Ant test
      */
diff --git a/src/test/java/org/apache/commons/cli/ArgumentIsOptionTest.java b/src/test/java/org/apache/commons/cli/ArgumentIsOptionTest.java
@@ -25,7 +25,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class ArgumentIsOptionTest {
+class ArgumentIsOptionTest {
 
     private Options options;
     private CommandLineParser parser;
diff --git a/src/test/java/org/apache/commons/cli/BasicParserTest.java b/src/test/java/org/apache/commons/cli/BasicParserTest.java
@@ -25,7 +25,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * TODO Needs a rework using JUnit parameterized tests.
  */
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class BasicParserTest extends AbstractParserTestCase {
+class BasicParserTest extends AbstractParserTestCase {
     @Override
     @BeforeEach
     public void setUp() {
diff --git a/src/test/java/org/apache/commons/cli/CommandLineTest.java b/src/test/java/org/apache/commons/cli/CommandLineTest.java
@@ -37,7 +37,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-public class CommandLineTest {
+class CommandLineTest {
 
     private enum Count { ONE, TWO, THREE }
 
diff --git a/src/test/java/org/apache/commons/cli/DefaultParserTest.java b/src/test/java/org/apache/commons/cli/DefaultParserTest.java
@@ -35,7 +35,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.params.provider.ArgumentsProvider;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
-public class DefaultParserTest extends AbstractParserTestCase {
+class DefaultParserTest extends AbstractParserTestCase {
 
     static class ExternalArgumentsProvider implements ArgumentsProvider {
 
diff --git a/src/test/java/org/apache/commons/cli/DeprecatedAttributesTest.java b/src/test/java/org/apache/commons/cli/DeprecatedAttributesTest.java
@@ -21,7 +21,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 import org.junit.jupiter.api.Test;
 
-public class DeprecatedAttributesTest {
+class DeprecatedAttributesTest {
 
     @Test
     void testBuilderNonDefaults() {
diff --git a/src/test/java/org/apache/commons/cli/DisablePartialMatchingTest.java b/src/test/java/org/apache/commons/cli/DisablePartialMatchingTest.java
@@ -22,7 +22,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 import org.junit.jupiter.api.Test;
 
-public class DisablePartialMatchingTest {
+class DisablePartialMatchingTest {
     @Test
     void testDisablePartialMatching() throws Exception {
         final CommandLineParser parser = new DefaultParser(false);
diff --git a/src/test/java/org/apache/commons/cli/GnuParserTest.java b/src/test/java/org/apache/commons/cli/GnuParserTest.java
@@ -25,7 +25,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * TODO Needs a rework using JUnit parameterized tests.
  */
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class GnuParserTest extends AbstractParserTestCase {
+class GnuParserTest extends AbstractParserTestCase {
     @Override
     @BeforeEach
     public void setUp() {
diff --git a/src/test/java/org/apache/commons/cli/HelpFormatterTest.java b/src/test/java/org/apache/commons/cli/HelpFormatterTest.java
@@ -43,7 +43,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * Test case for the HelpFormatter class.
  */
-public class HelpFormatterTest {
+class HelpFormatterTest {
     private static final String EOL = System.lineSeparator();
 
     static Stream<Arguments> deprecatedOptionsProvider() {
diff --git a/src/test/java/org/apache/commons/cli/OptionBuilderTest.java b/src/test/java/org/apache/commons/cli/OptionBuilderTest.java
@@ -27,7 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.api.function.Executable;
 
 @SuppressWarnings("deprecation") // OptionBuilder is marked deprecated
-public class OptionBuilderTest {
+class OptionBuilderTest {
     @Test
     void testBaseOptionCharOpt() {
         final Option base = OptionBuilder.withDescription("option description").create('o');
diff --git a/src/test/java/org/apache/commons/cli/OptionGroupTest.java b/src/test/java/org/apache/commons/cli/OptionGroupTest.java
@@ -29,7 +29,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class OptionGroupTest {
+class OptionGroupTest {
 
     private Options options;
     private final Parser parser = new PosixParser();
diff --git a/src/test/java/org/apache/commons/cli/OptionTest.java b/src/test/java/org/apache/commons/cli/OptionTest.java
@@ -33,7 +33,7 @@
 
 import org.junit.jupiter.api.Test;
 
-public class OptionTest {
+class OptionTest {
 
     private static final class DefaultOption extends Option {
         private static final long serialVersionUID = 1L;
diff --git a/src/test/java/org/apache/commons/cli/OptionValidatorTest.java b/src/test/java/org/apache/commons/cli/OptionValidatorTest.java
@@ -31,7 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-public class OptionValidatorTest {
+class OptionValidatorTest {
 
     /*
      * Exemplars of various types of characters
diff --git a/src/test/java/org/apache/commons/cli/OptionsTest.java b/src/test/java/org/apache/commons/cli/OptionsTest.java
@@ -34,7 +34,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class OptionsTest {
+class OptionsTest {
 
     private void assertToStrings(final Option option) {
         // Should never throw.
diff --git a/src/test/java/org/apache/commons/cli/ParseExceptionTest.java b/src/test/java/org/apache/commons/cli/ParseExceptionTest.java
@@ -26,7 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * Tests {@link ParseException}.
  */
-public class ParseExceptionTest {
+class ParseExceptionTest {
 
     @Test
     void testConstructor() {
diff --git a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
@@ -40,7 +40,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Test case for the PatternOptionBuilder class.
  */
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class PatternOptionBuilderTest {
+class PatternOptionBuilderTest {
 
     @Test
     void testClassPattern() throws Exception {
diff --git a/src/test/java/org/apache/commons/cli/PosixParserTest.java b/src/test/java/org/apache/commons/cli/PosixParserTest.java
@@ -26,7 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  * TODO Needs a rework using JUnit parameterized tests.
  */
-public class PosixParserTest extends AbstractParserTestCase {
+class PosixParserTest extends AbstractParserTestCase {
     @Override
     @SuppressWarnings("deprecation")
     @BeforeEach
diff --git a/src/test/java/org/apache/commons/cli/SolrCreateToolTest.java b/src/test/java/org/apache/commons/cli/SolrCreateToolTest.java
@@ -27,7 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 import org.junit.jupiter.api.Test;
 
-public class SolrCreateToolTest {
+class SolrCreateToolTest {
 
     private List<Option> getOptions() {
         // @formatter:off
diff --git a/src/test/java/org/apache/commons/cli/TypeHandlerTest.java b/src/test/java/org/apache/commons/cli/TypeHandlerTest.java
@@ -47,7 +47,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-public class TypeHandlerTest {
+class TypeHandlerTest {
 
     /** Used for Class and Object creation tests. */
     public static class Instantiable {
diff --git a/src/test/java/org/apache/commons/cli/UnrecognizedOptionExceptionTest.java b/src/test/java/org/apache/commons/cli/UnrecognizedOptionExceptionTest.java
@@ -24,7 +24,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * Tests {@link UnrecognizedOptionException}.
  */
-public class UnrecognizedOptionExceptionTest {
+class UnrecognizedOptionExceptionTest {
 
     @Test
     void testConstructor() {
diff --git a/src/test/java/org/apache/commons/cli/UtilTest.java b/src/test/java/org/apache/commons/cli/UtilTest.java
@@ -22,7 +22,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 import org.junit.jupiter.api.Test;
 
-public class UtilTest {
+class UtilTest {
 
     @Test
     void testStripLeadingAndTrailingQuotes() {
diff --git a/src/test/java/org/apache/commons/cli/ValueTest.java b/src/test/java/org/apache/commons/cli/ValueTest.java
@@ -30,7 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.params.provider.MethodSource;
 
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class ValueTest {
+class ValueTest {
 
     private static final Option NULL_OPTION = null;
     private static final String NULL_STRING = null;
diff --git a/src/test/java/org/apache/commons/cli/ValuesTest.java b/src/test/java/org/apache/commons/cli/ValuesTest.java
@@ -26,7 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class ValuesTest {
+class ValuesTest {
     private CommandLine cmd;
 
     @BeforeEach
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI133Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI133Test.java
@@ -27,7 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class BugCLI133Test {
+class BugCLI133Test {
     @Test
     void testOrder() throws ParseException {
         final Option optionA = new Option("a", "first");
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI13Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI13Test.java
@@ -29,7 +29,7 @@
 import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class BugCLI13Test {
+class BugCLI13Test {
 
     @Test
     void testCLI13() throws ParseException {
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI148Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI148Test.java
@@ -31,7 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * https://issues.apache.org/jira/browse/CLI-148
  */
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class BugCLI148Test {
+class BugCLI148Test {
     private Options options;
 
     @BeforeEach
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI162Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI162Test.java
@@ -31,7 +31,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class BugCLI162Test {
+class BugCLI162Test {
     /** Constant for the line separator. */
     private static final String CR = System.lineSeparator();
 
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI18Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI18Test.java
@@ -28,7 +28,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * https://issues.apache.org/jira/browse/CLI-18
  */
-public class BugCLI18Test {
+class BugCLI18Test {
     @Test
     void testCLI18() {
         final Options options = new Options();
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI252Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI252Test.java
@@ -26,7 +26,7 @@
 import org.apache.commons.cli.ParseException;
 import org.junit.jupiter.api.Test;
 
-public class BugCLI252Test {
+class BugCLI252Test {
 
     private Options getOptions() {
         final Options options = new Options();
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI265Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI265Test.java
@@ -35,7 +35,7 @@
  * <p>
  * The issue is that a short option with an optional value will use whatever comes next as value.
  */
-public class BugCLI265Test {
+class BugCLI265Test {
 
     private DefaultParser parser;
     private Options options;
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI266Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI266Test.java
@@ -31,7 +31,7 @@
 import org.apache.commons.cli.Options;
 import org.junit.jupiter.api.Test;
 
-public class BugCLI266Test {
+class BugCLI266Test {
 
     private final List<String> insertedOrder = Arrays.asList("h", "d", "f", "x", "s", "p", "t", "w", "o");
     private final List<String> sortOrder = Arrays.asList("d", "f", "h", "o", "p", "s", "t", "w", "x");
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI312Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI312Test.java
@@ -35,7 +35,7 @@
 /**
  * Demonstrates inconsistencies in parsing Java property-style options.
  */
-public class BugCLI312Test {
+class BugCLI312Test {
     @Test
     void testNoOptionValues() {
         final Option o1 = Option.builder("A").build();
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI325Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI325Test.java
@@ -28,7 +28,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.commons.cli.ParseException;
 import org.junit.jupiter.api.Test;
 
-public class BugCLI325Test {
+class BugCLI325Test {
 
     @Test
     void testCli325() throws ParseException {
diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI71Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI71Test.java
@@ -30,7 +30,7 @@
 import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class BugCLI71Test {
+class BugCLI71Test {
     private Options options;
     private CommandLineParser parser;
 
diff --git a/src/test/java/org/apache/commons/cli/bug/BugsTest.java b/src/test/java/org/apache/commons/cli/bug/BugsTest.java
@@ -47,7 +47,7 @@
 import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class BugsTest {
+class BugsTest {
     @Test
     void test11456() throws Exception {
         // POSIX
diff --git a/src/test/java/org/apache/commons/cli/example/AptHelpAppendableTest.java b/src/test/java/org/apache/commons/cli/example/AptHelpAppendableTest.java
@@ -35,7 +35,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * Tests {@link AptHelpAppendable}.
  */
-public class AptHelpAppendableTest {
+class AptHelpAppendableTest {
 
     private StringBuilder sb;
     private AptHelpAppendable underTest;
diff --git a/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendableTest.java b/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendableTest.java
@@ -35,7 +35,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * Tests {@link XhtmlHelpAppendable}.
  */
-public class XhtmlHelpAppendableTest {
+class XhtmlHelpAppendableTest {
 
     private StringBuilder sb;
     private XhtmlHelpAppendable underTest;
diff --git a/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java b/src/test/java/org/apache/commons/cli/help/HelpFormatterTest.java
@@ -36,7 +36,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * Tests {@link HelpFormatter}.
  */
-public class HelpFormatterTest {
+class HelpFormatterTest {
 
     private Options getTestGroups() {
         // @formatter:off
diff --git a/src/test/java/org/apache/commons/cli/help/OptionFormatterTest.java b/src/test/java/org/apache/commons/cli/help/OptionFormatterTest.java
@@ -34,7 +34,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * Tests {@link OptionFormatter}.
  */
-public class OptionFormatterTest {
+class OptionFormatterTest {
 
     public static Stream<Arguments> deprecatedAttributesData() {
         final List<Arguments> lst = new ArrayList<>();
diff --git a/src/test/java/org/apache/commons/cli/help/UtilTest.java b/src/test/java/org/apache/commons/cli/help/UtilTest.java
@@ -31,7 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-public class UtilTest {
+class UtilTest {
 
     public static Stream<Arguments> charArgs() {
         final List<Arguments> lst = new ArrayList<>();
