genericitds: activating more tests - including "uberaspects - U" - please dont look at it...

2 files changed, 20 insertions, 14 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
index 5adfad3f6..0a12d2df8 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
@@ -353,18 +353,19 @@ public class GenericsTests extends XMLBasedAjcTestCase {
 	public void testSophisticatedAspectsH() {runTest("uberaspects - H");}
 	public void testSophisticatedAspectsI() {runTest("uberaspects - I");}
 	public void testSophisticatedAspectsJ() {runTest("uberaspects - J");}
-//	public void testSophisticatedAspectsK() {runTest("uberaspects - K");} // FIXME asc needs some error messages writing
+	// next test commented out, error message is less than ideal - see 
+	// comment in test program as to what should be expected
+    //public void testSophisticatedAspectsK() {runTest("uberaspects - K");}
 	public void testSophisticatedAspectsL() {runTest("uberaspects - L");}
-//	public void testSophisticatedAspectsM() {runTest("uberaspects - M");} // FIXME asc needs some error messages writing
+    public void testSophisticatedAspectsM() {runTest("uberaspects - M");}
 	public void testSophisticatedAspectsN() {runTest("uberaspects - N");}
-//	public void testSophisticatedAspectsO() {runTest("uberaspects - O");} // FIXME asc needs some error messages writing
+    public void testSophisticatedAspectsO() {runTest("uberaspects - O");}
 	public void testSophisticatedAspectsP() {runTest("uberaspects - P");}
 	public void testSophisticatedAspectsQ() {runTest("uberaspects - Q");}
 	public void testSophisticatedAspectsR() {runTest("uberaspects - R");}
 	public void testSophisticatedAspectsS() {runTest("uberaspects - S");}
 	public void testSophisticatedAspectsT() {runTest("uberaspects - T");}
-
-	//public void testSophisticatedAspectsU() {runTest("uberaspects - U");}
+	public void testSophisticatedAspectsU() {runTest("uberaspects - U");} //  includes nasty casts
 	
 	public void testBinaryWeavingITDsA() {runTest("binary weaving ITDs - A");}
 	
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 4f069aa52..cc446c82f 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -3087,27 +3087,32 @@
      <run class="GenericAspectJ"/>
    </ajc-test>
    <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - K">
-     <compile files="GenericAspectK.aj" options="-1.5"/>
-     <!-- will need error messages in here -->
-     <run class="GenericAspectK"/>
+     <compile files="GenericAspectK.aj" options="-1.5">
+       <message kind="error" line="16" text="The method m4(String) is undefined for the type Base"/>
+     </compile>
    </ajc-test>
    <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - L">
      <compile files="GenericAspectL.aj" options="-1.5"/>
      <run class="GenericAspectL"/>
    </ajc-test>
    <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - M">
-     <compile files="GenericAspectM.aj" options="-1.5"/>
-     <!-- will need error messages in here -->
-     <run class="GenericAspectM"/>
+     <compile files="GenericAspectM.aj" options="-1.5">
+       <message kind="error" line="23" text="The method m0(Integer) in the type GenericAspect&lt;A,B&gt;.SimpleI&lt;L&gt; is not applicable for the arguments (String)"/>
+       <message kind="error" line="24" text="The method m1(List&lt;Integer&gt;) in the type GenericAspect&lt;A,B&gt;.SimpleI&lt;L&gt; is not applicable for the arguments (List&lt;String&gt;)"/>
+       <message kind="error" line="25" text="Type mismatch: cannot convert from String to Integer"/>
+       <message kind="error" line="26" text="Type mismatch: cannot convert from List&lt;String&gt; to List&lt;Integer&gt;"/>
+     </compile>
    </ajc-test>
    <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - N">
      <compile files="GenericAspectN.aj" options="-1.5"/>
      <run class="GenericAspectN"/>
    </ajc-test>
    <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - O">
-     <compile files="GenericAspectO.aj" options="-1.5"/>
-     <!-- will need error messages in here -->
-     <run class="GenericAspectO"/>
+     <compile files="GenericAspectO.aj" options="-1.5">
+       <message kind="error" line="24" text="Cannot make a static reference to the non-static field Bottom.parent"/>
+       <message kind="error" line="26" text="The method add(Bottom) in the type List&lt;E&gt; is not applicable for the arguments (Top)"/>
+       <message kind="error" line="27" text="Cannot make a static reference to the non-static field Top.children"/>
+     </compile>
    </ajc-test>
    <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - P">
      <compile files="GenericAspectP.aj" options="-1.5"/>