Progress on: Bug 130869: Pointcut resolution fails against type variables

https://bugs.eclipse.org/bugs/show_bug.cgi?id=130869
fix and test case...

2 files changed, 77 insertions, 0 deletions

diff --git a/tests/bugs151/GenericAspectWithAnnotationTypeParameter.aj b/tests/bugs151/GenericAspectWithAnnotationTypeParameter.aj
new file mode 100644
index 000000000..e4cc3f1be
--- /dev/null
+++ b/tests/bugs151/GenericAspectWithAnnotationTypeParameter.aj
@@ -0,0 +1,35 @@
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+public class GenericAspectWithAnnotationTypeParameter {
+	
+	@AnnOne
+	@AnnTwo
+	public static void main(String[] args) {
+		System.out.println("hello");
+	}
+	
+	
+}
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface AnnOne {}
+@interface AnnTwo {}
+
+abstract aspect AnnotationMatcher<A extends Annotation> {
+	
+	before() : execution(* *(..)) && @annotation(A) {
+		System.out.println("annotation match - no binding");
+	}
+	
+	before() : execution(@A * *(..)) {
+		System.out.println("execution with annotation match");
+	}
+	
+	before(A anAnnotation) : execution(* *(..)) && @annotation(anAnnotation) {
+		System.out.println("annotation match - binding");
+	}
+}
+
+aspect AnnOneMatcher extends AnnotationMatcher<AnnOne> {}
\ No newline at end of file
diff --git a/tests/bugs151/pr130869.aj b/tests/bugs151/pr130869.aj
new file mode 100644
index 000000000..c46e21640
--- /dev/null
+++ b/tests/bugs151/pr130869.aj
@@ -0,0 +1,42 @@
+abstract aspect AbstractSystemArchitecture {
+
+	public abstract pointcut inMyApplication();
+	
+	// more pointcuts below...
+	
+}
+
+aspect MySystemArchitecture extends AbstractSystemArchitecture {
+	
+	public pointcut inMyApplication() : within(SomeClass);
+	
+}
+
+abstract aspect NoDirectlyRunnableClasses<A extends AbstractSystemArchitecture> {
+	
+	declare warning : execution(public static void main(String[])) &&
+	                  A.inMyApplication()
+	                : "no directly runnable classes";
+
+}
+
+aspect NoRunnablesInMyApp extends NoDirectlyRunnableClasses<MySystemArchitecture> {
+	
+}
+
+
+class SomeClass {
+
+	public static void main(String[] args) {  // CW L30
+		System.out.println("hello");
+	}
+
+}
+
+class SomeOtherClass {
+
+	public static void main(String[] args) {  // no warning
+		System.out.println("hello");
+	}
+
+}
\ No newline at end of file