pr105479: new testcase

diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 3ae36e93fdb8f8febb24dbf1d4d544f38ce8903a..896bd09a8a75e60e0c180bfed6892d981c5ecd2f 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -422,6 +422,10 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void testOverrideAndCovarianceWithDecPRuntimeMultiFiles() {
          runTest("override and covariance with decp - runtime separate files");
   }
+
+  public void testOverrideAndCovarianceWithDecPRuntimeMultiFilesBinaryWeaving() {
+         runTest("override and covariance with decp - binary weaving");
+  }
   
   public void testAbstractSynchronizedITDMethods() {
          runTest("abstract synchronized itdms not detected");

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 45096e49630e46efc53dd85a783b48676c53a66c..96059157b88f321e7245d5bab053710a5431ba32 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -499,9 +499,6 @@
         <compile files="pr95992.aj" options="-1.5"/>
     </ajc-test>
 
-    <ajc-test dir="bugs150" pr="105479" title="declare parents introducing override with covariance">
-        <compile files="pr105479.aj" options="-1.5"/>
-    </ajc-test>                   
 
     <ajc-test dir="bugs150" pr="104024" title="inner class passed as argument to varargs method">
         <compile files="pr104024.aj" options="-1.5"/>
@@ -550,6 +547,10 @@
         <compile files="pr108602.java" options="-1.5"/>
     </ajc-test>
 
+    <ajc-test dir="bugs150" pr="105479" title="declare parents introducing override with covariance">
+        <compile files="pr105479.aj" options="-1.5"/>
+    </ajc-test>                   
+    
     <ajc-test dir="bugs150" pr="105479" title="override and covariance with decp - runtime">
         <compile files="pr105479part2.aj" options="-1.5"/>
         <run class="pr105479part2">
@@ -562,7 +563,7 @@
         </run>
     </ajc-test>
 
-    <ajc-test dir="bugs150/pr105479" pr="105479" title="override and covariance with decp - runtime separate files">
+    <ajc-test dir="bugs150/pr105479/case1" pr="105479" title="override and covariance with decp - runtime separate files">
         <compile files="ReturnTypeTest.aj,ReturnTypeTester.java,Driver.java" options="-1.5"/>
         <run class="Driver">
             <stdout>
@@ -574,6 +575,13 @@
         </run>
     </ajc-test>
     
+    <ajc-test dir="bugs150/pr105479/case2" pr="105479" title="override and covariance with decp - binary weaving">
+        <compile files="ReturnTypeTest.java" outjar="jar1.jar" options="-1.5 -Xlint:ignore"/>
+        <compile files="ReturnTypeTester.java" outjar="jar2.jar" options="-1.5"/>
+        <compile inpath="jar1.jar;jar2.jar" options="-1.5"/>
+        <run class="ReturnTypeTester"/>
+    </ajc-test>
+    
     <ajc-test dir="bugs150" pr="102212" title="abstract synchronized itdms not detected">
         <compile files="pr102212.aj">
             <message line="7" kind="error" text="The abstract method _abstract in type Parent can only set a visibility modifier, one of public or protected"/>