173602 : testcode and fix for duplicate ITDs and NPE

diff --git a/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java b/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java
index 528b0cec1a75798a5a81a5a52b6cedce61d3fc27..2d2fc87e151b9163b02f2df0ebf30632bcb4196c 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java
@@ -22,6 +22,9 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 public class Ajc160Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
        
        // AspectJ1.6.0rc1
+    public void testDuplicateITDsNPE_pr173602() {
+        runTest("duplicate itd npe");
+    }
     public void testLTWITDs_pr223094() {
         runTest("ltw inherited itds");
     }

diff --git a/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml b/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml
index 09595b41af6ebe77e5eeea764621adb56ec1e3d7..3669dce2f79357a47258360ceb83dace30592f00 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml
+++ b/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml
@@ -3,6 +3,14 @@
 <!-- AspectJ v1.6.0 Tests -->
 <suite>
 
+       <ajc-test dir="bugs160/pr173602" title="duplicate itd npe">
+               <compile files="X.java">
+                 <message kind="error" line="2" text="intertype declaration from "/>
+                 <message kind="error" line="3" text="intertype declaration from "/>
+                 <message kind="error" line="6" text="intertype declaration from "/>
+               </compile>
+       </ajc-test>
+       
     <ajc-test dir="bugs160/pr223094" title="ltw inherited itds">
       <compile files="B.java" outjar="foo.jar"/>
       <compile files="A.java" classpath="$sandbox/foo.jar"/>