145018 - moved testcode to 16

diff --git a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java
index 43cf616208d2a78e1c35a62cd62cea5bb6611879..c21fd252f629fe1168395f57a2837724bcffd0bf 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java
@@ -85,7 +85,6 @@ public class Ajc153Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void testCpathNoTypeCflowField_pr145693_3()           { runTest("cpathNoTypeCflowField"); }
   // public void testAdviceNotWovenAspectPath_pr147841()          { runTest("advice not woven on aspectpath");}
   public void testGenericSignatures_pr148409()                 { runTest("generic signature problem"); }
-//  public void testBrokenIfArgsCflowAtAj_pr145018() { runTest("ataj crashing with cflow, if and args");}
   public void testCantFindType_pr149322_01() {runTest("can't find type on interface call 1");}
   public void testCantFindType_pr149322_02() {runTest("can't find type on interface call 2");}
   public void testCantFindType_pr149322_03() {runTest("can't find type on interface call 3");}

diff --git a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
index c0645c09eeca2f1e7a93be2ac7884b92a88ac1db..89cf410cb8a1f03d9886a30036c707118e1cd2cc 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
+++ b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
@@ -369,15 +369,6 @@
       </run>
     </ajc-test>   
         
-       <ajc-test dir="bugs153/pr145018" title="ataj crashing with cflow, if and args">
-     <compile files="Broken.aj" options="-1.5"/>
-     <run class="Broken">
-       <stderr>
-         <line text="ahhh"/>
-       </stderr>
-     </run>
-    </ajc-test> 
-    
        <ajc-test dir="bugs153/pr150095" title="generics, inheritance and decp">
      <compile files="Foo.java" options="-1.5"/>
     </ajc-test> 

diff --git a/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java b/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java
index 5616a059b74c7f1fb8e6890f45a96af905276b5b..b11b00818090701c2945d28cbab883080c5cc3ec 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java
@@ -12,15 +12,19 @@ package org.aspectj.systemtest.ajc160;
 
 import java.io.File;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
 import junit.framework.Test;
 
+import org.aspectj.testing.XMLBasedAjcTestCase;
+
 /**
  * These are tests for AspectJ1.6.0
  */
 public class Ajc160Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
        
        // AspectJ1.6.0rc1
+  //  public void testBrokenIfArgsCflowAtAj_pr145018() {
+    //    runTest("ataj crashing with cflow, if and args");
+   // }
     public void testClassCastOnArrayType_pr180264() {
         runTest("classcastexception on array type");
     }

diff --git a/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml b/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml
index 900a0966480eccd77f12632e86108b2691f87013..f6339d7e58ca1734bc0798d565f690082ebf7b2a 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml
+++ b/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml
@@ -7,15 +7,21 @@
      <compile options="-1.5" files="AspectBreaker.java"/>
    </ajc-test>
    
-   <ajc-test dir="bugs160/pr180264" title="classcastexception on array type">
-     <compile options="-warn:+uselessTypeCheck" files="Foo.java,Main.java"/>
-   </ajc-test>
-
    <ajc-test dir="bugs160/pr167197" title="generic type parameterized with array type - 2">
      <compile options="-1.5" files="Breaker2.java"/>
      <run class="Breaker2"/>
    </ajc-test>
    
+   <ajc-test dir="bugs160/pr180264" title="classcastexception on array type">
+     <compile options="-warn:+uselessTypeCheck" files="Foo.java,Main.java"/>
+   </ajc-test>
+   
+       <ajc-test dir="bugs160/pr145018" title="ataj crashing with cflow, if and args">
+     <compile files="Broken.aj" options="-1.5"/>
+     <run class="Broken">
+     </run>
+    </ajc-test> 
+    
        <ajc-test dir="bugs160/pr201748" title="itd with array">
      <compile files="Foo.java">
        <message kind="error" text="Type mismatch: cannot convert from Factory[] to Factory"/>