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
commit 7dd5cf75c091515a2e260c1db0726d92cc454152
Author: Gary David Gregory (Code signing key) <ggreg...@apache.org>
AuthorDate: Tue Nov 15 09:44:39 2022 -0500
Sort members
---
.../ConstantPoolModuleToStringTestCase.java | 58 +++++++++++-----------
.../bcel/classfile/ConstantPoolTestCase.java | 56 ++++++++++-----------
.../apache/bcel/generic/EmptyVisitorTestCase.java | 6 +--
.../org/apache/bcel/verifier/VerifierTestCase.java | 26 +++++-----
4 files changed, 73 insertions(+), 73 deletions(-)
diff --git
a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTestCase.java
b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTestCase.java
index f683da67..b482efe0 100644
---
a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTestCase.java
+++
b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTestCase.java
@@ -449,17 +449,21 @@ public class ConstantPoolModuleToStringTestCase {
}
}
- @ParameterizedTest
- @ValueSource(strings = {
- // @formatter:off
- "src/test/resources/jpms/java11/commons-io/module-info.class",
- "src/test/resources/jpms/java17/commons-io/module-info.class",
- "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 {
- try (final InputStream inputStream =
Files.newInputStream(Paths.get(first))) {
- test(inputStream);
+ private static void test(final InputStream inputStream) throws IOException
{
+ final ClassParser classParser = new ClassParser(inputStream,
"module-info.class");
+ final JavaClass javaClass = classParser.parse();
+ testJavaClass(javaClass);
+ }
+
+ private static void testJavaClass(final JavaClass javaClass) {
+ final ConstantPool constantPool = javaClass.getConstantPool();
+ final ToStringVisitor visitor = new ToStringVisitor(constantPool);
+ final DescendingVisitor descendingVisitor = new
DescendingVisitor(javaClass, visitor);
+ try {
+ javaClass.accept(descendingVisitor);
+ assertNotNull(visitor.toString());
+ } catch (Exception | Error e) {
+ fail(visitor.toString(), e);
}
}
@@ -474,6 +478,20 @@ public class ConstantPoolModuleToStringTestCase {
}
}
+ @ParameterizedTest
+ @ValueSource(strings = {
+ // @formatter:off
+ "src/test/resources/jpms/java11/commons-io/module-info.class",
+ "src/test/resources/jpms/java17/commons-io/module-info.class",
+ "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 {
+ try (final InputStream inputStream =
Files.newInputStream(Paths.get(first))) {
+ test(inputStream);
+ }
+ }
+
@ParameterizedTest
@ValueSource(strings = {
// @formatter:off
@@ -490,22 +508,4 @@ public class ConstantPoolModuleToStringTestCase {
public void testClass(final String className) throws Exception {
testJavaClass(SyntheticRepository.getInstance().loadClass(className));
}
-
- private static void test(final InputStream inputStream) throws IOException
{
- final ClassParser classParser = new ClassParser(inputStream,
"module-info.class");
- final JavaClass javaClass = classParser.parse();
- testJavaClass(javaClass);
- }
-
- private static void testJavaClass(final JavaClass javaClass) {
- final ConstantPool constantPool = javaClass.getConstantPool();
- final ToStringVisitor visitor = new ToStringVisitor(constantPool);
- final DescendingVisitor descendingVisitor = new
DescendingVisitor(javaClass, visitor);
- try {
- javaClass.accept(descendingVisitor);
- assertNotNull(visitor.toString());
- } catch (Exception | Error e) {
- fail(visitor.toString(), e);
- }
- }
}
diff --git a/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
b/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
index 4b0bbf35..fb8d03eb 100644
--- a/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
@@ -49,34 +49,6 @@ public class ConstantPoolTestCase extends AbstractTestCase {
return methodGen.getInstructionList().getInstructionHandles();
}
- @Test
- public void testConstantToString() throws ClassNotFoundException {
- final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME +
".data.SimpleClassWithDefaultConstructor");
- final ConstantPoolGen cp = new
ConstantPoolGen(clazz.getConstantPool());
- final Method[] methods = clazz.getMethods();
- for (final Method method : methods) {
- if (method.getName().equals("<init>")) {
- for (final InstructionHandle instructionHandle :
getInstructionHandles(clazz, cp, method)) {
- final String instruction =
instructionHandle.getInstruction().toString(cp.getConstantPool());
- assertNotNull(instruction);
- switch (instructionHandle.getPosition()) {
- case 0:
- assertEquals("aload_0", instruction);
- break;
- case 1:
- assertEquals("invokespecial
java/lang/Object/<init>()V", instruction);
- break;
- case 4:
- assertEquals("return", instruction);
- break;
- default:
- break;
- }
- }
- }
- }
- }
-
@Test
public void testClassWithDoubleConstantPoolItem() throws
ClassNotFoundException, IOException {
try (final ClassPath cp = new
ClassPath("target/test-classes/org/apache/bcel/classfile")) {
@@ -117,6 +89,34 @@ public class ConstantPoolTestCase extends AbstractTestCase {
}
}
+ @Test
+ public void testConstantToString() throws ClassNotFoundException {
+ final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME +
".data.SimpleClassWithDefaultConstructor");
+ final ConstantPoolGen cp = new
ConstantPoolGen(clazz.getConstantPool());
+ final Method[] methods = clazz.getMethods();
+ for (final Method method : methods) {
+ if (method.getName().equals("<init>")) {
+ for (final InstructionHandle instructionHandle :
getInstructionHandles(clazz, cp, method)) {
+ final String instruction =
instructionHandle.getInstruction().toString(cp.getConstantPool());
+ assertNotNull(instruction);
+ switch (instructionHandle.getPosition()) {
+ case 0:
+ assertEquals("aload_0", instruction);
+ break;
+ case 1:
+ assertEquals("invokespecial
java/lang/Object/<init>()V", instruction);
+ break;
+ case 4:
+ assertEquals("return", instruction);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ }
+ }
+
@Test
public void testTooManyConstants() throws ClassNotFoundException {
final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME +
".data.SimpleClassWithDefaultConstructor");
diff --git a/src/test/java/org/apache/bcel/generic/EmptyVisitorTestCase.java
b/src/test/java/org/apache/bcel/generic/EmptyVisitorTestCase.java
index cc957b84..d999851e 100644
--- a/src/test/java/org/apache/bcel/generic/EmptyVisitorTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/EmptyVisitorTestCase.java
@@ -63,17 +63,17 @@ class EmptyVisitorTestCase {
for (final InstructionHandle instructionHandle :
instructionList) {
instructionHandle.accept(new EmptyVisitor() {
@Override
- public void visitIMPDEP1(final IMPDEP1 obj) {
+ public void visitBREAKPOINT(final BREAKPOINT obj) {
fail(RESERVED_OPCODE);
}
@Override
- public void visitIMPDEP2(final IMPDEP2 obj) {
+ public void visitIMPDEP1(final IMPDEP1 obj) {
fail(RESERVED_OPCODE);
}
@Override
- public void visitBREAKPOINT(final BREAKPOINT obj) {
+ public void visitIMPDEP2(final IMPDEP2 obj) {
fail(RESERVED_OPCODE);
}
});
diff --git a/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
b/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
index f176a23b..8a9912a7 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
@@ -40,9 +40,8 @@ import org.junit.jupiter.api.Test;
public class VerifierTestCase {
- @AfterEach
- public void afterEach() {
- VerifierFactory.clear();
+ private static File getJarFile(final Class<?> clazz) throws
URISyntaxException {
+ return new
File(clazz.getProtectionDomain().getCodeSource().getLocation().toURI());
}
private static void testDefaultMethodValidation(final String className,
final String... excludes) throws ClassNotFoundException {
@@ -69,10 +68,6 @@ public class VerifierTestCase {
}
}
- private static File getJarFile(final Class<?> clazz) throws
URISyntaxException {
- return new
File(clazz.getProtectionDomain().getCodeSource().getLocation().toURI());
- }
-
private static void testJarFile(final File file, final String... excludes)
throws IOException, ClassNotFoundException {
try (JarFile jarFile = new JarFile(file)) {
final Enumeration<JarEntry> entries = jarFile.entries();
@@ -106,25 +101,30 @@ public class VerifierTestCase {
}
}
- @Test
- public void testCollection() throws ClassNotFoundException {
- testDefaultMethodValidation("java.util.Collection");
+ @AfterEach
+ public void afterEach() {
+ VerifierFactory.clear();
}
-
+
@Test
public void testArrayUtils() throws ClassNotFoundException {
testNestHostWithJavaVersion("org.apache.commons.lang.ArrayUtils");
}
@Test
- public void testDefinitionImpl() throws ClassNotFoundException {
- testNestHostWithJavaVersion("com.ibm.wsdl.DefinitionImpl");
+ public void testCollection() throws ClassNotFoundException {
+ testDefaultMethodValidation("java.util.Collection");
}
@Test
public void testCommonsLang1() throws IOException, URISyntaxException,
ClassNotFoundException {
testJarFile(getJarFile(org.apache.commons.lang.StringUtils.class),
"ArrayUtils", "SerializationUtils");
}
+
+ @Test
+ public void testDefinitionImpl() throws ClassNotFoundException {
+ testNestHostWithJavaVersion("com.ibm.wsdl.DefinitionImpl");
+ }
@Test
public void testWSDL() throws IOException, URISyntaxException,
ClassNotFoundException {
