338175: coping better with bad code

diff --git a/tests/bugs1612/pr338175/pack1/Aspect.java b/tests/bugs1612/pr338175/pack1/Aspect.java
new file mode 100644 (file)
index 0000000..6e042ee
--- /dev/null
+++ b/tests/bugs1612/pr338175/pack1/Aspect.java
@@ -0,0 +1,10 @@
+package pack1;
+import pack2.Java;
+import pack2.Java2;
+public aspect Aspect {
+  public static final class Java.ITIT {
+    public static final java.util.List<String> X = null;    
+    public static final int X() { return 9; }  }  
+  public static final class Java2.ITIT {
+    public static final java.util.List<String> X2 = null;   
+    public static final int X2() { return 9; }  }}

diff --git a/tests/bugs1612/pr338175/pack2/Java.java b/tests/bugs1612/pr338175/pack2/Java.java
new file mode 100644 (file)
index 0000000..c32e970
--- /dev/null
+++ b/tests/bugs1612/pr338175/pack2/Java.java
@@ -0,0 +1,2 @@
+package pack2;
+public class Java {}

diff --git a/tests/bugs1612/pr338175/pack2/Java2.java b/tests/bugs1612/pr338175/pack2/Java2.java
new file mode 100644 (file)
index 0000000..41ef75c
--- /dev/null
+++ b/tests/bugs1612/pr338175/pack2/Java2.java
@@ -0,0 +1,2 @@
+package pack2;
+public class Java2 {}

diff --git a/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java b/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
index 55aa6d3bb3a3505d6e144db2e6f575c83b0f6a39..5af06a3cd67934bebf719b496ba400941055f545 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
@@ -21,6 +21,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
  */
 public class Ajc1612Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+       public void testITIT_338175() {
+               runTest("itit");
+       }
+
        public void testThrowsClause_292239() {
                runTest("throws clause");
        }

diff --git a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
index 943b4f28a16bacc24660c669f568d114e6df0b9d..f32b5497e44bbfaa1758a01940dcb3d329b9d5d9 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
+++ b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
@@ -2,6 +2,13 @@
 
 <suite>
 
+<ajc-test dir="bugs1612/pr338175" title="itit">
+<compile files="pack1/Aspect.java pack2/Java.java pack2/Java2.java" options="-1.5">
+       <message kind="error" text="Duplicate nested type ITIT"/>
+       <message kind="error" text="can't determine modifiers"/>
+</compile>
+</ajc-test>
+
   <ajc-test dir="bugs1612/pr292239" title="throws clause">
        <compile files="Code.java" options="-1.5 -showWeaveInfo">
          <message kind="weave" text="Join point 'method-execution(void mypackage.Code.n())' in Type 'mypackage.Code' (Code.java:19) advised by afterThrowing advice from 'mypackage.Azpect' (Code.java:9)"/>