some annotation matching tests

2 files changed, 22 insertions, 0 deletions

diff --git a/weaver5/java5-testsrc/org/aspectj/matcher/tools/ReflectionWorldAdvancedPointcutExpressionTests.java b/weaver5/java5-testsrc/org/aspectj/matcher/tools/ReflectionWorldAdvancedPointcutExpressionTests.java
new file mode 100644
index 000000000..62c17f4ce
--- /dev/null
+++ b/weaver5/java5-testsrc/org/aspectj/matcher/tools/ReflectionWorldAdvancedPointcutExpressionTests.java
@@ -0,0 +1,20 @@
+package org.aspectj.matcher.tools;
+
+import org.aspectj.matcher.tools.CommonAdvancedPointcutExpressionTests;
+import org.aspectj.weaver.World;
+import org.aspectj.weaver.reflect.ReflectionWorld;
+
+/**
+ * Run all the pointcut parsing/matching tests against a ReflectionWorld.
+ * 
+ * @author Andy Clement
+ */
+public class ReflectionWorldAdvancedPointcutExpressionTests extends CommonAdvancedPointcutExpressionTests {
+
+	protected World getWorld() {
+		World w = new ReflectionWorld(false, getClass().getClassLoader());
+		w.setBehaveInJava5Way(true);
+		return w;
+	}
+
+}
diff --git a/weaver5/java5-testsrc/org/aspectj/weaver/AllWeaver5Tests.java b/weaver5/java5-testsrc/org/aspectj/weaver/AllWeaver5Tests.java
index 9075b23ab..988470429 100644
--- a/weaver5/java5-testsrc/org/aspectj/weaver/AllWeaver5Tests.java
+++ b/weaver5/java5-testsrc/org/aspectj/weaver/AllWeaver5Tests.java
@@ -15,6 +15,7 @@ package org.aspectj.weaver;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.aspectj.matcher.tools.ReflectionWorldAdvancedPointcutExpressionTests;
 import org.aspectj.weaver.reflect.ReflectionWorldReferenceTypeTest;
 import org.aspectj.weaver.reflect.ReflectionWorldSpecificTest;
 import org.aspectj.weaver.tools.PointcutExpressionTest;
@@ -28,6 +29,7 @@ public class AllWeaver5Tests {
 		suite.addTest(BcweaverModuleTests15.suite());
 		suite.addTestSuite(ReflectionWorldReferenceTypeTest.class);
 		suite.addTestSuite(PointcutExpressionTest.class);
+		suite.addTestSuite(ReflectionWorldAdvancedPointcutExpressionTests.class);
 		suite.addTestSuite(ReflectionWorldSpecificTest.class);
 		// $JUnit-END$
 		return suite;