summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2004-12-10 13:29:53 +0000
committeraclement <aclement>2004-12-10 13:29:53 +0000
commit7228f3d18d71496a4089a7d5807b3d234124dd7b (patch)
treecaba0314ff606197aab4d43a93a66f5ad4df7edd
parentd279a507f5633f03f307eb8e6ace52a7a5df4d17 (diff)
downloadaspectj-7228f3d18d71496a4089a7d5807b3d234124dd7b.tar.gz
aspectj-7228f3d18d71496a4089a7d5807b3d234124dd7b.zip
Tests for declare parents where annotations are involved.
-rw-r--r--tests/java5/annotations/AnnotationAspect04.aj11
-rw-r--r--tests/java5/annotations/AnnotationAspect05.aj6
-rw-r--r--tests/java5/annotations/SimpleAnnotation2.java5
-rw-r--r--tests/java5/annotations/build.xml2
-rw-r--r--tests/java5/annotations/testcode.jarbin1551 -> 1874 bytes
5 files changed, 23 insertions, 1 deletions
diff --git a/tests/java5/annotations/AnnotationAspect04.aj b/tests/java5/annotations/AnnotationAspect04.aj
new file mode 100644
index 000000000..62466ae1c
--- /dev/null
+++ b/tests/java5/annotations/AnnotationAspect04.aj
@@ -0,0 +1,11 @@
+import java.lang.annotation.Annotation;
+
+public aspect AnnotationAspect04 {
+ declare parents: SimpleAnnotation implements java.io.Serializable;
+
+ class C extends Annotation { }
+ declare parents: SimpleAnnotation extends C;
+
+ class D {}
+ declare parents: D extends Annotation;
+}
diff --git a/tests/java5/annotations/AnnotationAspect05.aj b/tests/java5/annotations/AnnotationAspect05.aj
new file mode 100644
index 000000000..1c5cf4b89
--- /dev/null
+++ b/tests/java5/annotations/AnnotationAspect05.aj
@@ -0,0 +1,6 @@
+import java.lang.annotation.Annotation;
+
+public aspect AnnotationAspect05 {
+ declare parents: SimpleA* implements java.io.Serializable;
+
+}
diff --git a/tests/java5/annotations/SimpleAnnotation2.java b/tests/java5/annotations/SimpleAnnotation2.java
new file mode 100644
index 000000000..66411fce8
--- /dev/null
+++ b/tests/java5/annotations/SimpleAnnotation2.java
@@ -0,0 +1,5 @@
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SimpleAnnotation2 {
+}
diff --git a/tests/java5/annotations/build.xml b/tests/java5/annotations/build.xml
index 8a7a20bcc..a306a1979 100644
--- a/tests/java5/annotations/build.xml
+++ b/tests/java5/annotations/build.xml
@@ -3,7 +3,7 @@
<target name="default">
<delete dir="output" failonerror="false"/>
<mkdir dir="output"/>
- <javac destdir="output" debug="on" srcdir="." includes="SimpleAnnotation.java"/>
+ <javac destdir="output" debug="on" srcdir="." includes="SimpleAnnotation*.java"/>
<javac destdir="output" debug="on" srcdir="." includes="Annotation.java"/>
<javac destdir="output" debug="on" srcdir="." includes="AnnotatedType.java"/>
<zip file="testcode.jar" basedir="output" includes="**/*"/>
diff --git a/tests/java5/annotations/testcode.jar b/tests/java5/annotations/testcode.jar
index 5fd363171..216c645ae 100644
--- a/tests/java5/annotations/testcode.jar
+++ b/tests/java5/annotations/testcode.jar
Binary files differ