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/10/15 21:46:24 UTC
[commons-bcel] branch master updated (ff60bd22 -> f9169f4c)
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 ff60bd22 Bump actions/cache from 3.0.10 to 3.0.11 #156
new 5b76c595 Inline single use local variables
new f9169f4c Rename test method
The 2 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:
src/test/java/org/apache/bcel/AbstractTestCase.java | 16 ++++++++--------
.../org/apache/bcel/AnnotationAccessFlagTestCase.java | 4 ++--
.../apache/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 ++--
.../java/org/apache/bcel/InstructionFinderTestCase.java | 2 +-
.../org/apache/bcel/LocalVariableTypeTableTestCase.java | 2 +-
src/test/java/org/apache/bcel/PLSETestCase.java | 12 ++++++------
.../org/apache/bcel/classfile/ConstantPoolTestCase.java | 14 ++++----------
.../apache/bcel/generic/FieldAnnotationsTestCase.java | 6 +++---
.../bcel/generic/GeneratingAnnotatedClassesTestCase.java | 12 ++++++------
.../org/apache/bcel/generic/JiraBcel362TestCase.java | 2 +-
14 files changed, 43 insertions(+), 49 deletions(-)
[commons-bcel] 02/02: Rename test method
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 f9169f4cc80c984e6d1197e9e4205127ff16c6bf
Author: Gary David Gregory (Code signing key) <gg...@apache.org>
AuthorDate: Sat Oct 15 17:43:15 2022 -0400
Rename test method
---
src/test/java/org/apache/bcel/AbstractTestCase.java | 16 ++++++++--------
.../org/apache/bcel/AnnotationAccessFlagTestCase.java | 4 ++--
.../apache/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 ++--
.../java/org/apache/bcel/InstructionFinderTestCase.java | 2 +-
.../org/apache/bcel/LocalVariableTypeTableTestCase.java | 2 +-
src/test/java/org/apache/bcel/PLSETestCase.java | 12 ++++++------
.../org/apache/bcel/classfile/ConstantPoolTestCase.java | 4 ++--
.../apache/bcel/generic/FieldAnnotationsTestCase.java | 6 +++---
.../bcel/generic/GeneratingAnnotatedClassesTestCase.java | 12 ++++++------
.../org/apache/bcel/generic/JiraBcel362TestCase.java | 2 +-
14 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/src/test/java/org/apache/bcel/AbstractTestCase.java b/src/test/java/org/apache/bcel/AbstractTestCase.java
index f11bcf12..42a0ed3c 100644
--- a/src/test/java/org/apache/bcel/AbstractTestCase.java
+++ b/src/test/java/org/apache/bcel/AbstractTestCase.java
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Stream;
import org.apache.bcel.classfile.AnnotationEntry;
import org.apache.bcel.classfile.Attribute;
@@ -40,7 +41,8 @@ import org.apache.bcel.util.ClassPath;
import org.apache.bcel.util.SyntheticRepository;
public abstract class AbstractTestCase {
- private static final boolean verbose = false;
+
+ private static final boolean VERBOSE = false;
protected static final String PACKAGE_BASE_NAME = AbstractTestCase.class.getPackage().getName();
@@ -106,7 +108,7 @@ public abstract class AbstractTestCase {
protected Attribute findAttribute(final String name, final Attribute[] all) {
final List<Attribute> chosenAttrsList = new ArrayList<>();
for (final Attribute element : all) {
- if (verbose) {
+ if (VERBOSE) {
System.err.println("Attribute: " + element.getName());
}
if (element.getName().equals(name)) {
@@ -118,10 +120,9 @@ public abstract class AbstractTestCase {
}
protected Attribute[] findAttribute(final String name, final JavaClass clazz) {
- final Attribute[] all = clazz.getAttributes();
final List<Attribute> chosenAttrsList = new ArrayList<>();
- for (final Attribute element : all) {
- if (verbose) {
+ for (final Attribute element : clazz.getAttributes()) {
+ if (VERBOSE) {
System.err.println("Attribute: " + element.getName());
}
if (element.getName().equals(name)) {
@@ -132,8 +133,7 @@ public abstract class AbstractTestCase {
}
protected Method getMethod(final JavaClass cl, final String methodname) {
- final Method[] methods = cl.getMethods();
- for (final Method m : methods) {
+ for (final Method m : cl.getMethods()) {
if (m.getName().equals(methodname)) {
return m;
}
@@ -141,7 +141,7 @@ public abstract class AbstractTestCase {
return null;
}
- protected JavaClass getTestClass(final String name) throws ClassNotFoundException {
+ protected JavaClass getTestJavaClass(final String name) throws ClassNotFoundException {
return SyntheticRepository.getInstance().loadClass(name);
}
diff --git a/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java b/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java
index b537471a..5e94f778 100644
--- a/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java
+++ b/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java
@@ -31,9 +31,9 @@ public class AnnotationAccessFlagTestCase extends AbstractTestCase {
*/
@Test
public void testAnnotationClassSaysItIs() throws ClassNotFoundException {
- JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleAnnotation");
+ JavaClass clazz = getTestJavaClass(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 = getTestJavaClass(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 c5b5b422..16370e5c 100644
--- a/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java
+++ b/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java
@@ -34,7 +34,7 @@ public class AnnotationDefaultAttributeTestCase extends AbstractTestCase {
*/
@Test
public void testMethodAnnotations() throws ClassNotFoundException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleAnnotation");
+ final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME + ".data.SimpleAnnotation");
final Method m = getMethod(clazz, "fruit");
final AnnotationDefault a = (AnnotationDefault) findAttribute("AnnotationDefault", m.getAttributes());
final SimpleElementValue val = (SimpleElementValue) a.getDefaultValue();
diff --git a/src/test/java/org/apache/bcel/AnonymousClassTestCase.java b/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
index 62a7dd27..4ef9d9e3 100644
--- a/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
+++ b/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
@@ -27,28 +27,28 @@ import org.junit.jupiter.api.Test;
public class AnonymousClassTestCase extends AbstractTestCase {
@Test
public void testAnonymousInnerClassIsAnonymous() throws ClassNotFoundException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AnonymousClassTest$1");
+ final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME + ".data.AnonymousClassTest$1");
assertTrue(clazz.isAnonymous(), "anonymous inner classes are anonymous");
assertTrue(clazz.isNested(), "anonymous inner classes are anonymous");
}
@Test
public void testNamedInnerClassIsNotAnonymous() throws ClassNotFoundException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AnonymousClassTest$X");
+ final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME + ".data.AnonymousClassTest$X");
assertFalse(clazz.isAnonymous(), "regular inner classes are not anonymous");
assertTrue(clazz.isNested(), "regular inner classes are nested");
}
@Test
public void testRegularClassIsNotAnonymous() throws ClassNotFoundException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AnonymousClassTest");
+ final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME + ".data.AnonymousClassTest");
assertFalse(clazz.isAnonymous(), "regular outer classes are not anonymous");
assertFalse(clazz.isNested(), "regular outer classes are not nested");
}
@Test
public void testStaticInnerClassIsNotAnonymous() throws ClassNotFoundException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AnonymousClassTest$Y");
+ final JavaClass clazz = getTestJavaClass(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 6eb3a06c..ced433e8 100644
--- a/src/test/java/org/apache/bcel/CounterVisitorTestCase.java
+++ b/src/test/java/org/apache/bcel/CounterVisitorTestCase.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
public class CounterVisitorTestCase extends AbstractCounterVisitorTestCase {
@Override
protected JavaClass getTestClass() throws ClassNotFoundException {
- return getTestClass(PACKAGE_BASE_NAME + ".data.MarkedType");
+ return getTestJavaClass(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 2baec4d3..2dc8b49f 100644
--- a/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java
+++ b/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java
@@ -37,7 +37,7 @@ public class EnclosingMethodAttributeTestCase extends AbstractTestCase {
*/
@Test
public void testAttributeSerializtion() throws ClassNotFoundException, IOException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AttributeTestClassEM02$1");
+ final JavaClass clazz = getTestJavaClass(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");
@@ -61,7 +61,7 @@ public class EnclosingMethodAttributeTestCase extends AbstractTestCase {
*/
@Test
public void testCheckClassLevelNamedInnerClass() throws ClassNotFoundException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AttributeTestClassEM02$1");
+ final JavaClass clazz = getTestJavaClass(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);
@@ -76,7 +76,7 @@ public class EnclosingMethodAttributeTestCase extends AbstractTestCase {
*/
@Test
public void testCheckMethodLevelNamedInnerClass() throws ClassNotFoundException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AttributeTestClassEM01$1S");
+ final JavaClass clazz = getTestJavaClass(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 de1308dd..cd64e85a 100644
--- a/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java
+++ b/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java
@@ -31,9 +31,9 @@ public class EnumAccessFlagTestCase extends AbstractTestCase {
*/
@Test
public void testEnumClassSaysItIs() throws ClassNotFoundException {
- JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleEnum");
+ JavaClass clazz = getTestJavaClass(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 = getTestJavaClass(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 121bbf34..d84c5529 100644
--- a/src/test/java/org/apache/bcel/InstructionFinderTestCase.java
+++ b/src/test/java/org/apache/bcel/InstructionFinderTestCase.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
public class InstructionFinderTestCase extends AbstractTestCase {
@Test
public void testSearchAll() throws Exception {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".util.InstructionFinder");
+ final JavaClass clazz = getTestJavaClass(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/LocalVariableTypeTableTestCase.java b/src/test/java/org/apache/bcel/LocalVariableTypeTableTestCase.java
index 974e0744..962366d5 100644
--- a/src/test/java/org/apache/bcel/LocalVariableTypeTableTestCase.java
+++ b/src/test/java/org/apache/bcel/LocalVariableTypeTableTestCase.java
@@ -80,7 +80,7 @@ public class LocalVariableTypeTableTestCase extends AbstractTestCase {
}
private byte[] getBytesFromClass(final String className) throws ClassNotFoundException {
- final JavaClass clazz = getTestClass(className);
+ final JavaClass clazz = getTestJavaClass(className);
final ConstantPoolGen cp = new ConstantPoolGen(clazz.getConstantPool());
final Method[] methods = clazz.getMethods();
diff --git a/src/test/java/org/apache/bcel/PLSETestCase.java b/src/test/java/org/apache/bcel/PLSETestCase.java
index 4a5201b7..8e23bdf4 100644
--- a/src/test/java/org/apache/bcel/PLSETestCase.java
+++ b/src/test/java/org/apache/bcel/PLSETestCase.java
@@ -46,7 +46,7 @@ public class PLSETestCase extends AbstractTestCase {
*/
@Test
public void testB208() throws ClassNotFoundException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.PLSETestClass");
+ final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME + ".data.PLSETestClass");
final ClassGen gen = new ClassGen(clazz);
final ConstantPoolGen pool = gen.getConstantPool();
final Method m = gen.getMethodAt(1);
@@ -62,7 +62,7 @@ public class PLSETestCase extends AbstractTestCase {
*/
@Test
public void testB262() throws ClassNotFoundException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.PLSETestEnum");
+ final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME + ".data.PLSETestEnum");
final ClassGen gen = new ClassGen(clazz);
final ConstantPoolGen pool = gen.getConstantPool();
// get the values() method
@@ -83,7 +83,7 @@ public class PLSETestCase extends AbstractTestCase {
*/
@Test
public void testB295() throws Exception {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.PLSETestClass2");
+ final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME + ".data.PLSETestClass2");
final ClassGen cg = new ClassGen(clazz);
final ConstantPoolGen pool = cg.getConstantPool();
final Method m = cg.getMethodAt(1); // 'main'
@@ -102,7 +102,7 @@ public class PLSETestCase extends AbstractTestCase {
*/
@Test
public void testB361() throws Exception {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.LargeMethod");
+ final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME + ".data.LargeMethod");
final Method[] methods = clazz.getMethods();
final Method m = methods[0];
// System.out.println(m.getName());
@@ -122,7 +122,7 @@ public class PLSETestCase extends AbstractTestCase {
*/
@Test
public void testB79() throws ClassNotFoundException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.PLSETestClass");
+ final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME + ".data.PLSETestClass");
final ClassGen gen = new ClassGen(clazz);
final ConstantPoolGen pool = gen.getConstantPool();
final Method m = gen.getMethodAt(2);
@@ -141,7 +141,7 @@ public class PLSETestCase extends AbstractTestCase {
@Test
public void testCoverage() throws ClassNotFoundException, java.io.IOException {
// load a class with a wide variety of byte codes - including tableswitch and lookupswitch
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.ConstantPoolX");
+ final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME + ".data.ConstantPoolX");
for (final Method m : clazz.getMethods()) {
final String signature = m.getSignature();
Utility.methodTypeToSignature(Utility.methodSignatureReturnType(signature), Utility.methodSignatureArgumentTypes(signature)); // discard result
diff --git a/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java b/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
index 871a3277..b86fb27d 100644
--- a/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
@@ -36,7 +36,7 @@ public class ConstantPoolTestCase extends AbstractTestCase {
@Test
public void testConstantToString() throws ClassNotFoundException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleClassWithDefaultConstructor");
+ 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) {
@@ -52,7 +52,7 @@ public class ConstantPoolTestCase extends AbstractTestCase {
@Test
public void testTooManyConstants() throws ClassNotFoundException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleClassWithDefaultConstructor");
+ final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME + ".data.SimpleClassWithDefaultConstructor");
final ConstantPoolGen cp = new ConstantPoolGen(clazz.getConstantPool());
int i = cp.getSize();
while (i < Const.MAX_CP_ENTRIES - 1) {
diff --git a/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java b/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java
index e5950998..5e1c1446 100644
--- a/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java
@@ -58,7 +58,7 @@ public class FieldAnnotationsTestCase extends AbstractTestCase {
*/
@Test
public void testFieldAnnotationEntrys() throws ClassNotFoundException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AnnotatedFields");
+ final JavaClass clazz = getTestJavaClass(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");
@@ -69,7 +69,7 @@ public class FieldAnnotationsTestCase extends AbstractTestCase {
*/
@Test
public void testFieldAnnotationEntrysReadWrite() throws ClassNotFoundException, IOException {
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AnnotatedFields");
+ final JavaClass clazz = getTestJavaClass(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
@@ -88,7 +88,7 @@ public class FieldAnnotationsTestCase extends AbstractTestCase {
@Test
public void testFieldAnnotationModification() throws ClassNotFoundException {
final boolean dbg = false;
- final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.AnnotatedFields");
+ final JavaClass clazz = getTestJavaClass(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 7fa44d8d..7e87a0c9 100644
--- a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
@@ -437,7 +437,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase {
*/
@Test
public void testModifyingClasses1() throws ClassNotFoundException {
- final JavaClass jc = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleAnnotatedClass");
+ final JavaClass jc = getTestJavaClass(PACKAGE_BASE_NAME + ".data.SimpleAnnotatedClass");
final ClassGen cgen = new ClassGen(jc);
final ConstantPoolGen cp = cgen.getConstantPool();
cgen.addAnnotationEntry(createFruitAnnotation(cp, "Pineapple"));
@@ -451,7 +451,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase {
*/
@Test
public void testModifyingClasses2() throws ClassNotFoundException {
- final JavaClass jc = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleAnnotatedClass");
+ final JavaClass jc = getTestJavaClass(PACKAGE_BASE_NAME + ".data.SimpleAnnotatedClass");
final ClassGen cgen = new ClassGen(jc);
final ConstantPoolGen cp = cgen.getConstantPool();
cgen.addAnnotationEntry(createCombinedAnnotation(cp));
@@ -469,7 +469,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase {
*/
@Test
public void testTransformClassToClassGen_ArrayAndAnnotationTypes() throws ClassNotFoundException {
- final JavaClass jc = getTestClass(PACKAGE_BASE_NAME + ".data.AnnotatedWithCombinedAnnotation");
+ final JavaClass jc = getTestJavaClass(PACKAGE_BASE_NAME + ".data.AnnotatedWithCombinedAnnotation");
final ClassGen cgen = new ClassGen(jc);
// Check annotations are correctly preserved
final AnnotationEntryGen[] annotations = cgen.getAnnotationEntries();
@@ -510,7 +510,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase {
*/
@Test
public void testTransformClassToClassGen_EnumType() throws ClassNotFoundException {
- final JavaClass jc = getTestClass(PACKAGE_BASE_NAME + ".data.AnnotatedWithEnumClass");
+ final JavaClass jc = getTestJavaClass(PACKAGE_BASE_NAME + ".data.AnnotatedWithEnumClass");
final ClassGen cgen = new ClassGen(jc);
// Check annotations are correctly preserved
final AnnotationEntryGen[] annotations = cgen.getAnnotationEntries();
@@ -523,7 +523,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase {
*/
@Test
public void testTransformClassToClassGen_SimpleTypes() throws ClassNotFoundException {
- final JavaClass jc = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleAnnotatedClass");
+ final JavaClass jc = getTestJavaClass(PACKAGE_BASE_NAME + ".data.SimpleAnnotatedClass");
final ClassGen cgen = new ClassGen(jc);
// Check annotations are correctly preserved
final AnnotationEntryGen[] annotations = cgen.getAnnotationEntries();
@@ -535,7 +535,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase {
*/
@Test
public void testTransformComplexClassToClassGen() throws ClassNotFoundException {
- final JavaClass jc = getTestClass(PACKAGE_BASE_NAME + ".data.ComplexAnnotatedClass");
+ final JavaClass jc = getTestJavaClass(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/generic/JiraBcel362TestCase.java b/src/test/java/org/apache/bcel/generic/JiraBcel362TestCase.java
index 7ddcfa41..9a04f79b 100644
--- a/src/test/java/org/apache/bcel/generic/JiraBcel362TestCase.java
+++ b/src/test/java/org/apache/bcel/generic/JiraBcel362TestCase.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
public class JiraBcel362TestCase extends AbstractTestCase {
@Test
public void testProcessConstantPoolWithCondyEntry() throws ClassNotFoundException {
- final JavaClass clazz = getTestClass("issue362.Bcel362");
+ final JavaClass clazz = getTestJavaClass("issue362.Bcel362");
final ConstantPoolGen constantPoolGen = assertDoesNotThrow(() -> new ConstantPoolGen(clazz.getConstantPool()));
assertTrue(constantPoolGen.lookupUtf8("$jacocoData") != -1);
}
[commons-bcel] 01/02: Inline single use local variables
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 5b76c595aa95e4b3a0defbc68abf1b48dca52400
Author: Gary David Gregory (Code signing key) <gg...@apache.org>
AuthorDate: Sat Oct 15 17:27:05 2022 -0400
Inline single use local variables
Format tweaks
---
.../java/org/apache/bcel/classfile/ConstantPoolTestCase.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java b/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
index 5e479983..871a3277 100644
--- a/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
@@ -24,7 +24,6 @@ import org.apache.bcel.AbstractTestCase;
import org.apache.bcel.Const;
import org.apache.bcel.generic.ConstantPoolGen;
import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.MethodGen;
import org.junit.jupiter.api.Test;
@@ -32,22 +31,18 @@ public class ConstantPoolTestCase extends AbstractTestCase {
private InstructionHandle[] getInstructionHandles(final JavaClass clazz, final ConstantPoolGen cp, final Method method) {
final MethodGen methodGen = new MethodGen(method, clazz.getClassName(), cp);
- final InstructionList instructionList = methodGen.getInstructionList();
- return instructionList.getInstructionHandles();
+ return methodGen.getInstructionList().getInstructionHandles();
}
@Test
public void testConstantToString() throws ClassNotFoundException {
final JavaClass clazz = getTestClass(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 string = instructionHandle.getInstruction().toString(cp.getConstantPool());
- assertNotNull(string);
+ assertNotNull(instructionHandle.getInstruction().toString(cp.getConstantPool()));
// TODO Need real assertions.
// System.out.println(string);
}
@@ -59,7 +54,6 @@ public class ConstantPoolTestCase extends AbstractTestCase {
public void testTooManyConstants() throws ClassNotFoundException {
final JavaClass clazz = getTestClass(PACKAGE_BASE_NAME + ".data.SimpleClassWithDefaultConstructor");
final ConstantPoolGen cp = new ConstantPoolGen(clazz.getConstantPool());
-
int i = cp.getSize();
while (i < Const.MAX_CP_ENTRIES - 1) {
cp.addLong(i);