migrated tests from 163->164

diff --git a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
index e45c448eede249e3202a23c8fb31f8d84bed2fc4..e6dd725679616a7af089aae381ba7026c073b425 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
@@ -67,10 +67,6 @@ public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
                runTest("param annos and at args");
        }
 
-       // public void testAtAspectJDecp_pr164016() {
-       // runTest("ataspectj decp");
-       // }
-
        public void testIncorrectArgOrdering_pr219419() {
                runTest("incorrect arg ordering anno style");
        }

diff --git a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
index 211b8b22e53b7337a2a4001bc10944248f79e583..af927cd7cbf47b41fa24d6f1366cbd328c60184b 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
+++ b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
@@ -150,14 +150,6 @@
          <compile files="Ship.java ShipAccessor.java" options="-emacssym -1.5"/>
     </ajc-test>
     
-    <ajc-test dir="bugs163/pr164016" title="ataspectj decp">
-      <compile files="Code.aj" options="-1.5"/>
-      <run class="test.Code"/>
-    </ajc-test>    
-    <ajc-test dir="bugs163/pr213751" title="mixed styles">
-         <compile files="Foo.java" options="-emacssym -1.5"/>
-    </ajc-test>
-    
     <ajc-test dir="bugs163/pr249216" title="handles - escaped square brackets">
          <compile files="Handles.java" options="-emacssym -1.5"/>
     </ajc-test>

diff --git a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
index 9976fb65efc16895d8810c34298afb05f5fa7be2..3053097f3a1d403215dbdaa736a97138b4e31641 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
@@ -18,6 +18,14 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+       // public void testAtAspectJDecp_pr164016() {
+       // runTest("ataspectj decp 164016");
+       // }
+
+       // public void testAtAspectJDecp_pr258788() {
+       // runTest("ataspectj decp 258788");
+       // }
+
        public static Test suite() {
                return XMLBasedAjcTestCase.loadSuite(Ajc164Tests.class);
        }

diff --git a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
index 9648575b2f585666517e245c7068a3acd96a9a5f..3c7bb85e11c25258b9ee4b6403da88707af53e2b 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
+++ b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
@@ -2,5 +2,18 @@
 
 <suite>
     
-
+    <ajc-test dir="bugs163/pr164016" title="ataspectj decp 164016">
+      <compile files="Code.aj" options="-1.5"/>
+      <run class="test.Code"/>
+    </ajc-test>    
+    
+    <ajc-test dir="bugs163/pr258788" title="ataspectj decp 258788">
+      <compile files="NameAware.java NameManager.java NameManagerImpl.java StartClass.java TargetClass.java TestAspect.java" options="-1.5"/>
+      <run class="com.StartClass"/>
+    </ajc-test>    
+    
+    <ajc-test dir="bugs163/pr213751" title="mixed styles">
+         <compile files="Foo.java" options="-emacssym -1.5"/>
+    </ajc-test>
+    
 </suite>
\ No newline at end of file