From f8ca9028e9993580919f2794875f4e2a531b082c Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Wed, 24 Aug 2005 08:06:22 +0000
Subject: new @override test plus genericitd bridge method tests.

---
 tests/src/org/aspectj/systemtest/ajc150/ajc150.xml | 57 ++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index e1c1c8ede..9d819c0e7 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -339,6 +339,9 @@
     <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 6">
       <compile files="AtOverride6.aj" options="-1.5"/>
     </ajc-test>
+    <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs - 7">
+      <compile files="AtOverride7.aj" options="-1.5"/>
+    </ajc-test>
                
     <!-- end of atOverride tests with ITDs -->
 
@@ -3388,6 +3391,60 @@
 
    <!-- end of generics/itds and binary weaving -->
    
+   <!-- generics/itds and bridge methods -->
+   
+   <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>   
+   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="bridging with covariance 1 itd">
+     <compile files="BridgingITD1.aj,Util.java" options="-1.5"/>
+     <run class="BridgingITD1"/>
+   </ajc-test>
+
+   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="basic bridging with type vars - 1 - normal">
+     <compile files="Bridging2.aj,Util.java" options="-1.5"/>
+     <run class="Bridging2"> 
+	     <stderr>
+	       <line text="Number of methods defined for D is 2"/>
+	       <line text="java.lang.Object D.next() [BridgeMethod]"/>
+	       <line text="java.lang.String D.next()"/>
+	     </stderr>
+     </run>
+   </ajc-test>
+   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="basic bridging with type vars - 1 - itd">
+     <compile files="BridgingITD2.aj,Util.java" options="-1.5"/>
+     <run class="BridgingITD2"> 
+	     <stderr>
+	       <line text="Number of methods defined for D is 2"/>
+	       <line text="java.lang.Object D.next() [BridgeMethod]"/>
+	       <line text="java.lang.String D.next()"/>
+	     </stderr>
+     </run>
+   </ajc-test>
+   
+   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="basic bridging with type vars - 2">
+     <compile files="Bridging3.aj,Util.java" options="-1.5"/>
+     <run class="Bridging3"> 
+	     <stderr>
+	       <line text="Number of methods defined for D is 2"/>
+	       <line text="java.lang.Object D.id(java.lang.Object) [BridgeMethod]"/>
+	       <line text="java.lang.String D.id(java.lang.String)"/>
+	     </stderr>
+     </run>
+   </ajc-test>
+   
+   <ajc-test dir="java5/generics/itds/bridgeMethods" vm="1.5" title="Abstract intertype method and covariant returns" pr="91381">
+     <compile files="pr91381.aj" options="-1.5,-showWeaveInfo">
+       <message kind="weave" text="Type 'A' (pr91381.aj) has intertyped method from 'pr91381' (pr91381.aj:'java.lang.Object A.foo()')"/>
+     </compile>
+     <run class="pr91381"/>
+   </ajc-test>
+   
+   
+   
+   <!-- end of generics/itds and bridge methods -->   
+   
    <!-- generics and  pointcuts -->
 
    <ajc-test dir="java5/generics/pointcuts" title="handler pcd and generics / type vars">
-- 
cgit v1.2.3