fixup tests for 1.9

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index c8a068c78cd7ad192beb1955c13565098d1b61bc..27e4c9a02eefd9f9415250120f4f22e701821378 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -4545,8 +4545,8 @@
    </ajc-test>
    <ajc-test dir="java5/generics/genericaspects/" title="uberaspects - M">
      <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;Integer&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;Integer&gt; is not applicable for the arguments (List&lt;String&gt;)"/>
+          <message kind="error" line="23" text="The method m0(Integer) in the type GenericAspect.SimpleI&lt;Integer&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.SimpleI&lt;Integer&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>

diff --git a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
index c02a99886be1daa35777968896513af1ff5c9245..11746e1224e799c86ac0f95614477123f936a632 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
+++ b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
@@ -655,7 +655,7 @@
 </ajc-test>
 
 <ajc-test dir="bugs1612/pr335810" title="rawtype warning">
-<compile files="One.java" options="-1.5 -warn:+raw -warn:+warningToken">
+<compile files="One.java" options="-1.5 -warn:+raw -warn:+unchecked -warn:+warningToken">
 </compile>
 </ajc-test>