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 1a2e1c04 Format tweaks 1a2e1c04 is described below commit 1a2e1c049d0b94d6b3517d24524e9d84b0ddbfba Author: Gary Gregory <gardgreg...@gmail.com> AuthorDate: Mon Aug 15 14:02:16 2022 -0400 Format tweaks --- .../org/apache/bcel/AnnotationAccessFlagTestCase.java | 4 ++-- .../bcel/AnnotationDefaultAttributeTestCase.java | 2 +- .../java/org/apache/bcel/AnonymousClassTestCase.java | 8 ++++---- .../java/org/apache/bcel/CounterVisitorTestCase.java | 2 +- .../apache/bcel/EnclosingMethodAttributeTestCase.java | 6 +++--- .../java/org/apache/bcel/EnumAccessFlagTestCase.java | 4 ++-- .../org/apache/bcel/InstructionFinderTestCase.java | 2 +- .../apache/bcel/generic/FieldAnnotationsTestCase.java | 18 +++++++++--------- .../generic/GeneratingAnnotatedClassesTestCase.java | 14 +++++++------- .../bcel/verifier/tests/TestArrayAccess02Creator.java | 12 ++++++------ .../bcel/verifier/tests/TestArrayAccess03Creator.java | 12 ++++++------ .../bcel/verifier/tests/TestArrayAccess04Creator.java | 6 +++--- .../bcel/verifier/tests/TestReturn01Creator.java | 6 +++--- .../bcel/verifier/tests/TestReturn03Creator.java | 6 +++--- 14 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java b/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java index 232695fa..9ac5e811 100644 --- a/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java +++ b/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java @@ -34,10 +34,10 @@ public class AnnotationAccessFlagTestCase extends AbstractTestCase @Test public void testAnnotationClassSaysItIs() throws ClassNotFoundException { - JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.SimpleAnnotation"); + JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleAnnotation"); assertTrue(clazz.isAnnotation(), "Expected SimpleAnnotation class to say it was an annotation - but it didn't !"); - clazz = getTestClass(PACKAGE_BASE_NAME+".data.SimpleClass"); + clazz = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleClass"); assertFalse(clazz.isAnnotation(), "Expected SimpleClass class to say it was not an annotation - but it didn't !"); } diff --git a/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java b/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java index 0593a8b0..ebcd7bbf 100644 --- a/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java +++ b/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java @@ -37,7 +37,7 @@ public class AnnotationDefaultAttributeTestCase extends AbstractTestCase @Test public void testMethodAnnotations() throws ClassNotFoundException { - final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.SimpleAnnotation"); + final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleAnnotation"); final Method m = getMethod(clazz, "fruit"); final AnnotationDefault a = (AnnotationDefault) findAttribute( "AnnotationDefault", m.getAttributes()); diff --git a/src/test/java/org/apache/bcel/AnonymousClassTestCase.java b/src/test/java/org/apache/bcel/AnonymousClassTestCase.java index 69d43283..50425160 100644 --- a/src/test/java/org/apache/bcel/AnonymousClassTestCase.java +++ b/src/test/java/org/apache/bcel/AnonymousClassTestCase.java @@ -30,7 +30,7 @@ public class AnonymousClassTestCase extends AbstractTestCase public void testAnonymousInnerClassIsAnonymous() throws ClassNotFoundException { - final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AnonymousClassTest$1"); + final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AnonymousClassTest$1"); assertTrue(clazz.isAnonymous(), "anonymous inner classes are anonymous"); assertTrue(clazz.isNested(), "anonymous inner classes are anonymous"); } @@ -39,7 +39,7 @@ public class AnonymousClassTestCase extends AbstractTestCase public void testNamedInnerClassIsNotAnonymous() throws ClassNotFoundException { - final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AnonymousClassTest$X"); + final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AnonymousClassTest$X"); assertFalse(clazz.isAnonymous(), "regular inner classes are not anonymous"); assertTrue(clazz.isNested(), "regular inner classes are nested"); } @@ -47,7 +47,7 @@ public class AnonymousClassTestCase extends AbstractTestCase @Test public void testRegularClassIsNotAnonymous() throws ClassNotFoundException { - final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AnonymousClassTest"); + final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AnonymousClassTest"); assertFalse(clazz.isAnonymous(), "regular outer classes are not anonymous"); assertFalse(clazz.isNested(), "regular outer classes are not nested"); } @@ -56,7 +56,7 @@ public class AnonymousClassTestCase extends AbstractTestCase public void testStaticInnerClassIsNotAnonymous() throws ClassNotFoundException { - final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AnonymousClassTest$Y"); + final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AnonymousClassTest$Y"); assertFalse(clazz.isAnonymous(), "regular static inner classes are not anonymous"); assertTrue(clazz.isNested(), "regular static inner classes are nested"); } diff --git a/src/test/java/org/apache/bcel/CounterVisitorTestCase.java b/src/test/java/org/apache/bcel/CounterVisitorTestCase.java index 2d870a1f..f442d3fe 100644 --- a/src/test/java/org/apache/bcel/CounterVisitorTestCase.java +++ b/src/test/java/org/apache/bcel/CounterVisitorTestCase.java @@ -28,7 +28,7 @@ public class CounterVisitorTestCase extends AbstractCounterVisitorTestCase @Override protected JavaClass getTestClass() throws ClassNotFoundException { - return getTestClass(PACKAGE_BASE_NAME+".data.MarkedType"); + return getTestClass(PACKAGE_BASE_NAME + ".data.MarkedType"); } @Test diff --git a/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java b/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java index ed0886cd..141b9c01 100644 --- a/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java +++ b/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java @@ -40,7 +40,7 @@ public class EnclosingMethodAttributeTestCase extends AbstractTestCase public void testAttributeSerializtion() throws ClassNotFoundException, IOException { - final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AttributeTestClassEM02$1"); + final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AttributeTestClassEM02$1"); final ConstantPool pool = clazz.getConstantPool(); final Attribute[] encMethodAttrs = findAttribute("EnclosingMethod", clazz); assertEquals(1, encMethodAttrs.length, "Wrong number of EnclosingMethod attributes"); @@ -67,7 +67,7 @@ public class EnclosingMethodAttributeTestCase extends AbstractTestCase public void testCheckClassLevelNamedInnerClass() throws ClassNotFoundException { - final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AttributeTestClassEM02$1"); + final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AttributeTestClassEM02$1"); final ConstantPool pool = clazz.getConstantPool(); final Attribute[] encMethodAttrs = findAttribute("EnclosingMethod", clazz); assertEquals(1, encMethodAttrs.length, "Expected 1 EnclosingMethod attribute but found " + encMethodAttrs.length); @@ -86,7 +86,7 @@ public class EnclosingMethodAttributeTestCase extends AbstractTestCase public void testCheckMethodLevelNamedInnerClass() throws ClassNotFoundException { - final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AttributeTestClassEM01$1S"); + final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AttributeTestClassEM01$1S"); final ConstantPool pool = clazz.getConstantPool(); final Attribute[] encMethodAttrs = findAttribute("EnclosingMethod", clazz); assertEquals(1, encMethodAttrs.length, "Wrong number of EnclosingMethod attributes"); diff --git a/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java b/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java index f4f34d16..df488c4d 100644 --- a/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java +++ b/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java @@ -34,10 +34,10 @@ public class EnumAccessFlagTestCase extends AbstractTestCase @Test public void testEnumClassSaysItIs() throws ClassNotFoundException { - JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.SimpleEnum"); + JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleEnum"); assertTrue(clazz.isEnum(), "Expected SimpleEnum class to say it was an enum - but it didn't !"); - clazz = getTestClass(PACKAGE_BASE_NAME+".data.SimpleClass"); + clazz = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleClass"); assertFalse(clazz.isEnum(), "Expected SimpleClass class to say it was not an enum - but it didn't !"); } diff --git a/src/test/java/org/apache/bcel/InstructionFinderTestCase.java b/src/test/java/org/apache/bcel/InstructionFinderTestCase.java index 886a06ed..e0999750 100644 --- a/src/test/java/org/apache/bcel/InstructionFinderTestCase.java +++ b/src/test/java/org/apache/bcel/InstructionFinderTestCase.java @@ -33,7 +33,7 @@ public class InstructionFinderTestCase extends AbstractTestCase @Test public void testSearchAll() throws Exception { - final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".util.InstructionFinder"); + final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".util.InstructionFinder"); final Method[] methods = clazz.getMethods(); Method searchM = null; for (final Method m : methods) diff --git a/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java b/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java index e0209d11..4f64e314 100644 --- a/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java +++ b/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java @@ -66,10 +66,10 @@ public class FieldAnnotationsTestCase extends AbstractTestCase @Test public void testFieldAnnotationEntrys() throws ClassNotFoundException { - final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AnnotatedFields"); + final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AnnotatedFields"); // TODO L...;? - checkAnnotatedField(clazz, "i", "L"+PACKAGE_BASE_SIG+"/data/SimpleAnnotation;", "id", "1"); - checkAnnotatedField(clazz, "s", "L"+PACKAGE_BASE_SIG+"/data/SimpleAnnotation;", "id", "2"); + checkAnnotatedField(clazz, "i", "L" + PACKAGE_BASE_SIG + "/data/SimpleAnnotation;", "id", "1"); + checkAnnotatedField(clazz, "s", "L" + PACKAGE_BASE_SIG + "/data/SimpleAnnotation;", "id", "2"); } /** @@ -79,16 +79,16 @@ public class FieldAnnotationsTestCase extends AbstractTestCase public void testFieldAnnotationEntrysReadWrite() throws ClassNotFoundException, IOException { - final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AnnotatedFields"); - checkAnnotatedField(clazz, "i", "L"+PACKAGE_BASE_SIG+"/data/SimpleAnnotation;", "id", "1"); - checkAnnotatedField(clazz, "s", "L"+PACKAGE_BASE_SIG+"/data/SimpleAnnotation;", "id", "2"); + final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AnnotatedFields"); + checkAnnotatedField(clazz, "i", "L" + PACKAGE_BASE_SIG + "/data/SimpleAnnotation;", "id", "1"); + checkAnnotatedField(clazz, "s", "L" + PACKAGE_BASE_SIG + "/data/SimpleAnnotation;", "id", "2"); // Write it out final File tfile = createTestdataFile("AnnotatedFields.class"); clazz.dump(tfile); final SyntheticRepository repos2 = createRepos("."); repos2.loadClass("AnnotatedFields"); - checkAnnotatedField(clazz, "i", "L"+PACKAGE_BASE_SIG+"/data/SimpleAnnotation;", "id", "1"); - checkAnnotatedField(clazz, "s", "L"+PACKAGE_BASE_SIG+"/data/SimpleAnnotation;", "id", "2"); + checkAnnotatedField(clazz, "i", "L" + PACKAGE_BASE_SIG + "/data/SimpleAnnotation;", "id", "1"); + checkAnnotatedField(clazz, "s", "L" + PACKAGE_BASE_SIG + "/data/SimpleAnnotation;", "id", "2"); assertTrue(tfile.delete()); } @@ -101,7 +101,7 @@ public class FieldAnnotationsTestCase extends AbstractTestCase throws ClassNotFoundException { final boolean dbg = false; - final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AnnotatedFields"); + final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AnnotatedFields"); final ClassGen clg = new ClassGen(clazz); Field f = clg.getFields()[0]; if (dbg) { diff --git a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java index a2a195e2..747d7b12 100644 --- a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java +++ b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java @@ -86,7 +86,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase private void assertParameterAnnotations(final Method method, final int... expectedNumberOfParmeterAnnotations) { - final String methodName= "For "+method.getName(); + final String methodName= "For " + method.getName(); final ParameterAnnotationEntry[] parameterAnnotations= method.getParameterAnnotationEntries(); assertEquals(expectedNumberOfParmeterAnnotations.length, parameterAnnotations.length, methodName); @@ -522,7 +522,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase @Test public void testModifyingClasses1() throws ClassNotFoundException { - final JavaClass jc = getTestClass(PACKAGE_BASE_NAME+".data.SimpleAnnotatedClass"); + final JavaClass jc = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleAnnotatedClass"); final ClassGen cgen = new ClassGen(jc); final ConstantPoolGen cp = cgen.getConstantPool(); cgen.addAnnotationEntry(createFruitAnnotation(cp, "Pineapple")); @@ -538,7 +538,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase @Test public void testModifyingClasses2() throws ClassNotFoundException { - final JavaClass jc = getTestClass(PACKAGE_BASE_NAME+".data.SimpleAnnotatedClass"); + final JavaClass jc = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleAnnotatedClass"); final ClassGen cgen = new ClassGen(jc); final ConstantPoolGen cp = cgen.getConstantPool(); cgen.addAnnotationEntry(createCombinedAnnotation(cp)); @@ -558,7 +558,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase public void testTransformClassToClassGen_ArrayAndAnnotationTypes() throws ClassNotFoundException { - final JavaClass jc = getTestClass(PACKAGE_BASE_NAME+".data.AnnotatedWithCombinedAnnotation"); + final JavaClass jc = getTestClass(PACKAGE_BASE_NAME + ".data.AnnotatedWithCombinedAnnotation"); final ClassGen cgen = new ClassGen(jc); // Check annotations are correctly preserved final AnnotationEntryGen[] annotations = cgen.getAnnotationEntries(); @@ -614,7 +614,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase public void testTransformClassToClassGen_EnumType() throws ClassNotFoundException { - final JavaClass jc = getTestClass(PACKAGE_BASE_NAME+".data.AnnotatedWithEnumClass"); + final JavaClass jc = getTestClass(PACKAGE_BASE_NAME + ".data.AnnotatedWithEnumClass"); final ClassGen cgen = new ClassGen(jc); // Check annotations are correctly preserved final AnnotationEntryGen[] annotations = cgen.getAnnotationEntries(); @@ -629,7 +629,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase public void testTransformClassToClassGen_SimpleTypes() throws ClassNotFoundException { - final JavaClass jc = getTestClass(PACKAGE_BASE_NAME+".data.SimpleAnnotatedClass"); + final JavaClass jc = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleAnnotatedClass"); final ClassGen cgen = new ClassGen(jc); // Check annotations are correctly preserved final AnnotationEntryGen[] annotations = cgen.getAnnotationEntries(); @@ -643,7 +643,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase public void testTransformComplexClassToClassGen() throws ClassNotFoundException { - final JavaClass jc = getTestClass(PACKAGE_BASE_NAME+".data.ComplexAnnotatedClass"); + final JavaClass jc = getTestClass(PACKAGE_BASE_NAME + ".data.ComplexAnnotatedClass"); final ClassGen cgen = new ClassGen(jc); // Check annotations are correctly preserved final AnnotationEntryGen[] annotations = cgen.getAnnotationEntries(); diff --git a/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java index 0bad3e32..ac6e2705 100644 --- a/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java +++ b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java @@ -40,7 +40,7 @@ public class TestArrayAccess02Creator extends TestCreator { private final ClassGen _cg; public TestArrayAccess02Creator() { - _cg = new ClassGen(TEST_PACKAGE+".TestArrayAccess02", "java.lang.Object", "TestArrayAccess02.java", + _cg = new ClassGen(TEST_PACKAGE + ".TestArrayAccess02", "java.lang.Object", "TestArrayAccess02.java", Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] { }); _cp = _cg.getConstantPool(); @@ -57,7 +57,7 @@ public void create(final OutputStream out) throws IOException { 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+".TestArrayAccess02", il, _cp); + TEST_PACKAGE + ".TestArrayAccess02", il, _cp); final InstructionHandle ih_0 = il.append(InstructionFactory.createLoad(Type.OBJECT, 0)); assertNotNull(ih_0); // TODO why is this not used @@ -73,11 +73,11 @@ public void create(final OutputStream out) throws IOException { 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[] { }, - "test", TEST_PACKAGE+".TestArrayAccess02", il, _cp); + "test", TEST_PACKAGE + ".TestArrayAccess02", il, _cp); 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+".TestArrayAccess02"), (short) 1)); + il.append(_factory.createNewArray(new ObjectType(TEST_PACKAGE + ".TestArrayAccess02"), (short) 1)); il.append(InstructionFactory.createStore(Type.OBJECT, 0)); final InstructionHandle ih_5 = il.append(new PUSH(_cp, 1)); assertNotNull(ih_5); // TODO why is this not used @@ -86,9 +86,9 @@ public void create(final OutputStream out) throws IOException { final InstructionHandle ih_10 = il.append(InstructionFactory.createLoad(Type.OBJECT, 1)); assertNotNull(ih_10); // TODO why is this not used il.append(new PUSH(_cp, 0)); - il.append(_factory.createNew(TEST_PACKAGE+".TestArrayAccess02")); + il.append(_factory.createNew(TEST_PACKAGE + ".TestArrayAccess02")); il.append(InstructionConst.DUP); - il.append(_factory.createInvoke(TEST_PACKAGE+".TestArrayAccess02", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL)); + il.append(_factory.createInvoke(TEST_PACKAGE + ".TestArrayAccess02", "<init>", Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL)); il.append(InstructionConst.AASTORE); final InstructionHandle ih_20 = il.append(InstructionFactory.createReturn(Type.VOID)); assertNotNull(ih_20); // TODO why is this not used 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 893f7b80..9ae7db60 100644 --- a/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java +++ b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java @@ -40,7 +40,7 @@ public class TestArrayAccess03Creator extends TestCreator { private final ClassGen _cg; public TestArrayAccess03Creator() { - _cg = new ClassGen(TEST_PACKAGE+".TestArrayAccess03", "java.lang.Object", "TestArrayAccess03.java", + _cg = new ClassGen(TEST_PACKAGE + ".TestArrayAccess03", "java.lang.Object", "TestArrayAccess03.java", Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] { }); _cp = _cg.getConstantPool(); @@ -57,7 +57,7 @@ public void create(final OutputStream out) throws IOException { 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); + TEST_PACKAGE + ".TestArrayAccess03", il, _cp); final InstructionHandle ih_0 = il.append(InstructionFactory.createLoad(Type.OBJECT, 0)); assertNotNull(ih_0); // TODO why is this not used @@ -73,18 +73,18 @@ public void create(final OutputStream out) throws IOException { 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); + new String[] { "arg0" }, "test", TEST_PACKAGE + ".TestArrayAccess03", il, _cp); 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(_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 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 f0376a75..d29c2fd6 100644 --- a/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java +++ b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java @@ -40,7 +40,7 @@ public class TestArrayAccess04Creator extends TestCreator { private final ClassGen _cg; public TestArrayAccess04Creator() { - _cg = new ClassGen(TEST_PACKAGE+".TestArrayAccess04", "java.lang.Object", "TestArrayAccess04.java", + _cg = new ClassGen(TEST_PACKAGE + ".TestArrayAccess04", "java.lang.Object", "TestArrayAccess04.java", Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] { }); _cp = _cg.getConstantPool(); @@ -57,7 +57,7 @@ public void create(final OutputStream out) throws IOException { 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); + TEST_PACKAGE + ".TestArrayAccess04", il, _cp); final InstructionHandle ih_0 = il.append(InstructionFactory.createLoad(Type.OBJECT, 0)); assertNotNull(ih_0); // TODO why is this not used @@ -73,7 +73,7 @@ public void create(final OutputStream out) throws IOException { 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", il, _cp); + new String[] { "arg0" }, "test", TEST_PACKAGE + ".TestArrayAccess04", il, _cp); final InstructionHandle ih_0 = il.append(new PUSH(_cp, 1)); assertNotNull(ih_0); // TODO why is this not used 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 c15c3c82..662c3c99 100644 --- a/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java +++ b/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java @@ -38,7 +38,7 @@ public class TestReturn01Creator extends TestCreator { private final ClassGen _cg; public TestReturn01Creator() { - _cg = new ClassGen(TEST_PACKAGE+".TestReturn01", "java.lang.Object", "TestReturn01.java", + _cg = new ClassGen(TEST_PACKAGE + ".TestReturn01", "java.lang.Object", "TestReturn01.java", Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] { }); _cp = _cg.getConstantPool(); @@ -55,7 +55,7 @@ public void create(final OutputStream out) throws IOException { 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); + "<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 @@ -71,7 +71,7 @@ public void create(final OutputStream out) throws IOException { 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); + new String[] { }, "foo", TEST_PACKAGE + ".TestReturn01", il, _cp); final InstructionHandle ih_0 = il.append(_factory.createNew("java.lang.Object")); assertNotNull(ih_0); // TODO why is this not used diff --git a/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java b/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java index e9350ac1..f88f3e76 100644 --- a/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java +++ b/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java @@ -38,7 +38,7 @@ public class TestReturn03Creator extends TestCreator { private final ClassGen _cg; public TestReturn03Creator() { - _cg = new ClassGen(TEST_PACKAGE+".TestReturn03", "java.lang.Object", "TestReturn03.java", + _cg = new ClassGen(TEST_PACKAGE + ".TestReturn03", "java.lang.Object", "TestReturn03.java", Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] { }); _cp = _cg.getConstantPool(); @@ -55,7 +55,7 @@ public void create(final OutputStream out) throws IOException { 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+".TestReturn03", il, _cp); + "<init>", TEST_PACKAGE + ".TestReturn03", il, _cp); final InstructionHandle ih_0 = il.append(InstructionFactory.createLoad(Type.OBJECT, 0)); assertNotNull(ih_0); // TODO why is this not used @@ -71,7 +71,7 @@ public void create(final OutputStream out) throws IOException { private void createMethod_1() { final InstructionList il = new InstructionList(); final MethodGen method = new MethodGen(Const.ACC_PUBLIC | Const.ACC_STATIC, Type.INT, Type.NO_ARGS, - new String[] { }, "test3", TEST_PACKAGE+".TestReturn03", il, _cp); + new String[] { }, "test3", TEST_PACKAGE + ".TestReturn03", il, _cp); final InstructionHandle ih_0 = il.append(InstructionConst.ACONST_NULL); assertNotNull(ih_0); // TODO why is this not used