generic itd bridge tests - not all activated yet.

2 files changed, 47 insertions, 6 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
index f29231c1d..d49ce9aa7 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
@@ -404,7 +404,7 @@ public class GenericsTests extends XMLBasedAjcTestCase {
 	public void testAtOverride7()  {runTest("atOverride used with ITDs - 7");}
 	
 	
-	// bridge methods
+		// bridge methods
 //	public void testITDBridgeMethodsCovariance1() {runTest("bridging with covariance 1 normal");}
 //	public void testITDBridgeMethodsCovariance2() {runTest("bridging with covariance 1 itd");}
 //	public void testITDBridgeMethodsCovariance3() {runTest("bridging with covariance 1 itd binary weaving");}
@@ -412,8 +412,15 @@ public class GenericsTests extends XMLBasedAjcTestCase {
 //	public void testITDBridgeMethods1Itd()    {runTest("basic bridging with type vars - 1 - itd");}
 //	public void testITDBridgeMethods2() {runTest("basic bridging with type vars - 2");}
 //	public void testITDBridgeMethodsPr91381() {runTest("Abstract intertype method and covariant returns");}
-	 	
 	
+    public void testGenericITDsBridgeMethods1()        {runTest("bridge methods -1");}
+//	public void testGenericITDsBridgeMethods1binary()  {runTest("bridge methods -1binary");}
+	public void testGenericITDsBridgeMethods2()        {runTest("bridge methods -2");}
+//	public void testGenericITDsBridgeMethods2binary()  {runTest("bridge methods -2binary");}
+	public void testGenericITDsBridgeMethods3()        {runTest("bridge methods -3");}
+//	public void testGenericITDsBridgeMethods3binary()  {runTest("bridge methods -3binary");}
+	
+	public void testGenericITDsBridgeMethodsPR91381()  {runTest("abstract intertype methods and covariant returns");}
 
 	// ----------------------------------------------------------------------------------------
 	// generic declare parents tests
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 9d819c0e7..2aa6f8ada 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -3393,7 +3393,43 @@
    
    <!-- generics/itds and bridge methods -->
    
-   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridging with covariance 1 normal">
+   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods -1">
+   	   <compile files="Sub1.java,Super1.java,X1.aj,Util.java" options="-1.5"/>
+       <run class="X1"/>
+   </ajc-test>
+   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods -1binary">
+   	 <compile files="Sub1.java,Super1.java" outjar="code.jar" options="-1.5,-Xreweavable"/>
+   	 <compile files="X1.aj,Util.java" inpath="code.jar" options ="-1.5,-Xreweavable"/>
+     <run class="X1"/>
+   </ajc-test>
+ 
+   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods -2">
+   	   <compile files="Sub2.java,Super2.java,X2.aj,Util.java" options="-1.5"/>
+       <run class="X2"/>
+   </ajc-test>
+   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods -2binary">
+   	 <compile files="Sub2.java,Super2.java" outjar="code.jar" options="-1.5,-Xreweavable"/>
+   	 <compile files="X2.aj,Util.java" inpath="code.jar" options ="-1.5,-Xreweavable"/>
+     <run class="X2"/>
+   </ajc-test>
+      
+   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods -3">
+   	 <compile files="Sub3.java,Super3.java,X3.aj,Util.java" options="-1.5"/>
+     <run class="X3"/>
+   </ajc-test>
+   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridge methods -3binary">
+   	 <compile files="Sub3.java,Super3.java" outjar="code.jar" options="-1.5,-Xreweavable"/>
+   	 <compile files="X3.aj,Util.java" inpath="code.jar" options ="-1.5,-Xreweavable"/>
+     <run class="X3"/>
+   </ajc-test>
+      
+   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="abstract intertype methods and covariant returns">
+   	   <compile files="pr91381.aj" options="-1.5"/>
+       <run class="pr91381"/>
+   </ajc-test>
+   
+
+ <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridging with covariance 1 normal">
      <compile files="Bridging1.aj,Util.java" options="-1.5"/>
      <run class="Bridging1"/>
    </ajc-test>   
@@ -3440,11 +3476,9 @@
      </compile>
      <run class="pr91381"/>
    </ajc-test>
+   <!-- end of generics/itds and bridge methods -->
    
    
-   
-   <!-- end of generics/itds and bridge methods -->   
-   
    <!-- generics and  pointcuts -->
 
    <ajc-test dir="java5/generics/pointcuts" title="handler pcd and generics / type vars">