diff options
Diffstat (limited to 'weaver')
3 files changed, 7 insertions, 6 deletions
diff --git a/weaver/src/org/aspectj/weaver/reflect/ReflectionWorld.java b/weaver/src/org/aspectj/weaver/reflect/ReflectionWorld.java index 03aca9ac8..04ad8ed40 100644 --- a/weaver/src/org/aspectj/weaver/reflect/ReflectionWorld.java +++ b/weaver/src/org/aspectj/weaver/reflect/ReflectionWorld.java @@ -41,7 +41,7 @@ public class ReflectionWorld extends World { private ClassLoader classLoader; private AnnotationFinder annotationFinder; - public ReflectionWorld() { + private ReflectionWorld() { super(); this.setMessageHandler(new ExceptionBasedMessageHandler()); setBehaveInJava5Way(LangUtil.is15VMOrGreater()); diff --git a/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java b/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java index fe5aaec0a..e5b830b25 100644 --- a/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java +++ b/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java @@ -17,6 +17,7 @@ import java.util.Set; import junit.framework.TestCase; +import org.aspectj.bridge.IMessageHandler; import org.aspectj.weaver.ReferenceType; import org.aspectj.weaver.ResolvedMember; import org.aspectj.weaver.ResolvedType; @@ -247,7 +248,7 @@ public class ReflectionBasedReferenceTypeDelegateTest extends TestCase { boolean barfIfClinitMissing = false; world.setBehaveInJava5Way(true); - BcelWorld bcelWorld = new BcelWorld(); + BcelWorld bcelWorld = new BcelWorld(getClass().getClassLoader(),IMessageHandler.THROW,null); bcelWorld.setBehaveInJava5Way(true); UnresolvedType javaUtilHashMap = UnresolvedType.forName("java.util.HashMap"); ReferenceType rawType =(ReferenceType)bcelWorld.resolve(javaUtilHashMap ); @@ -289,7 +290,7 @@ public class ReflectionBasedReferenceTypeDelegateTest extends TestCase { // todo: array of int protected void setUp() throws Exception { - world = new ReflectionWorld(); + world = new ReflectionWorld(getClass().getClassLoader()); objectType = world.resolve("java.lang.Object"); } } diff --git a/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionWorldTest.java b/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionWorldTest.java index a38f7936b..d4729e9bf 100644 --- a/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionWorldTest.java +++ b/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionWorldTest.java @@ -19,21 +19,21 @@ import org.aspectj.weaver.World; public class ReflectionWorldTest extends TestCase { public void testDelegateCreation() { - World world = new ReflectionWorld(); + World world = new ReflectionWorld(getClass().getClassLoader()); ResolvedType rt = world.resolve("java.lang.Object"); assertNotNull(rt); assertEquals("Ljava/lang/Object;",rt.getSignature()); } public void testArrayTypes() { - ReflectionWorld world = new ReflectionWorld(); + ReflectionWorld world = new ReflectionWorld(getClass().getClassLoader()); String[] strArray = new String[1]; ResolvedType rt = world.resolve(strArray.getClass()); assertTrue(rt.isArray()); } public void testPrimitiveTypes() { - ReflectionWorld world = new ReflectionWorld(); + ReflectionWorld world = new ReflectionWorld(getClass().getClassLoader()); assertEquals("int",ResolvedType.INT,world.resolve(int.class)); assertEquals("void",ResolvedType.VOID,world.resolve(void.class)); } |