283657: fix

3 files changed, 75 insertions, 0 deletions

diff --git a/tests/multiIncremental/pr283657/base/src/Aspect.java b/tests/multiIncremental/pr283657/base/src/Aspect.java
new file mode 100644
index 000000000..2bb1cbb43
--- /dev/null
+++ b/tests/multiIncremental/pr283657/base/src/Aspect.java
@@ -0,0 +1,14 @@
+public aspect Aspect {
+        int Target.foo = 9;
+
+        void Target.foo() {
+
+        }
+}
+
+
+class Target {
+
+}
+
+
diff --git a/tests/multiIncremental/pr283864/base/src/Failing.java b/tests/multiIncremental/pr283864/base/src/Failing.java
new file mode 100644
index 000000000..bb50b8664
--- /dev/null
+++ b/tests/multiIncremental/pr283864/base/src/Failing.java
@@ -0,0 +1,35 @@
+public aspect Failing {
+    pointcut failingPointcut() : execution(* foo*(..));
+
+    after() returning() : failingPointcut()
+    {
+        System.out.println("hit");
+    }
+}
+
+class X <T extends Object> {
+    // Pointcut match highlighted
+//    void foo() {}
+
+    // Pointcut match highlighted
+//    void foo1(T x) {}   
+
+    // Pointcut not highlighted
+    void foo2(T[] x) {}
+
+    // Pointcut not highlighted
+//    void foo3(T... x) {}
+
+    // Pointcut highlighted
+//    T foo3() { return null; }
+
+    // Pointcut highlighted
+//    T[] foo4() { return null; }
+
+    public static void main(String[] args) {
+        X<Object> x = new X<Object>();
+
+        x.foo2(null);       
+    }
+}
+
diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index e4261309d..ee2b22be4 100644
--- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
@@ -150,6 +150,32 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
 		assertNotNull(rels);
 	}
 
+	// public void testArraysGenerics() throws Exception {
+	// String p = "pr283864";
+	// initialiseProject(p);
+	// build(p);
+	// printModel(p);
+	// // IRelationshipMap irm = getModelFor(p).getRelationshipMap();
+	// // List rels = irm.get("=pr280383<f{AnAspect.java}AnAspect)f.AClass.f_AClass_new");
+	// // assertNotNull(rels);
+	// }
+
+	public void testSimilarITDS() throws Exception {
+		String p = "pr283657";
+		initialiseProject(p);
+		build(p);
+		// printModel(p);
+		// Hid:1:(targets=1) =pr283657<{Aspect.java}Aspect)Target.foo (declared on) =pr283657<{Aspect.java[Target
+		// Hid:2:(targets=1) =pr283657<{Aspect.java}Aspect)Target.foo!2 (declared on) =pr283657<{Aspect.java[Target
+		// Hid:3:(targets=2) =pr283657<{Aspect.java[Target (aspect declarations) =pr283657<{Aspect.java}Aspect)Target.foo
+		// Hid:4:(targets=2) =pr283657<{Aspect.java[Target (aspect declarations) =pr283657<{Aspect.java}Aspect)Target.foo!2
+		IRelationshipMap irm = getModelFor(p).getRelationshipMap();
+		List rels = irm.get("=pr283657<{Aspect.java}Aspect)Target.foo");
+		assertNotNull(rels);
+		rels = irm.get("=pr283657<{Aspect.java}Aspect)Target.foo!2");
+		assertNotNull(rels);
+	}
+
 	public void testIncrementalAnnotationMatched_276399() throws Exception {
 		String p = "pr276399";
 		initialiseProject(p);