341446: adjust test structure to avoid inclusion of incorrect (level50) classes in...

diff --git a/org.aspectj.matcher/.classpath b/org.aspectj.matcher/.classpath
index 544d974e416123b2641646d6d686380f9d906a44..856780f91a1635ef27692ad3a0747e1c1bb3160a 100644 (file)
--- a/org.aspectj.matcher/.classpath
+++ b/org.aspectj.matcher/.classpath
@@ -8,6 +8,5 @@
        <classpathentry kind="src" path="/bridge"/>
        <classpathentry kind="lib" path="/lib/commons/commons.jar" sourcepath="/lib/commons/commons-src.zip"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry kind="lib" path="testdata/testdata.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/org.aspectj.matcher/testdata/AnnotatedClass.java b/org.aspectj.matcher/testdata/AnnotatedClass.java
deleted file mode 100644 (file)
index 80dbda4..0000000
--- a/org.aspectj.matcher/testdata/AnnotatedClass.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package testdata;
-
-@SomeAnnotation
-public class AnnotatedClass {
-
-  @MethodLevelAnnotation
-  public void annotatedMethod() { }
-
-  public void nonAnnotatedMethod() {
-  }
-}

diff --git a/org.aspectj.matcher/testdata/MethodLevelAnnotation.java b/org.aspectj.matcher/testdata/MethodLevelAnnotation.java
deleted file mode 100644 (file)
index 2f46dd8..0000000
--- a/org.aspectj.matcher/testdata/MethodLevelAnnotation.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package testdata;
-import java.lang.annotation.*;
-
-@Retention(RetentionPolicy.RUNTIME)
-@interface MethodLevelAnnotation {}

diff --git a/org.aspectj.matcher/testdata/SomeAnnotation.java b/org.aspectj.matcher/testdata/SomeAnnotation.java
deleted file mode 100644 (file)
index 25a4991..0000000
--- a/org.aspectj.matcher/testdata/SomeAnnotation.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package testdata;
-
-import java.lang.annotation.*;
-
-@Retention(RetentionPolicy.RUNTIME)
-@interface SomeAnnotation {}

diff --git a/org.aspectj.matcher/testdata/testdata.jar b/org.aspectj.matcher/testdata/testdata.jar
deleted file mode 100644 (file)
index 7bbb390..0000000
Binary files a/org.aspectj.matcher/testdata/testdata.jar and /dev/null differ

diff --git a/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java b/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java
index e5fa8b0c0de2d897c4579169b38c6d0e25ee2676..2d366974869a0840a278ac5b515c697870cbe86c 100644 (file)
--- a/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java
+++ b/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java
@@ -25,14 +25,6 @@ import org.aspectj.weaver.tools.StandardPointcutParser;
  * 
  * This is based on the Reflection oriented PointcutExpressionTest in the weaver project.
  * 
- * TESTDATA. The testdata for these tests is kept in org.aspectj.matcher/testdata. It is a series of .java files that need to be
- * compiled and available at runtime. Since they are java5 (they include annotations) they cannot be in a source folder for the
- * project, so they are compiled separately and then jar'd into a testdata.jar file in that folder. This folder is defined to be on
- * the classpath for org.aspectj.matcher, this enables them to be seen by a simple world that uses the classpath of the matcher
- * project as the definition of what it can see. Other worlds, for example JDT World, will need to have those types defined in a
- * project that is accessible in the JDT World instance. Because these tests exercise Java5 matching, the concrete ReflectionWorld
- * subtype is not defined in here, it is defined in weaver5 (messy, but works well).
- * 
  * @author Andy Clement
  */
 public abstract class CommonAdvancedPointcutExpressionTests extends TestCase {

diff --git a/org.aspectj.matcher/testsrc/testdata/AnnotatedClass.java b/org.aspectj.matcher/testsrc/testdata/AnnotatedClass.java
new file mode 100644 (file)
index 0000000..80dbda4
--- /dev/null
+++ b/org.aspectj.matcher/testsrc/testdata/AnnotatedClass.java
@@ -0,0 +1,11 @@
+package testdata;
+
+@SomeAnnotation
+public class AnnotatedClass {
+
+  @MethodLevelAnnotation
+  public void annotatedMethod() { }
+
+  public void nonAnnotatedMethod() {
+  }
+}

diff --git a/org.aspectj.matcher/testsrc/testdata/MethodLevelAnnotation.java b/org.aspectj.matcher/testsrc/testdata/MethodLevelAnnotation.java
new file mode 100644 (file)
index 0000000..2f46dd8
--- /dev/null
+++ b/org.aspectj.matcher/testsrc/testdata/MethodLevelAnnotation.java
@@ -0,0 +1,5 @@
+package testdata;
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface MethodLevelAnnotation {}

diff --git a/org.aspectj.matcher/testsrc/testdata/SomeAnnotation.java b/org.aspectj.matcher/testsrc/testdata/SomeAnnotation.java
new file mode 100644 (file)
index 0000000..25a4991
--- /dev/null
+++ b/org.aspectj.matcher/testsrc/testdata/SomeAnnotation.java
@@ -0,0 +1,6 @@
+package testdata;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface SomeAnnotation {}