test and fix for 124654: generic annotation matching..

2 files changed, 34 insertions, 0 deletions

diff --git a/tests/bugs151/pr124654/GenericAnnotation.java b/tests/bugs151/pr124654/GenericAnnotation.java
new file mode 100644
index 000000000..1bb725b55
--- /dev/null
+++ b/tests/bugs151/pr124654/GenericAnnotation.java
@@ -0,0 +1,15 @@
+import java.lang.annotation.Annotation;
+
+public abstract aspect GenericAnnotation<A extends Annotation> {
+
+   pointcut annotatedCall(A a) : call(@A * *.*(..)) && @annotation(a);
+
+   before(A a) : annotatedCall(a) {
+       System.err.println("Reference pointcut advice. "+a.annotationType());
+   }
+
+   before(A a) : call(@A * *.*(..)) && @annotation(a) {
+       System.err.println("Inlined pointcut advice. "+a.annotationType());
+   }
+
+}
diff --git a/tests/bugs151/pr124654/TestSubAspect.java b/tests/bugs151/pr124654/TestSubAspect.java
new file mode 100644
index 000000000..4af2d303f
--- /dev/null
+++ b/tests/bugs151/pr124654/TestSubAspect.java
@@ -0,0 +1,19 @@
+import java.lang.annotation.*;
+
+public aspect TestSubAspect extends GenericAnnotation<MyAnnotation> {
+
+  public static void main(String []argv) {
+    new BasicType().run();
+  }
+}
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface MyAnnotation {}
+
+
+class BasicType {
+  @MyAnnotation
+  public void run() {
+    System.err.println("run running");
+  }
+}