From b0697974ce3b202ba676cf5a169ad13ec3b3afbe Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Tue, 6 Jan 2009 22:01:33 +0000
Subject: migrated tests from 163->164

---
 tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java |  4 ----
 tests/src/org/aspectj/systemtest/ajc163/ajc163.xml       |  8 --------
 tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java |  8 ++++++++
 tests/src/org/aspectj/systemtest/ajc164/ajc164.xml       | 15 ++++++++++++++-
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
index e45c448ee..e6dd72567 100644
--- 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 211b8b22e..af927cd7c 100644
--- 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 9976fb65e..3053097f3 100644
--- 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 9648575b2..3c7bb85e1 100644
--- 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
-- 
cgit v1.2.3