generics: simple decp test, woooo !

3 files changed, 51 insertions, 4 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 35701e80f..89c2b6be9 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -165,6 +165,10 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void testInternalCompilerError_pr86832() {
 	  runTest("Internal compiler error");
   }
+  
+  public void testCloneMethod_pr83311() {
+	  runTest("overriding/polymorphism error on interface method introduction");
+  }
 
   /**
    * IfPointcut.findResidueInternal() was modified to make this test complete in a short amount
@@ -179,6 +183,7 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void testStaticImports_pr84260() {runTest("static import failures");} 
   
   public void testGenerics_pr99089() {runTest("ArrayIndexOutOfBoundsException - Generics in privileged aspects");}
+  public void testGenerics_pr95993() {runTest("NPE at ClassScope.java:660 when compiling generic class");}
   
   public void testItdGenerics_pr99228()  {runTest("ITD of a field into a generic class");}
   public void testItdGenerics_pr98320()  {runTest("intertype with nested generic type");}
diff --git a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
index 46663cada..a385c6b92 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
@@ -98,9 +98,27 @@ public class GenericsTests extends XMLBasedAjcTestCase {
 //	}
 
 	// generic declare parents
-//	public void testPR96220_GenericDecp() {
-//		runTest("generic decp");
+	public void testPR96220_GenericDecp() {
+		runTest("generic decp - simple");
+	}
+	
+//	public void testGenericDecpMultipleVariantsOfAParameterizedType() {
+//		runTest("generic decp - implementing two variants");
 //	}
+//	
+//	public void testGenericDecpIncorrectNumberOfTypeParams() {
+//		runTest("generic decp - incorrect number of type parameters");
+//	}
+//	
+//	public void testGenericDecpSpecifyingBounds() {
+//		runTest("generic decp - specifying bounds");
+//	}
+//	
+//	public void testGenericDecpViolatingBounds() {
+//		runTest("generic decp - specifying bounds but breaking them");
+//	}
+	
+	// need separate compilation test to verify signatures are ok
 //
 //	public void testIllegalGenericDecp() {
 //		runTest("illegal generic decp");
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index c156bc7bd..32155d554 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -51,6 +51,10 @@
         </compile>
     </ajc-test>
     
+   <ajc-test dir="bugs150" pr="83311" title="overriding/polymorphism error on interface method introduction">
+     <compile files="pr83311.aj"/>
+   </ajc-test>
+    
     <ajc-test dir="bugs150/pr84260" vm="1.5" title="static import failures">
         <compile files="A.java,I1.java,I2.java" options="-1.5"/>
         <run class="I1">
@@ -2387,15 +2391,35 @@
    
    // generic decps
    
-   <ajc-test dir="java5/generics/decp" title="generic decp">
+   <ajc-test dir="java5/generics/decp" title="generic decp - simple">
      <compile files="Basic.aj" options="-1.5"/>
      <run class="Basic"/>
    </ajc-test>
    
-   <ajc-test dir="java5/generics/decp" title="illegal generic decp">
+   <ajc-test dir="java5/generics/decp" title="generic decp - implementing two variants">
      <compile files="Basic2.aj" options="-1.5"/>
+     <run class="Basic2"/>
+   </ajc-test>
+   
+   <ajc-test dir="java5/generics/decp" title="generic decp - incorrect number of type parameters">
+     <compile files="Basic3.aj" options="-1.5"/>
+     <run class="Basic3"/>
+   </ajc-test>
+   
+   <ajc-test dir="java5/generics/decp" title="generic decp - specifying bounds">
+     <compile files="Basic4.aj" options="-1.5"/>
+     <run class="Basic4"/>
+   </ajc-test>
+   
+   <ajc-test dir="java5/generics/decp" title="generic decp - specifying bounds but breaking them">
+     <compile files="Basic5.aj" options="-1.5"/>
+     <run class="Basic5"/>
    </ajc-test>
    
+   <!--ajc-test dir="java5/generics/decp" title="illegal generic decp">
+     <compile files="Basic2.aj" options="-1.5"/>
+   </ajc-test-->
+   
    // end of generic decps
    <!-- ============================================================== -->
    <!--     End of generics tests                                      -->