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:41:39 UTC
svn commit: r1696119 - in
/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6:
AbstractTestCase.java EnclosingMethodAttributeTestCase.java
FieldAnnotationsTestCase.java generic/GeneratingAnnotatedClassesTestCase.java
Author: sebb
Date: Sun Aug 16 08:41:38 2015
New Revision: 1696119
URL: http://svn.apache.org/r1696119
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/EnclosingMethodAttributeTestCase.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/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=1696119&r1=1696118&r2=1696119&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:41:38 2015
@@ -43,6 +43,9 @@ public abstract class AbstractTestCase e
protected static final String PACKAGE_BASE_NAME = AbstractTestCase.class.getPackage().getName();
+ // package base name in signature format, i.e. with '/' separators instead of '.'
+ protected static final String PACKAGE_BASE_SIG = PACKAGE_BASE_NAME.replace('.', '/');
+
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/EnclosingMethodAttributeTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnclosingMethodAttributeTestCase.java?rev=1696119&r1=1696118&r2=1696119&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:41:38 2015
@@ -46,9 +46,9 @@ public class EnclosingMethodAttributeTes
String enclosingClassName = em.getEnclosingClass().getBytes(pool);
String enclosingMethodName = em.getEnclosingMethod().getName(pool);
assertTrue(
- "Expected class name to be 'org/apache/commons/bcel6/data/AttributeTestClassEM01' but was "
+ "Expected class name to be '"+PACKAGE_BASE_SIG+"/data/AttributeTestClassEM01' but was "
+ enclosingClassName, enclosingClassName
- .equals("org/apache/commons/bcel6/data/AttributeTestClassEM01"));
+ .equals(PACKAGE_BASE_SIG+"/data/AttributeTestClassEM01"));
assertTrue("Expected method name to be 'main' but was "
+ enclosingMethodName, enclosingMethodName.equals("main"));
}
@@ -72,9 +72,9 @@ public class EnclosingMethodAttributeTes
+ em.getEnclosingMethodIndex(), em
.getEnclosingMethodIndex() == 0);
assertTrue(
- "Expected class name to be 'org/apache/commons/bcel6/data/AttributeTestClassEM02' but was "
+ "Expected class name to be '"+PACKAGE_BASE_SIG+"/data/AttributeTestClassEM02' but was "
+ enclosingClassName, enclosingClassName
- .equals("org/apache/commons/bcel6/data/AttributeTestClassEM02"));
+ .equals(PACKAGE_BASE_SIG+"/data/AttributeTestClassEM02"));
}
/**
@@ -102,9 +102,9 @@ public class EnclosingMethodAttributeTes
+ em.getEnclosingMethodIndex(), em
.getEnclosingMethodIndex() == 0);
assertTrue(
- "Expected class name to be 'org/apache/commons/bcel6/data/AttributeTestClassEM02' but was "
+ "Expected class name to be '"+PACKAGE_BASE_SIG+"/data/AttributeTestClassEM02' but was "
+ enclosingClassName, enclosingClassName
- .equals("org/apache/commons/bcel6/data/AttributeTestClassEM02"));
+ .equals(PACKAGE_BASE_SIG+"/data/AttributeTestClassEM02"));
tfile.deleteOnExit();
}
}
\ No newline at end of file
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=1696119&r1=1696118&r2=1696119&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:41:38 2015
@@ -39,8 +39,8 @@ public class FieldAnnotationsTestCase ex
{
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");
+ checkAnnotatedField(clazz, "i", "L"+PACKAGE_BASE_SIG+"/data/SimpleAnnotation;", "id", "1");
+ checkAnnotatedField(clazz, "s", "L"+PACKAGE_BASE_SIG+"/data/SimpleAnnotation;", "id", "2");
}
/**
@@ -50,15 +50,15 @@ public class FieldAnnotationsTestCase ex
IOException
{
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");
+ 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
File tfile = createTestdataFile("AnnotatedFields.class");
clazz.dump(tfile);
SyntheticRepository repos2 = createRepos(".");
repos2.loadClass("AnnotatedFields");
- checkAnnotatedField(clazz, "i", "Lorg/apache/commons/bcel6/data/SimpleAnnotation;", "id", "1");
- checkAnnotatedField(clazz, "s", "Lorg/apache/commons/bcel6/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());
}
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=1696119&r1=1696118&r2=1696119&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:41:38 2015
@@ -270,10 +270,10 @@ public class GeneratingAnnotatedClassesT
+ innerValue,
innerValue instanceof AnnotationElementValueGen);
AnnotationElementValueGen innerAnnotationValue = (AnnotationElementValueGen) innerValue;
- assertTrue("Should be called Lorg/apache/commons/bcel6/data/SimpleAnnotation; but is called: "
+ assertTrue("Should be called L"+PACKAGE_BASE_SIG+"/data/SimpleAnnotation; but is called: "
+ innerAnnotationValue.getAnnotation().getTypeName(),
innerAnnotationValue.getAnnotation().getTypeSignature().equals(
- "Lorg/apache/commons/bcel6/data/SimpleAnnotation;"));
+ "L"+PACKAGE_BASE_SIG+"/data/SimpleAnnotation;"));
// check the three methods
Method[] methods = cgen.getMethods();