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-bcel.git
The following commit(s) were added to refs/heads/master by this push:
new dfeddc81 Use JUnit 5 convention for test method visibility
dfeddc81 is described below
commit dfeddc8108f85a67e55ee3d4b95d20ad70f03a05
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jun 7 09:48:10 2025 -0400
Use JUnit 5 convention for test method visibility
---
src/test/java/org/apache/bcel/PLSETest.java | 2 +-
.../org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java | 2 +-
.../org/apache/bcel/classfile/ConstantPoolModuleToStringTest.java | 4 ++--
.../org/apache/bcel/classfile/InvalidMethodSigantureTest.java | 2 +-
src/test/java/org/apache/bcel/classfile/JDKClassDumpTest.java | 2 +-
src/test/java/org/apache/bcel/generic/EmptyVisitorTest.java | 2 +-
src/test/java/org/apache/bcel/generic/FieldGenTest.java | 2 +-
src/test/java/org/apache/bcel/generic/JdkGenericDumpTest.java | 6 +++---
src/test/java/org/apache/bcel/generic/TypeTest.java | 2 +-
src/test/java/org/apache/bcel/util/BCELifierTest.java | 6 +++---
src/test/java/org/apache/bcel/util/Class2HTMLTest.java | 2 +-
src/test/java/org/apache/bcel/util/ModularRuntimeImageTest.java | 8 ++++----
src/test/java/org/apache/bcel/verifier/JiraBcel369Test.java | 2 +-
src/test/java/org/apache/bcel/verifier/JiraBcel370Test.java | 4 ++--
src/test/java/org/apache/bcel/verifier/VerifierTest.java | 4 ++--
src/test/java/org/apache/bcel/verifier/VerifyJavaHomesTest.java | 2 +-
src/test/java/org/apache/bcel/verifier/VerifyJavaMathTest.java | 2 +-
17 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/test/java/org/apache/bcel/PLSETest.java
b/src/test/java/org/apache/bcel/PLSETest.java
index 64f11ff3..6d5cb5f7 100644
--- a/src/test/java/org/apache/bcel/PLSETest.java
+++ b/src/test/java/org/apache/bcel/PLSETest.java
@@ -144,7 +144,7 @@ public class PLSETest extends AbstractTest {
*/
@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
index 1aeec13a..9347cfbd 100644
--- a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java
+++ b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTest.java
@@ -47,7 +47,7 @@ public final class ConstantPoolModuleAccessTest {
@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
index 16381af7..b30f703f 100644
---
a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTest.java
+++
b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTest.java
@@ -497,7 +497,7 @@ public class ConstantPoolModuleToStringTest {
"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 class ConstantPoolModuleToStringTest {
"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
index 4b37a83a..3c09d0cd 100644
--- a/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTest.java
+++ b/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTest.java
@@ -74,7 +74,7 @@ public class InvalidMethodSigantureTest {
@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
index b203b4ab..22c9377a 100644
--- a/src/test/java/org/apache/bcel/classfile/JDKClassDumpTest.java
+++ b/src/test/java/org/apache/bcel/classfile/JDKClassDumpTest.java
@@ -77,7 +77,7 @@ public class JDKClassDumpTest {
@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
index 293d71bf..592416df 100644
--- 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
index 7fd8cc43..ad496774 100644
--- 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
index 50a260fd..4ef567b1 100644
--- a/src/test/java/org/apache/bcel/generic/JdkGenericDumpTest.java
+++ b/src/test/java/org/apache/bcel/generic/JdkGenericDumpTest.java
@@ -173,20 +173,20 @@ public class JdkGenericDumpTest {
@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
index e836ed37..821ea145 100644
--- a/src/test/java/org/apache/bcel/generic/TypeTest.java
+++ b/src/test/java/org/apache/bcel/generic/TypeTest.java
@@ -84,7 +84,7 @@ public class TypeTest {
"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
index fd7ecdfe..a6491e0c 100644
--- a/src/test/java/org/apache/bcel/util/BCELifierTest.java
+++ b/src/test/java/org/apache/bcel/util/BCELifierTest.java
@@ -111,7 +111,7 @@ public class BCELifierTest extends AbstractTest {
"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 @@ public class BCELifierTest extends AbstractTest {
"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 @@ public class BCELifierTest extends AbstractTest {
@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
index a7c585a7..0aee2d8a 100644
--- 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
index 516a5f51..f7b57d94 100644
--- a/src/test/java/org/apache/bcel/util/ModularRuntimeImageTest.java
+++ b/src/test/java/org/apache/bcel/util/ModularRuntimeImageTest.java
@@ -45,7 +45,7 @@ public class ModularRuntimeImageTest {
@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);
@@ -53,7 +53,7 @@ public class ModularRuntimeImageTest {
@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);
@@ -61,7 +61,7 @@ public class ModularRuntimeImageTest {
@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);
@@ -69,7 +69,7 @@ public class ModularRuntimeImageTest {
@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
index 3155d06c..b5ab34eb 100644
--- a/src/test/java/org/apache/bcel/verifier/JiraBcel369Test.java
+++ b/src/test/java/org/apache/bcel/verifier/JiraBcel369Test.java
@@ -118,7 +118,7 @@ Slots used: 0 MaxStack: 1.
*/
@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
index 6e3e181c..39541a1d 100644
--- 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 class JiraBcel370Test extends AbstractTest {
"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
index 8f9a308c..7cacac19 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifierTest.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierTest.java
@@ -141,13 +141,13 @@ public class VerifierTest {
@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
index 9959f92f..fe73f1cc 100644
--- 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
index b2d68956..0926f831 100644
--- 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"));
}
