You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/08/16 10:26:47 UTC
svn commit: r1696118 - in
/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6: ./
generic/
Author: sebb
Date: Sun Aug 16 08:26:46 2015
New Revision: 1696118
URL: http://svn.apache.org/r1696118
Log:
Extract common test package base name and eliminate dependency on actual package name
Modified:
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AbstractTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AnonymousClassTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnclosingMethodAttributeTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnumAccessFlagTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/FieldAnnotationsTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/InstructionFinderTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/PLSETestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AbstractTestCase.java?rev=1696118&r1=1696117&r2=1696118&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AbstractTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AbstractTestCase.java Sun Aug 16 08:26:46 2015
@@ -41,6 +41,8 @@ public abstract class AbstractTestCase e
{
private static final boolean verbose = false;
+ protected static final String PACKAGE_BASE_NAME = AbstractTestCase.class.getPackage().getName();
+
protected File createTestdataFile(String name)
{
return new File("target" + File.separator + "testdata" + File.separator
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AnonymousClassTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AnonymousClassTestCase.java?rev=1696118&r1=1696117&r2=1696118&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AnonymousClassTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AnonymousClassTestCase.java Sun Aug 16 08:26:46 2015
@@ -33,7 +33,7 @@ public class AnonymousClassTestCase exte
public void testNamedInnerClassIsNotAnonymous()
throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AnonymousClassTest$X");
+ JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AnonymousClassTest$X");
assertFalse("regular inner classes are not anonymous", clazz
.isAnonymous());
assertTrue("regular inner classes are nested", clazz.isNested());
@@ -42,7 +42,7 @@ public class AnonymousClassTestCase exte
public void testStaticInnerClassIsNotAnonymous()
throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AnonymousClassTest$Y");
+ JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AnonymousClassTest$Y");
assertFalse("regular static inner classes are not anonymous", clazz
.isAnonymous());
assertTrue("regular static inner classes are nested", clazz.isNested());
@@ -51,7 +51,7 @@ public class AnonymousClassTestCase exte
public void testAnonymousInnerClassIsAnonymous()
throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AnonymousClassTest$1");
+ JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AnonymousClassTest$1");
assertTrue("anonymous inner classes are anonymous", clazz.isAnonymous());
assertTrue("anonymous inner classes are anonymous", clazz.isNested());
}
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnclosingMethodAttributeTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnclosingMethodAttributeTestCase.java?rev=1696118&r1=1696117&r2=1696118&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnclosingMethodAttributeTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnclosingMethodAttributeTestCase.java Sun Aug 16 08:26:46 2015
@@ -37,7 +37,7 @@ public class EnclosingMethodAttributeTes
public void testCheckMethodLevelNamedInnerClass()
throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AttributeTestClassEM01$1S");
+ JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AttributeTestClassEM01$1S");
ConstantPool pool = clazz.getConstantPool();
Attribute[] encMethodAttrs = findAttribute("EnclosingMethod", clazz);
assertTrue("Expected 1 EnclosingMethod attribute but found "
@@ -60,7 +60,7 @@ public class EnclosingMethodAttributeTes
public void testCheckClassLevelNamedInnerClass()
throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AttributeTestClassEM02$1");
+ JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AttributeTestClassEM02$1");
ConstantPool pool = clazz.getConstantPool();
Attribute[] encMethodAttrs = findAttribute("EnclosingMethod", clazz);
assertTrue("Expected 1 EnclosingMethod attribute but found "
@@ -83,7 +83,7 @@ public class EnclosingMethodAttributeTes
public void testAttributeSerializtion() throws ClassNotFoundException,
IOException
{
- JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AttributeTestClassEM02$1");
+ JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AttributeTestClassEM02$1");
ConstantPool pool = clazz.getConstantPool();
Attribute[] encMethodAttrs = findAttribute("EnclosingMethod", clazz);
assertTrue("Expected 1 EnclosingMethod attribute but found "
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnumAccessFlagTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnumAccessFlagTestCase.java?rev=1696118&r1=1696117&r2=1696118&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnumAccessFlagTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnumAccessFlagTestCase.java Sun Aug 16 08:26:46 2015
@@ -29,11 +29,11 @@ public class EnumAccessFlagTestCase exte
*/
public void testEnumClassSaysItIs() throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.SimpleEnum");
+ JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.SimpleEnum");
assertTrue(
"Expected SimpleEnum class to say it was an enum - but it didn't !",
clazz.isEnum());
- clazz = getTestClass("org.apache.commons.bcel6.data.SimpleClass");
+ clazz = getTestClass(PACKAGE_BASE_NAME+".data.SimpleClass");
assertTrue(
"Expected SimpleClass class to say it was not an enum - but it didn't !",
!clazz.isEnum());
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/FieldAnnotationsTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/FieldAnnotationsTestCase.java?rev=1696118&r1=1696117&r2=1696118&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/FieldAnnotationsTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/FieldAnnotationsTestCase.java Sun Aug 16 08:26:46 2015
@@ -37,7 +37,7 @@ public class FieldAnnotationsTestCase ex
*/
public void testFieldAnnotationEntrys() throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AnnotatedFields");
+ JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AnnotatedFields");
// TODO L...;?
checkAnnotatedField(clazz, "i", "Lorg/apache/commons/bcel6/data/SimpleAnnotation;", "id", "1");
checkAnnotatedField(clazz, "s", "Lorg/apache/commons/bcel6/data/SimpleAnnotation;", "id", "2");
@@ -49,7 +49,7 @@ public class FieldAnnotationsTestCase ex
public void testFieldAnnotationEntrysReadWrite() throws ClassNotFoundException,
IOException
{
- JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AnnotatedFields");
+ JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AnnotatedFields");
checkAnnotatedField(clazz, "i", "Lorg/apache/commons/bcel6/data/SimpleAnnotation;", "id", "1");
checkAnnotatedField(clazz, "s", "Lorg/apache/commons/bcel6/data/SimpleAnnotation;", "id", "2");
// Write it out
@@ -70,7 +70,7 @@ public class FieldAnnotationsTestCase ex
throws ClassNotFoundException
{
boolean dbg = false;
- JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AnnotatedFields");
+ JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.AnnotatedFields");
ClassGen clg = new ClassGen(clazz);
Field f = clg.getFields()[0];
if (dbg) {
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/InstructionFinderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/InstructionFinderTestCase.java?rev=1696118&r1=1696117&r2=1696118&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/InstructionFinderTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/InstructionFinderTestCase.java Sun Aug 16 08:26:46 2015
@@ -30,7 +30,7 @@ public class InstructionFinderTestCase e
{
public void testSearchAll() throws Exception
{
- JavaClass clazz = getTestClass("org.apache.commons.bcel6.util.InstructionFinder");
+ JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".util.InstructionFinder");
Method[] methods = clazz.getMethods();
Method searchM = null;
for (Method m : methods)
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/PLSETestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/PLSETestCase.java?rev=1696118&r1=1696117&r2=1696118&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/PLSETestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/PLSETestCase.java Sun Aug 16 08:26:46 2015
@@ -34,7 +34,7 @@ public class PLSETestCase extends Abstra
*/
public void testB208() throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.PLSETestClass");
+ JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.PLSETestClass");
ClassGen gen = new ClassGen(clazz);
ConstantPoolGen pool = gen.getConstantPool();
Method m = gen.getMethodAt(1);
@@ -50,7 +50,7 @@ public class PLSETestCase extends Abstra
*/
public void testB79() throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.PLSETestClass");
+ JavaClass clazz = getTestClass(PACKAGE_BASE_NAME+".data.PLSETestClass");
ClassGen gen = new ClassGen(clazz);
ConstantPoolGen pool = gen.getConstantPool();
Method m = gen.getMethodAt(2);
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java?rev=1696118&r1=1696117&r2=1696118&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/GeneratingAnnotatedClassesTestCase.java Sun Aug 16 08:26:46 2015
@@ -217,7 +217,7 @@ public class GeneratingAnnotatedClassesT
public void testTransformClassToClassGen_SimpleTypes()
throws ClassNotFoundException
{
- JavaClass jc = getTestClass("org.apache.commons.bcel6.data.SimpleAnnotatedClass");
+ JavaClass jc = getTestClass(PACKAGE_BASE_NAME+".data.SimpleAnnotatedClass");
ClassGen cgen = new ClassGen(jc);
// Check annotations are correctly preserved
AnnotationEntryGen[] annotations = cgen.getAnnotationEntries();
@@ -232,7 +232,7 @@ public class GeneratingAnnotatedClassesT
public void testTransformClassToClassGen_EnumType()
throws ClassNotFoundException
{
- JavaClass jc = getTestClass("org.apache.commons.bcel6.data.AnnotatedWithEnumClass");
+ JavaClass jc = getTestClass(PACKAGE_BASE_NAME+".data.AnnotatedWithEnumClass");
ClassGen cgen = new ClassGen(jc);
// Check annotations are correctly preserved
AnnotationEntryGen[] annotations = cgen.getAnnotationEntries();
@@ -247,7 +247,7 @@ public class GeneratingAnnotatedClassesT
public void testTransformClassToClassGen_ArrayAndAnnotationTypes()
throws ClassNotFoundException
{
- JavaClass jc = getTestClass("org.apache.commons.bcel6.data.AnnotatedWithCombinedAnnotation");
+ JavaClass jc = getTestClass(PACKAGE_BASE_NAME+".data.AnnotatedWithCombinedAnnotation");
ClassGen cgen = new ClassGen(jc);
// Check annotations are correctly preserved
AnnotationEntryGen[] annotations = cgen.getAnnotationEntries();
@@ -354,7 +354,7 @@ public class GeneratingAnnotatedClassesT
public void testTransformComplexClassToClassGen()
throws ClassNotFoundException
{
- JavaClass jc = getTestClass("org.apache.commons.bcel6.data.ComplexAnnotatedClass");
+ JavaClass jc = getTestClass(PACKAGE_BASE_NAME+".data.ComplexAnnotatedClass");
ClassGen cgen = new ClassGen(jc);
// Check annotations are correctly preserved
AnnotationEntryGen[] annotations = cgen.getAnnotationEntries();
@@ -382,7 +382,7 @@ public class GeneratingAnnotatedClassesT
*/
public void testModifyingClasses1() throws ClassNotFoundException
{
- JavaClass jc = getTestClass("org.apache.commons.bcel6.data.SimpleAnnotatedClass");
+ JavaClass jc = getTestClass(PACKAGE_BASE_NAME+".data.SimpleAnnotatedClass");
ClassGen cgen = new ClassGen(jc);
ConstantPoolGen cp = cgen.getConstantPool();
cgen.addAnnotationEntry(createFruitAnnotation(cp, "Pineapple"));
@@ -399,7 +399,7 @@ public class GeneratingAnnotatedClassesT
*/
public void testModifyingClasses2() throws ClassNotFoundException
{
- JavaClass jc = getTestClass("org.apache.commons.bcel6.data.SimpleAnnotatedClass");
+ JavaClass jc = getTestClass(PACKAGE_BASE_NAME+".data.SimpleAnnotatedClass");
ClassGen cgen = new ClassGen(jc);
ConstantPoolGen cp = cgen.getConstantPool();
cgen.addAnnotationEntry(createCombinedAnnotation(cp));