more tests... binary bridge methods and the one reported via the list which includes decps parameterization and ITDs

2 files changed, 24 insertions, 1 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
index 8e10c9e17..a42f62f05 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
@@ -208,6 +208,10 @@ public class GenericsTests extends XMLBasedAjcTestCase {
 		runTest("Compilation error on generic member introduction");
 	}
 	
+	public void testGenericsOverrides() { 
+		runTest("generics and ITD overrides");
+	}
+	
 	public void testPR88606() {
 		runTest("Parameterized types on introduced fields not correctly recognized");
 	}
@@ -501,6 +505,13 @@ public class GenericsTests extends XMLBasedAjcTestCase {
 				"java.lang.Integer TwoB.firstMethod(java.lang.String)"
 		});
 	}
+	public void testBinaryBridgeMethodsThree() {
+		runTest("binary bridge methods - three");
+		checkMethodsExist("ThreeB",new String[]{
+				"java.lang.Number ThreeB.m() [BridgeMethod]",
+				"java.lang.Double ThreeB.m()"
+		});
+	}
 	
 	
 	public void testGenericITDsBridgeMethodsPR91381()  {runTest("abstract intertype methods and covariant returns");}
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index f49ea1c2e..f84bcf8cf 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -190,6 +190,12 @@
 			<message kind="error" line="5" text="The field 'int B.noSuchField' does not exist"/>
         </compile>
     </ajc-test> 
+    
+    <ajc-test dir="java5/generics/bugs/lists" title="generics and ITD overrides">
+        <compile files="Identifiable.java,Bean.java,LongIdentifiable.java,IdentifiableAspect.java" options="-1.5">
+        </compile>
+        <run class="IdentifiableAspect"/>
+    </ajc-test> 
 
     <!-- Currently a warning doesn't occur if the annotation is already on the field
          (see bug 113029). If this is fixed, need to add check for this warning to this
@@ -4268,7 +4274,13 @@
      <compile files="TwoB.java" outjar="twob.jar" options="-1.5"/>
      <compile files="TwoX.java" inpath="twoa.jar;twob.jar" options="-1.5"/>
    </ajc-test>
-
+   
+   <ajc-test dir="java5/generics/binaryBridging" title="binary bridge methods - three">
+     <compile files="ThreeA.java" outjar="threea.jar" options="-1.5"/>
+     <compile files="ThreeB.java" outjar="threeb.jar" options="-1.5"/>
+     <compile files="ThreeX.java" inpath="threea.jar;threeb.jar" options="-1.5"/>
+   </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"/>