164016, 258788: test and fix

diff --git a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
index af927cd7cbf47b41fa24d6f1366cbd328c60184b..795613c38de0c79e94a46dadcfc90db8094fdc27 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
+++ b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
@@ -150,6 +150,10 @@
          <compile files="Ship.java ShipAccessor.java" options="-emacssym -1.5"/>
     </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 3053097f3a1d403215dbdaa736a97138b4e31641..a64953bb5ec3bd127f54c21446b6419fba429d13 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
@@ -18,13 +18,13 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
-       // public void testAtAspectJDecp_pr164016() {
-       // runTest("ataspectj decp 164016");
-       // }
+       public void testAtAspectJDecp_pr164016() {
+               runTest("ataspectj decp 164016");
+       }
 
-       // public void testAtAspectJDecp_pr258788() {
-       // runTest("ataspectj decp 258788");
-       // }
+       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 3c7bb85e11c25258b9ee4b6403da88707af53e2b..99d7ef9c9ec268631feb2e464172a265e5676758 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
+++ b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
@@ -2,18 +2,19 @@
 
 <suite>
     
-    <ajc-test dir="bugs163/pr164016" title="ataspectj decp 164016">
+    <ajc-test dir="bugs164/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">
+    <ajc-test dir="bugs164/pr164016" title="ataspectj decp 164016 - 2">
+      <compile files="Code.java TargetBad.java TargetGood.java" aspectpath="code.jar" options="-1.5"/>
+      <run class="test.Code"/>
+    </ajc-test>    
+    
+    <ajc-test dir="bugs164/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