Test for pr90806

2 files changed, 16 insertions, 1 deletions

diff --git a/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java
index 41528d40c..a38c7a61b 100644
--- a/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java
@@ -249,5 +249,11 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
       assertTrue("Should say updated hello",after.getStdOut().startsWith("updated hello"));
   }
   
+  public void testUsesPointcutRelsWhenReferringToPCTIn2ndFile_pr90806() throws Exception {
+	    runTest("NPE in genHandleIdentifier");
+	    nextIncrement(true);
+	    copyFileAndDoIncrementalBuild("changes/X.20.aj","src/X.aj");
+  }
+  
 }
 
diff --git a/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml b/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
index b3fb62d8b..b16dd107e 100644
--- a/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
+++ b/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
@@ -368,4 +368,13 @@
         </inc-compile>
         <run class="Main"/>
         -->
-    </ajc-test>
\ No newline at end of file
+    </ajc-test>
+    
+    <ajc-test dir="incremental/structureModel"
+      pr="90806"
+      keywords="incremental-test"
+   	  title="NPE in genHandleIdentifier">
+        <compile staging="true"	options="-incremental,-verbose,-emacssym" sourceroots="src"/>
+        <!--inc-compile tag="20"/-->
+    </ajc-test>
+	
\ No newline at end of file