tests and fixes for 161502: annotation style generic pointcuts (!)

2 files changed, 68 insertions, 0 deletions

diff --git a/tests/bugs153/pr161502/Main.java b/tests/bugs153/pr161502/Main.java
new file mode 100644
index 000000000..81a1eae09
--- /dev/null
+++ b/tests/bugs153/pr161502/Main.java
@@ -0,0 +1,34 @@
+import java.util.ArrayList;
+import java.util.List;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+
+public class Main {
+
+  public List<? extends Element> getElements() {
+    return new ArrayList<Element>();
+  }
+
+  class Element {};
+
+  @Aspect
+  static abstract class Base<T> {
+    @Around("call(List<? extends T> *.*(..))")
+    public List<? extends T> elementList(ProceedingJoinPoint thisJoinPoint) {
+      try {
+        return (List<? extends T>)thisJoinPoint.proceed();
+      } catch (Throwable e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+
+  @Aspect
+  static class Concrete extends Base<Element> {}
+
+  public static void main(String[] args) {
+    new Main().getElements();
+  }
+
+}
\ No newline at end of file
diff --git a/tests/bugs153/pr161502/Main2.java b/tests/bugs153/pr161502/Main2.java
new file mode 100644
index 000000000..b87503b28
--- /dev/null
+++ b/tests/bugs153/pr161502/Main2.java
@@ -0,0 +1,34 @@
+import java.util.ArrayList;
+import java.util.List;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+
+public class Main2 {
+
+  public List<? extends Element> getElements() {
+    return new ArrayList<Element>();
+  }
+
+  class Element {};
+
+  @Aspect
+  static abstract class Base<T> {
+    @Around("call(List<? extends T> *.*(..))")
+    public List<? extends T> elementList(ProceedingJoinPoint thisJoinPoint) {
+      try {
+        return (List<? extends T>)thisJoinPoint.proceed();
+      } catch (Throwable e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+
+  @Aspect
+  static class Concrete extends Base<String> {} // pointcut won't match because not a call to "List<? extends String> *(..)"
+
+  public static void main(String[] args) {
+    new Main2().getElements();
+  }
+
+}
\ No newline at end of file