diff options
| -rw-r--r-- | org.aspectj.matcher/.classpath | 1 | ||||
| -rw-r--r-- | org.aspectj.matcher/testdata/testdata.jar | bin | 1241 -> 0 bytes | |||
| -rw-r--r-- | org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java | 8 | ||||
| -rw-r--r-- | org.aspectj.matcher/testsrc/testdata/AnnotatedClass.java (renamed from org.aspectj.matcher/testdata/AnnotatedClass.java) | 0 | ||||
| -rw-r--r-- | org.aspectj.matcher/testsrc/testdata/MethodLevelAnnotation.java (renamed from org.aspectj.matcher/testdata/MethodLevelAnnotation.java) | 0 | ||||
| -rw-r--r-- | org.aspectj.matcher/testsrc/testdata/SomeAnnotation.java (renamed from org.aspectj.matcher/testdata/SomeAnnotation.java) | 0 |
6 files changed, 0 insertions, 9 deletions
diff --git a/org.aspectj.matcher/.classpath b/org.aspectj.matcher/.classpath index 544d974e4..856780f91 100644 --- 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/testdata.jar b/org.aspectj.matcher/testdata/testdata.jar Binary files differdeleted file mode 100644 index 7bbb39068..000000000 --- a/org.aspectj.matcher/testdata/testdata.jar +++ /dev/null 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 e5fa8b0c0..2d3669748 100644 --- 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/testdata/AnnotatedClass.java b/org.aspectj.matcher/testsrc/testdata/AnnotatedClass.java index 80dbda413..80dbda413 100644 --- a/org.aspectj.matcher/testdata/AnnotatedClass.java +++ b/org.aspectj.matcher/testsrc/testdata/AnnotatedClass.java diff --git a/org.aspectj.matcher/testdata/MethodLevelAnnotation.java b/org.aspectj.matcher/testsrc/testdata/MethodLevelAnnotation.java index 2f46dd8ab..2f46dd8ab 100644 --- a/org.aspectj.matcher/testdata/MethodLevelAnnotation.java +++ b/org.aspectj.matcher/testsrc/testdata/MethodLevelAnnotation.java diff --git a/org.aspectj.matcher/testdata/SomeAnnotation.java b/org.aspectj.matcher/testsrc/testdata/SomeAnnotation.java index 25a4991d6..25a4991d6 100644 --- a/org.aspectj.matcher/testdata/SomeAnnotation.java +++ b/org.aspectj.matcher/testsrc/testdata/SomeAnnotation.java |