Use JUnit 5 convention for test method visibility

garydgregory · garydgregory · commit dfeddc8108f8 · 2025-06-07T09:48:10.000-04:00
diff --git a/src/test/java/org/apache/bcel/PLSETest.java b/src/test/java/org/apache/bcel/PLSETest.java
@@ -144,7 +144,7 @@ void testBCEL79() throws ClassNotFoundException {
      */
     @ParameterizedTest
     @ValueSource(booleans = { true, false })
-    public void testCoverage(final boolean compress) throws ClassNotFoundException, java.io.IOException {
+    void testCoverage(final boolean compress) throws ClassNotFoundException, java.io.IOException {
         // load a class with a wide variety of byte codes - including tableswitch and lookupswitch
         final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME + ".data.ConstantPoolX");
         for (final Method m : clazz.getMethods()) {
diff --git a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java
@@ -47,7 +47,7 @@ static Stream<URL> testJREModules() throws IOException {
 
     @ParameterizedTest
     @MethodSource
-    public void testJREModules(final URL url) throws Exception {
+    void testJREModules(final URL url) throws Exception {
         try (InputStream inputStream = url.openStream()) {
             final ClassParser classParser = new ClassParser(inputStream, "module-info.class");
             final JavaClass javaClass = classParser.parse();
diff --git a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTest.java b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTest.java
@@ -497,7 +497,7 @@ void test() throws Exception {
         "src/test/resources/jpms/java18/commons-io/module-info.class",
         "src/test/resources/jpms/java19-ea/commons-io/module-info.class"})
     // @formatter:on
-    public void test(final String first) throws Exception {
+    void test(final String first) throws Exception {
         try (InputStream inputStream = Files.newInputStream(Paths.get(first))) {
             test(inputStream);
         }
@@ -517,7 +517,7 @@ public void test(final String first) throws Exception {
         "javax.annotation.ManagedBean",                         // contains attribute AnnotationDefault
         "javax.management.remote.rmi.RMIConnectionImpl_Stub"})  // contains attribute Synthetic
     // @formatter:on
-    public void testClass(final String className) throws Exception {
+    void testClass(final String className) throws Exception {
         testJavaClass(SyntheticRepository.getInstance().loadClass(className));
     }
 }
diff --git a/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTest.java b/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTest.java
@@ -74,7 +74,7 @@ void testLoadClass() throws Exception {
 
     @Test
     //@Disabled("TODO?")
-    public void testMethodWithParens() throws Exception {
+    void testMethodWithParens() throws Exception {
         try (InputStream inputStream = Files.newInputStream(Paths.get(SRC_TEST_RESOURCES_KOTLIN, CLASS_NAME + ".class"))) {
             final ClassParser classParser = new ClassParser(inputStream, CLASS_NAME);
             final JavaClass javaClass = classParser.parse();
diff --git a/src/test/java/org/apache/bcel/classfile/JDKClassDumpTest.java b/src/test/java/org/apache/bcel/classfile/JDKClassDumpTest.java
@@ -77,7 +77,7 @@ private void testJar(final Path path) throws Exception {
 
     @ParameterizedTest
     @MethodSource("org.apache.bcel.generic.JavaHome#streamJarPath")
-    public void testPerformance(final Path path) throws Exception {
+    void testPerformance(final Path path) throws Exception {
         assertDoesNotThrow(() -> testJar(path));
     }
 
diff --git a/src/test/java/org/apache/bcel/generic/EmptyVisitorTest.java b/src/test/java/org/apache/bcel/generic/EmptyVisitorTest.java
@@ -70,7 +70,7 @@ final class EmptyVisitorTest {
         "org.apache.commons.lang.SerializationUtils"     // contains instruction JSR
     // @formatter:on
     })
-    public void test(final String className) throws ClassNotFoundException {
+    void test(final String className) throws ClassNotFoundException {
         // "java.io.Bits" is not in Java 21.
         assumeFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_21) && className.equals("java.io.Bits"));
         final JavaClass javaClass = SyntheticRepository.getInstance().loadClass(className);
diff --git a/src/test/java/org/apache/bcel/generic/FieldGenTest.java b/src/test/java/org/apache/bcel/generic/FieldGenTest.java
@@ -35,7 +35,7 @@ public class FieldGenTest {
 
     @Test
     @Disabled
-    public void testBCELComparator() throws Exception {
+    void testBCELComparator() throws Exception {
         final ConstantLong[] constantPool = { new ConstantLong(0), new ConstantLong(0) };
         final FieldGen obj = new FieldGen(new Field(0, 0, 0, null, new ConstantPool(constantPool)), new ConstantPoolGen(constantPool));
         assertTrue(FieldGen.getComparator().equals(null, null));
diff --git a/src/test/java/org/apache/bcel/generic/JdkGenericDumpTest.java b/src/test/java/org/apache/bcel/generic/JdkGenericDumpTest.java
@@ -173,20 +173,20 @@ private void testJar(final Path file) throws Exception {
 
     @ParameterizedTest
     @MethodSource("org.apache.bcel.generic.JavaHome#streamJarPath")
-    public void testJdkJars(final Path jarPath) throws Exception {
+    void testJdkJars(final Path jarPath) throws Exception {
         testJar(jarPath);
     }
 
     @ParameterizedTest
     @MethodSource("org.apache.bcel.generic.JavaHome#streamModulePath")
     @DisabledOnJre(value = JRE.JAVA_8)
-    public void testJdkModules(final Path jmodPath) throws Exception {
+    void testJdkModules(final Path jmodPath) throws Exception {
         testJar(jmodPath);
     }
 
     @ParameterizedTest
     @MethodSource("org.apache.bcel.generic.JavaHome#streamJavaHome")
-    public void testJreModules(final JavaHome javaHome) throws Exception {
+    void testJreModules(final JavaHome javaHome) throws Exception {
         assumeTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9));
         try (ModularRuntimeImage mri = javaHome.getModularRuntimeImage()) {
             for (final Path path : mri.modules()) {
diff --git a/src/test/java/org/apache/bcel/generic/TypeTest.java b/src/test/java/org/apache/bcel/generic/TypeTest.java
@@ -84,7 +84,7 @@ void testInternalTypeNametoSignature() {
         "org/apache/bcel/generic/MethodGen",
         "com/foo/Foo"})
     // @formatter:on
-    public void testLDC(final String className) throws Exception {
+    void testLDC(final String className) throws Exception {
         final JavaClass jc = Repository.lookupClass(className);
         final ConstantPoolGen cpg = new ConstantPoolGen(jc.getConstantPool());
         for (final Method method : jc.getMethods()) {
diff --git a/src/test/java/org/apache/bcel/util/BCELifierTest.java b/src/test/java/org/apache/bcel/util/BCELifierTest.java
@@ -111,7 +111,7 @@ private String exec(final File workDir, final String... args) throws Exception {
         "drem 3 2 = 1.0"
     // @formatter:on
     })
-    public void testBinaryOp(final String exp) throws Exception {
+    void testBinaryOp(final String exp) throws Exception {
         BinaryOpCreator.main(new String[] {});
         final File workDir = new File("target");
         final Pattern pattern = Pattern.compile("([a-z]{3,5}) ([-+]?\\d*\\.?\\d+) ([-+]?\\d*\\.?\\d+) = ([-+]?\\d*\\.?\\d+)");
@@ -193,7 +193,7 @@ void testHelloWorld() throws Exception {
         "target/test-classes/Java4Example.class"
     // @formatter:on
     })
-    public void testJavapCompare(final String pathToClass) throws Exception {
+    void testJavapCompare(final String pathToClass) throws Exception {
         testClassOnPath(pathToClass);
     }
 
@@ -213,7 +213,7 @@ void testMainNoArg() throws Exception {
 
     @ParameterizedTest
     @ValueSource(strings = { "StackMapExample", "StackMapExample2" })
-    public void testStackMap(final String className) throws Exception {
+    void testStackMap(final String className) throws Exception {
         testJavapCompare(className);
         final File workDir = new File("target");
         assertEquals("Hello World" + EOL, exec(workDir, "java", "-cp", CLASSPATH, className, "Hello"));
diff --git a/src/test/java/org/apache/bcel/util/Class2HTMLTest.java b/src/test/java/org/apache/bcel/util/Class2HTMLTest.java
@@ -38,7 +38,7 @@ public class Class2HTMLTest {
         "target/test-classes/Java8Example.class",
         "target/test-classes/Java4Example.class"})
     // @formatter:on
-    public void testConvertJavaUtil(final String classFileName) throws Exception {
+    void testConvertJavaUtil(final String classFileName) throws Exception {
         final File outputDir = new File("target/test-output/html");
         if (!outputDir.mkdirs()) { // either was not created or already existed
             assertTrue(outputDir.isDirectory()); // fail if missing
diff --git a/src/test/java/org/apache/bcel/util/ModularRuntimeImageTest.java b/src/test/java/org/apache/bcel/util/ModularRuntimeImageTest.java
@@ -45,31 +45,31 @@ public static void before() {
 
     @ParameterizedTest
     @MethodSource("org.apache.bcel.generic.JavaHome#streamModularRuntimeImage")
-    public void testListJreModule(final ModularRuntimeImage modularRuntimeImage) throws IOException {
+    void testListJreModule(final ModularRuntimeImage modularRuntimeImage) throws IOException {
         final List<Path> listEntries = modularRuntimeImage.list(ModularRuntimeImage.MODULES_PATH + "/java.base");
         assertFalse(listEntries.isEmpty());
         assertTrue(listEntries.toString().indexOf("/java.base") > -1);
     }
 
     @ParameterizedTest
     @MethodSource("org.apache.bcel.generic.JavaHome#streamModularRuntimeImage")
-    public void testListJreModulePackageDir(final ModularRuntimeImage modularRuntimeImage) throws IOException {
+    void testListJreModulePackageDir(final ModularRuntimeImage modularRuntimeImage) throws IOException {
         final List<Path> listEntries = modularRuntimeImage.list(ModularRuntimeImage.MODULES_PATH + "/java.base/java/lang");
         assertFalse(listEntries.isEmpty());
         assertTrue(listEntries.toString().indexOf("/java.base/java/lang/String.class") > -1);
     }
 
     @ParameterizedTest
     @MethodSource("org.apache.bcel.generic.JavaHome#streamModularRuntimeImage")
-    public void testListJreModules(final ModularRuntimeImage modularRuntimeImage) throws IOException {
+    void testListJreModules(final ModularRuntimeImage modularRuntimeImage) throws IOException {
         final List<Path> listEntries = modularRuntimeImage.list(ModularRuntimeImage.MODULES_PATH);
         assertFalse(listEntries.isEmpty());
         assertTrue(listEntries.toString().indexOf("/java.base") > -1);
     }
 
     @ParameterizedTest
     @MethodSource("org.apache.bcel.generic.JavaHome#streamModularRuntimeImage")
-    public void testListJrePackages(final ModularRuntimeImage modularRuntimeImage) throws IOException {
+    void testListJrePackages(final ModularRuntimeImage modularRuntimeImage) throws IOException {
         final List<Path> listEntries = modularRuntimeImage.list(ModularRuntimeImage.PACKAGES_PATH);
         assertFalse(listEntries.isEmpty());
         assertTrue(listEntries.toString().indexOf("java.lang") > -1);
diff --git a/src/test/java/org/apache/bcel/verifier/JiraBcel369Test.java b/src/test/java/org/apache/bcel/verifier/JiraBcel369Test.java
@@ -118,7 +118,7 @@ void testCompileAndVerify() throws ClassNotFoundException {
      */
     @Test
     @Disabled
-    public void testCompiledClass() throws ClassNotFoundException {
+    void testCompiledClass() throws ClassNotFoundException {
         Verifier.verifyType("issue369.Issue369");
     }
 
diff --git a/src/test/java/org/apache/bcel/verifier/JiraBcel370Test.java b/src/test/java/org/apache/bcel/verifier/JiraBcel370Test.java
@@ -45,7 +45,7 @@ public class JiraBcel370Test extends AbstractTest {
         "target/test-classes/com/foo/Foo.class"
     })
     // @formatter:on
-    public void testLdcGetType(final String classFileName) throws Exception {
+    void testLdcGetType(final String classFileName) throws Exception {
         try (FileInputStream file = new FileInputStream(classFileName)) {
             final ClassParser parser = new ClassParser(file, new File(classFileName).getName());
             final JavaClass clazz = parser.parse();
@@ -74,7 +74,7 @@ public void visitLDC(final LDC ldc) {
         "com.foo.Foo"
     })
     // @formatter:on
-    public void testVerify(final String className) throws ClassNotFoundException {
+    void testVerify(final String className) throws ClassNotFoundException {
         // Without the changes to the verifier this fails because it doesn't allow LDC CONSTANT_Dynamic
         Verifier.verifyType(className);
     }
diff --git a/src/test/java/org/apache/bcel/verifier/VerifierTest.java b/src/test/java/org/apache/bcel/verifier/VerifierTest.java
@@ -141,13 +141,13 @@ void testJvmOpCodes() throws ClassNotFoundException {
 
     @Test
     @DisabledForJreRange(max = JRE.JAVA_8)
-    public void testObjectInputStream() throws ClassNotFoundException {
+    void testObjectInputStream() throws ClassNotFoundException {
         testNestHostWithJavaVersion("java.io.ObjectInputStream");
     }
 
     @Test
     @DisabledForJreRange(min = JRE.JAVA_9)
-    public void testObjectInputStreamJDK8() {
+    void testObjectInputStreamJDK8() {
         assertThrowsExactly(UnsupportedOperationException.class, () -> testNestHostWithJavaVersion("java.io.ObjectInputStream"));
     }
 
diff --git a/src/test/java/org/apache/bcel/verifier/VerifyJavaHomesTest.java b/src/test/java/org/apache/bcel/verifier/VerifyJavaHomesTest.java
@@ -41,7 +41,7 @@ public class VerifyJavaHomesTest extends AbstractVerifierTest {
     @Disabled("Run once in a while, it takes a very long time.")
     @ParameterizedTest
     @MethodSource("org.apache.bcel.generic.JavaHome#streamJarEntryClassName")
-    public void testJarEntryClassName(final String name) throws ClassNotFoundException {
+    void testJarEntryClassName(final String name) throws ClassNotFoundException {
         // System.out.println(jarEntry.getName());
         // Skip $ classes for now
         count++;
diff --git a/src/test/java/org/apache/bcel/verifier/VerifyJavaMathTest.java b/src/test/java/org/apache/bcel/verifier/VerifyJavaMathTest.java
@@ -29,7 +29,7 @@ public class VerifyJavaMathTest extends AbstractVerifierTest {
     @Test
     @Disabled
     //@EnabledOnJre(JRE.JAVA_8)
-    public void testBigDecimal() throws ClassNotFoundException {
+    void testBigDecimal() throws ClassNotFoundException {
         assertTrue(doAllPasses("java.math.BigDecimal"));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,7 @@ void test() throws Exception {`
`497`	`497`	`"src/test/resources/jpms/java18/commons-io/module-info.class",`
`498`	`498`	`"src/test/resources/jpms/java19-ea/commons-io/module-info.class"})`
`499`	`499`	`// @formatter:on`
`500`		`- public void test(final String first) throws Exception {`
	`500`	`+ void test(final String first) throws Exception {`
`501`	`501`	`try (InputStream inputStream = Files.newInputStream(Paths.get(first))) {`
`502`	`502`	`test(inputStream);`
`503`	`503`	`}`
`@@ -517,7 +517,7 @@ public void test(final String first) throws Exception {`
`517`	`517`	`"javax.annotation.ManagedBean", // contains attribute AnnotationDefault`
`518`	`518`	`"javax.management.remote.rmi.RMIConnectionImpl_Stub"}) // contains attribute Synthetic`
`519`	`519`	`// @formatter:on`
`520`		`- public void testClass(final String className) throws Exception {`
	`520`	`+ void testClass(final String className) throws Exception {`
`521`	`521`	`testJavaClass(SyntheticRepository.getInstance().loadClass(className));`
`522`	`522`	`}`
`523`	`523`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ private void testJar(final Path path) throws Exception {`
`77`	`77`
`78`	`78`	`@ParameterizedTest`
`79`	`79`	`@MethodSource("org.apache.bcel.generic.JavaHome#streamJarPath")`
`80`		`- public void testPerformance(final Path path) throws Exception {`
	`80`	`+ void testPerformance(final Path path) throws Exception {`
`81`	`81`	`assertDoesNotThrow(() -> testJar(path));`
`82`	`82`	`}`
`83`	`83`