From 382db453417023bddc42ab14fb5fac4da45b7362 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Wed, 19 Mar 2008 23:32:39 +0000
Subject: [PATCH] 173602 : testcode and fix for duplicate ITDs and NPE

---
 tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java | 3 +++
 tests/src/org/aspectj/systemtest/ajc160/ajc160.xml       | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java b/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java
index 528b0cec1..2d2fc87e1 100644
--- 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 09595b41a..3669dce2f 100644
--- 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"/>
-- 
2.39.5