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) <ggreg...@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(); } }