test and fix for pr132349: itds on inner type of generic type

2 files changed, 26 insertions, 0 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
index 9140b5418..16819a7fb 100644
--- a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
@@ -17,6 +17,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+  public void testItdOnInnerTypeOfGenericType_pr132349() { runTest("ITD on inner type of generic type");}
+  public void testItdOnInnerTypeOfGenericType_pr132349_2() { runTest("ITD on inner type of generic type - 2");}
+  public void testItdOnInnerTypeOfGenericType_pr132349_3() { runTest("ITD on inner type of generic type - 3");}
+//  public void testCovarianceAndDecp_pr128443_1() { runTest("covariance and decp - 1"); }
   public void testLTWGeneratedAspectAbstractMethod_pr125480() { runTest("aop.xml aspect inheriting abstract method ");} 
   public void testLTWGeneratedAspectAbstractMethod_pr125480_2() { runTest("aop.xml aspect inheriting abstract method - code style");} 
   //public void testSuperITDExplosion_pr134425() { runTest("super ITDs");}
diff --git a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
index fea570ff0..aaa4a7c07 100644
--- a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
+++ b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
@@ -14,6 +14,24 @@
          </stderr>
       </run>
     </ajc-test>
+
+    <ajc-test dir="bugs152/pr132349" title="ITD on inner type of generic type">
+     <compile files="TopLevelType.java" options="-1.5"/>
+     <run class="TopLevelType"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs152/pr132349" title="ITD on inner type of generic type - 2">
+     <compile files="TopLevelType2.java" options="-1.5">
+       <message kind="error" line="12"/> <!-- error message is currently crap - its a parser message -->
+     </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs152/pr132349" title="ITD on inner type of generic type - 3">
+     <compile files="TopLevelType3.java" options="-1.5">
+       <message kind="error" line="12" text="Cannot make inter-type declarations on parameterized types"/>
+       <message kind="error" line="7" text="The method someMethod() is undefined for the type TopLevelType3.NestedType"/>
+     </compile>
+    </ajc-test>
     
     <ajc-test dir="bugs152/pr135865" title="misbehaving declare annotation">
       <compile files="B.java,A.java" options="-1.5 -Xlint:ignore">
@@ -404,6 +422,10 @@
       <run class="Derived"/>
     </ajc-test>
     
+    <ajc-test dir="bugs152/pr128443" title="covariance and decp - 1">
+      <compile files="Covariance.java" options="-1.5"/>
+    </ajc-test>
+    
     <!-- wont work whilst the compiler BuildArgParser.setDebugOptions is always switching debug on -->
     <ajc-test dir="bugs152/pr129408" title="long winded ataj messages">
       <compile files="AtAj.java" options="-XterminateAfterCompilation -g:none -1.5"/>