280383: test and fix: itd ctor handles and npe with default ctor itd

diff --git a/tests/multiIncremental/pr280383/base/src/f/AClass.java b/tests/multiIncremental/pr280383/base/src/f/AClass.java
new file mode 100644 (file)
index 0000000..64adb00
--- /dev/null
+++ b/tests/multiIncremental/pr280383/base/src/f/AClass.java
@@ -0,0 +1,4 @@
+package f;
+
+public class AClass {
+}
\ No newline at end of file

diff --git a/tests/multiIncremental/pr280383/base/src/f/AnAspect.java b/tests/multiIncremental/pr280383/base/src/f/AnAspect.java
new file mode 100644 (file)
index 0000000..989ac10
--- /dev/null
+++ b/tests/multiIncremental/pr280383/base/src/f/AnAspect.java
@@ -0,0 +1,7 @@
+package f;
+
+public aspect AnAspect {
+        f.AClass.new() {
+                this();
+        }
+}  
\ No newline at end of file

diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index 8c7f6101483de885edaa193f6e2a79c29f5e0165..63778f474dc2e729a84134f44ffe5d18b94fd30a 100644 (file)
--- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
@@ -56,8 +56,8 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
        // public void testIncrementalFqItds_280380() throws Exception {
        // String p = "pr280380";
        // initialiseProject(p);
-       // // build(p);
-       // // printModel(p);
+       // build(p);
+       // printModel(p);
        // alter(p, "inc1");
        // build(p);
        // printModel(p);
@@ -69,6 +69,16 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
        // // Hid:6:(targets=1) =pr280380<g*AnAspect.aj}AnAspect)AClass.xxxx (declared on) =pr280380<f{AClass.java[AClass
        // }
 
+       public void testIncrementalCtorItdHandle_280383() throws Exception {
+               String p = "pr280383";
+               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 testIncrementalAnnotationMatched_276399() throws Exception {
                String p = "pr276399";
                initialiseProject(p);