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 2022/11/15 14:48:37 UTC
[commons-bcel] branch master updated (3b615d54 -> a6ba162c)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
from 3b615d54 Use ternary expression
new e94b891e Organize imports
new 7dd5cf75 Sort members
new a6ba162c Use camel case
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../ConstantPoolModuleToStringTestCase.java | 58 +++++++++++-----------
.../bcel/classfile/ConstantPoolTestCase.java | 56 ++++++++++-----------
.../apache/bcel/generic/EmptyVisitorTestCase.java | 10 ++--
.../bcel/verifier/VerifierArrayAccessTestCase.java | 3 +-
.../org/apache/bcel/verifier/VerifierTestCase.java | 27 +++++-----
.../verifier/tests/TestArrayAccess03Creator.java | 34 ++++++-------
.../verifier/tests/TestArrayAccess04Creator.java | 32 ++++++------
.../bcel/verifier/tests/TestReturn01Creator.java | 28 +++++------
8 files changed, 125 insertions(+), 123 deletions(-)
[commons-bcel] 01/03: Organize imports
Posted by gg...@apache.org.
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 e94b891e4cefe68bc4b71b0705feedfca393a27a
Author: Gary David Gregory (Code signing key) <gg...@apache.org>
AuthorDate: Tue Nov 15 09:39:27 2022 -0500
Organize imports
---
src/test/java/org/apache/bcel/generic/EmptyVisitorTestCase.java | 4 ++--
.../java/org/apache/bcel/verifier/VerifierArrayAccessTestCase.java | 3 ++-
src/test/java/org/apache/bcel/verifier/VerifierTestCase.java | 1 +
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/apache/bcel/generic/EmptyVisitorTestCase.java b/src/test/java/org/apache/bcel/generic/EmptyVisitorTestCase.java
index 462818b3..cc957b84 100644
--- a/src/test/java/org/apache/bcel/generic/EmptyVisitorTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/EmptyVisitorTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.bcel.generic;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.bcel.classfile.Code;
import org.apache.bcel.classfile.JavaClass;
import org.apache.bcel.classfile.Method;
@@ -23,8 +25,6 @@ import org.apache.bcel.util.SyntheticRepository;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
-import static org.junit.jupiter.api.Assertions.fail;
-
class EmptyVisitorTestCase {
/*
diff --git a/src/test/java/org/apache/bcel/verifier/VerifierArrayAccessTestCase.java b/src/test/java/org/apache/bcel/verifier/VerifierArrayAccessTestCase.java
index 79bcb21b..35b6004c 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifierArrayAccessTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierArrayAccessTestCase.java
@@ -18,14 +18,15 @@
package org.apache.bcel.verifier;
import java.io.IOException;
+
import org.apache.bcel.verifier.tests.TestArrayAccess02Creator;
import org.apache.bcel.verifier.tests.TestArrayAccess03Creator;
import org.apache.bcel.verifier.tests.TestArrayAccess04DoubleCreator;
import org.apache.bcel.verifier.tests.TestArrayAccess04FloatCreator;
import org.apache.bcel.verifier.tests.TestArrayAccess04IntCreator;
import org.apache.bcel.verifier.tests.TestArrayAccess04LongCreator;
-import org.apache.bcel.verifier.tests.TestArrayAccess04UnknownCreator;
import org.apache.bcel.verifier.tests.TestArrayAccess04ShortCreator;
+import org.apache.bcel.verifier.tests.TestArrayAccess04UnknownCreator;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java b/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
index 874f885b..f176a23b 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
[commons-bcel] 02/03: Sort members
Posted by gg...@apache.org.
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) <gg...@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 {
[commons-bcel] 03/03: Use camel case
Posted by gg...@apache.org.
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 a6ba162c56844cbf9f8449ceab907a8a621c719f
Author: Gary David Gregory (Code signing key) <gg...@apache.org>
AuthorDate: Tue Nov 15 09:48:32 2022 -0500
Use camel case
---
.../verifier/tests/TestArrayAccess03Creator.java | 34 +++++++++++-----------
.../verifier/tests/TestArrayAccess04Creator.java | 32 ++++++++++----------
.../bcel/verifier/tests/TestReturn01Creator.java | 28 +++++++++---------
3 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java
index 04f3cc81..59b138d5 100644
--- a/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java
@@ -34,62 +34,62 @@ import org.apache.bcel.generic.PUSH;
import org.apache.bcel.generic.Type;
public class TestArrayAccess03Creator extends TestCreator {
- private final InstructionFactory _factory;
- private final ConstantPoolGen _cp;
- private final ClassGen _cg;
+ private final InstructionFactory factory;
+ private final ConstantPoolGen cp;
+ private final ClassGen cg;
public TestArrayAccess03Creator() {
- _cg = new ClassGen(TEST_PACKAGE + ".TestArrayAccess03", "java.lang.Object", "TestArrayAccess03.java", Const.ACC_PUBLIC | Const.ACC_SUPER,
+ cg = new ClassGen(TEST_PACKAGE + ".TestArrayAccess03", "java.lang.Object", "TestArrayAccess03.java", Const.ACC_PUBLIC | Const.ACC_SUPER,
new String[] {});
- _cp = _cg.getConstantPool();
- _factory = new InstructionFactory(_cg, _cp);
+ cp = cg.getConstantPool();
+ factory = new InstructionFactory(cg, cp);
}
@Override
public void create(final OutputStream out) throws IOException {
createMethod_0();
createMethod_1();
- _cg.getJavaClass().dump(out);
+ cg.getJavaClass().dump(out);
}
private void createMethod_0() {
final InstructionList il = new InstructionList();
final MethodGen method = new MethodGen(Const.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] {}, "<init>", TEST_PACKAGE + ".TestArrayAccess03", il,
- _cp);
+ cp);
final InstructionHandle ih_0 = il.append(InstructionFactory.createLoad(Type.OBJECT, 0));
assertNotNull(ih_0); // TODO why is this not used
- il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
+ il.append(factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
final InstructionHandle ih_4 = il.append(InstructionFactory.createReturn(Type.VOID));
assertNotNull(ih_4); // TODO why is this not used
method.setMaxStack();
method.setMaxLocals();
- _cg.addMethod(method.getMethod());
+ cg.addMethod(method.getMethod());
il.dispose();
}
private void createMethod_1() {
final InstructionList il = new InstructionList();
final MethodGen method = new MethodGen(Const.ACC_PUBLIC | Const.ACC_STATIC, Type.VOID, new Type[] {Type.OBJECT}, new String[] {"arg0"}, "test",
- TEST_PACKAGE + ".TestArrayAccess03", il, _cp);
+ TEST_PACKAGE + ".TestArrayAccess03", il, cp);
- final InstructionHandle ih_0 = il.append(new PUSH(_cp, 1));
+ final InstructionHandle ih_0 = il.append(new PUSH(cp, 1));
assertNotNull(ih_0); // TODO why is this not used
- il.append(_factory.createNewArray(new ObjectType(TEST_PACKAGE + ".TestArrayAccess03"), (short) 1));
+ il.append(factory.createNewArray(new ObjectType(TEST_PACKAGE + ".TestArrayAccess03"), (short) 1));
il.append(InstructionFactory.createStore(Type.OBJECT, 1));
final InstructionHandle ih_5 = il.append(InstructionFactory.createLoad(Type.OBJECT, 0));
assertNotNull(ih_5); // TODO why is this not used
- il.append(new PUSH(_cp, 0));
- il.append(_factory.createNew(TEST_PACKAGE + ".TestArrayAccess03"));
+ il.append(new PUSH(cp, 0));
+ il.append(factory.createNew(TEST_PACKAGE + ".TestArrayAccess03"));
il.append(InstructionConst.DUP);
- il.append(_factory.createInvoke(TEST_PACKAGE + ".TestArrayAccess03", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
+ il.append(factory.createInvoke(TEST_PACKAGE + ".TestArrayAccess03", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
il.append(InstructionConst.AASTORE);
final InstructionHandle ih_15 = il.append(InstructionFactory.createReturn(Type.VOID));
assertNotNull(ih_15); // TODO why is this not used
method.setMaxStack();
method.setMaxLocals();
- _cg.addMethod(method.getMethod());
+ cg.addMethod(method.getMethod());
il.dispose();
}
}
diff --git a/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java
index c02d6e98..463dd9d9 100644
--- a/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java
@@ -34,18 +34,18 @@ import org.apache.bcel.generic.PUSH;
import org.apache.bcel.generic.Type;
public abstract class TestArrayAccess04Creator extends TestCreator {
- private final InstructionFactory _factory;
- private final ConstantPoolGen _cp;
- private final ClassGen _cg;
+ private final InstructionFactory factory;
+ private final ConstantPoolGen cp;
+ private final ClassGen cg;
private final Type primitiveType;
private final String genClassSuffix;
protected TestArrayAccess04Creator(final Type primitiveType, final String genClassSuffix) {
- _cg = new ClassGen(TEST_PACKAGE + ".TestArrayAccess04" + genClassSuffix, "java.lang.Object", "TestArrayAccess04.java", Const.ACC_PUBLIC | Const.ACC_SUPER,
+ cg = new ClassGen(TEST_PACKAGE + ".TestArrayAccess04" + genClassSuffix, "java.lang.Object", "TestArrayAccess04.java", Const.ACC_PUBLIC | Const.ACC_SUPER,
new String[] {});
- _cp = _cg.getConstantPool();
- _factory = new InstructionFactory(_cg, _cp);
+ cp = cg.getConstantPool();
+ factory = new InstructionFactory(cg, cp);
this.primitiveType = primitiveType;
this.genClassSuffix = genClassSuffix;
}
@@ -54,47 +54,47 @@ public abstract class TestArrayAccess04Creator extends TestCreator {
public void create(final OutputStream out) throws IOException {
createMethod_0();
createMethod_1();
- _cg.getJavaClass().dump(out);
+ cg.getJavaClass().dump(out);
}
private void createMethod_0() {
final InstructionList il = new InstructionList();
final MethodGen method = new MethodGen(Const.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] {}, "<init>", TEST_PACKAGE + ".TestArrayAccess04", il,
- _cp);
+ cp);
final InstructionHandle ih_0 = il.append(InstructionFactory.createLoad(Type.OBJECT, 0));
assertNotNull(ih_0); // TODO why is this not used
- il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
+ il.append(factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
final InstructionHandle ih_4 = il.append(InstructionFactory.createReturn(Type.VOID));
assertNotNull(ih_4); // TODO why is this not used
method.setMaxStack();
method.setMaxLocals();
- _cg.addMethod(method.getMethod());
+ cg.addMethod(method.getMethod());
il.dispose();
}
private void createMethod_1() {
final InstructionList il = new InstructionList();
final MethodGen method = new MethodGen(Const.ACC_PUBLIC | Const.ACC_STATIC, Type.VOID, new Type[] {Type.OBJECT}, new String[] {"arg0"}, "test",
- TEST_PACKAGE + ".TestArrayAccess04" + genClassSuffix, il, _cp);
+ TEST_PACKAGE + ".TestArrayAccess04" + genClassSuffix, il, cp);
- final InstructionHandle ih_0 = il.append(new PUSH(_cp, 1));
+ final InstructionHandle ih_0 = il.append(new PUSH(cp, 1));
assertNotNull(ih_0); // TODO why is this not used
- il.append(_factory.createNewArray(Type.OBJECT, (short) 1));
+ il.append(factory.createNewArray(Type.OBJECT, (short) 1));
il.append(InstructionFactory.createStore(Type.OBJECT, 1));
- final InstructionHandle ih_5 = il.append(new PUSH(_cp, 1));
+ final InstructionHandle ih_5 = il.append(new PUSH(cp, 1));
assertNotNull(ih_5); // TODO why is this not used
il.append(InstructionFactory.createStore(primitiveType, 2));
final InstructionHandle ih_7 = il.append(InstructionFactory.createLoad(Type.OBJECT, 1));
assertNotNull(ih_7); // TODO why is this not used
- il.append(new PUSH(_cp, 0));
+ il.append(new PUSH(cp, 0));
il.append(InstructionFactory.createLoad(primitiveType, 2));
il.append(InstructionConst.AASTORE);
final InstructionHandle ih_11 = il.append(InstructionFactory.createReturn(Type.VOID));
assertNotNull(ih_11); // TODO why is this not used
method.setMaxStack();
method.setMaxLocals();
- _cg.addMethod(method.getMethod());
+ cg.addMethod(method.getMethod());
il.dispose();
}
}
diff --git a/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java b/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java
index 12811ae3..7e13803e 100644
--- a/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java
@@ -32,54 +32,54 @@ import org.apache.bcel.generic.MethodGen;
import org.apache.bcel.generic.Type;
public class TestReturn01Creator extends TestCreator {
- private final InstructionFactory _factory;
- private final ConstantPoolGen _cp;
- private final ClassGen _cg;
+ private final InstructionFactory factory;
+ private final ConstantPoolGen cp;
+ private final ClassGen cg;
public TestReturn01Creator() {
- _cg = new ClassGen(TEST_PACKAGE + ".TestReturn01", "java.lang.Object", "TestReturn01.java", Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] {});
+ cg = new ClassGen(TEST_PACKAGE + ".TestReturn01", "java.lang.Object", "TestReturn01.java", Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] {});
- _cp = _cg.getConstantPool();
- _factory = new InstructionFactory(_cg, _cp);
+ cp = cg.getConstantPool();
+ factory = new InstructionFactory(cg, cp);
}
@Override
public void create(final OutputStream out) throws IOException {
createMethod_0();
createMethod_1();
- _cg.getJavaClass().dump(out);
+ cg.getJavaClass().dump(out);
}
private void createMethod_0() {
final InstructionList il = new InstructionList();
- final MethodGen method = new MethodGen(Const.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] {}, "<init>", TEST_PACKAGE + ".TestReturn01", il, _cp);
+ final MethodGen method = new MethodGen(Const.ACC_PUBLIC, Type.VOID, Type.NO_ARGS, new String[] {}, "<init>", TEST_PACKAGE + ".TestReturn01", il, cp);
final InstructionHandle ih_0 = il.append(InstructionFactory.createLoad(Type.OBJECT, 0));
assertNotNull(ih_0); // TODO why is this not used
- il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
+ il.append(factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
final InstructionHandle ih_4 = il.append(InstructionFactory.createReturn(Type.VOID));
assertNotNull(ih_4); // TODO why is this not used
method.setMaxStack();
method.setMaxLocals();
- _cg.addMethod(method.getMethod());
+ cg.addMethod(method.getMethod());
il.dispose();
}
private void createMethod_1() {
final InstructionList il = new InstructionList();
final MethodGen method = new MethodGen(Const.ACC_PUBLIC | Const.ACC_STATIC, Type.VOID, Type.NO_ARGS, new String[] {}, "foo",
- TEST_PACKAGE + ".TestReturn01", il, _cp);
+ TEST_PACKAGE + ".TestReturn01", il, cp);
- final InstructionHandle ih_0 = il.append(_factory.createNew("java.lang.Object"));
+ final InstructionHandle ih_0 = il.append(factory.createNew("java.lang.Object"));
assertNotNull(ih_0); // TODO why is this not used
il.append(InstructionConst.DUP);
- il.append(_factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
+ il.append(factory.createInvoke("java.lang.Object", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
il.append(InstructionConst.NOP);
final InstructionHandle ih_8 = il.append(InstructionFactory.createReturn(Type.OBJECT));
assertNotNull(ih_8); // TODO why is this not used
method.setMaxStack();
method.setMaxLocals();
- _cg.addMethod(method.getMethod());
+ cg.addMethod(method.getMethod());
il.dispose();
}
}