Tests slightly reworked by matthew due to enhancement 71339

diff --git a/tests/src/org/aspectj/systemtest/ajc120/Ajc120Tests.java b/tests/src/org/aspectj/systemtest/ajc120/Ajc120Tests.java
index 84054333afa15196b4beb9e5785139c1c789545d..e38baa1da142844c0d882dcb3bf8b21f0fd9f366 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc120/Ajc120Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc120/Ajc120Tests.java
@@ -237,8 +237,16 @@ public class Ajc120Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   }
 
   public void test054(){
-    runTest("error message for constructor-execution pcd");
+       runTest("error message for constructor-execution pcd");
   }
 
+       public void test055(){
+         runTest("weaving using an empty jar in -injars");
+       }
+
+       public void test056(){
+         runTest("weaving using an empty jar in -aspectpath");
+       }
+
 }
 

diff --git a/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml b/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml
index 51f70134b957167798b3d7058391965779b90c52..dbdddd93ee5c83eeafdc27c92db9d4d8794247d8 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml
@@ -396,16 +396,6 @@
                <message kind="error" line="5"/>
         </compile>
     </ajc-test>
-    
-    <!-- this test unreliable - can't always delete sandbox afterwards, need to get
-         to the bottom of why...
-     <ajc-test dir="bugs"  pr="43714"
-       title="weaving from an input jar into that same jar.."  >
-        <compile files="notAJar.jar" outjar="notAJar.jar"> 
-               <message kind="error" line="0"/>
-        </compile>
-    </ajc-test>
-       -->
        
     <ajc-test dir="bugs"
                title="Private members introduced via an interface are visible to the class"
@@ -476,3 +466,16 @@
         </compile>
     </ajc-test>
 
+    <ajc-test dir="bugs"  pr="43714"
+       title="weaving using an empty jar in -injars"  >
+        <compile files="notAJar.jar" outjar="outJar.jar"> 
+               <message kind="error" line="0"/>
+        </compile>
+    </ajc-test>
+       
+        <ajc-test dir="bugs"  pr="43714"
+       title="weaving using an empty jar in -aspectpath"  >
+        <compile files="WeaveLocal.java" aspectpath="notAJar.jar" outjar="outJar.jar" >                
+        </compile>
+    </ajc-test>
+    
\ No newline at end of file

diff --git a/tests/src/org/aspectj/systemtest/aspectpath/AspectPathTests.java b/tests/src/org/aspectj/systemtest/aspectpath/AspectPathTests.java
index 779bedec9362ee8a841a331249550ffa5c61a62e..032b7ead8dcadbb4b8d26e88dbf5d684d29567fa 100644 (file)
--- a/tests/src/org/aspectj/systemtest/aspectpath/AspectPathTests.java
+++ b/tests/src/org/aspectj/systemtest/aspectpath/AspectPathTests.java
@@ -108,9 +108,5 @@ public class AspectPathTests extends org.aspectj.testing.XMLBasedAjcTestCase {
     runTest("Introduced abstract method on interface not implemented by subtype (aspectpath)");
   }
 
-  public void test022(){
-    runTest("weaving from an aspectpath jar into that same jar..");
-  }
-
 }
 

diff --git a/tests/src/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml b/tests/src/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml
index 9be3b32d3b8009265c71b3fbb79b5be67d2cfaf9..bb5bd265ff6c0f4b5cc9aba18f3836da565cecd3 100644 (file)
--- a/tests/src/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml
+++ b/tests/src/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml
@@ -188,11 +188,5 @@
                         aspectpath="interface/jars/AandB.jar" />
         <run class="C"/>
     </ajc-test>
-       
-        <ajc-test dir="bugs"  pr="43714"
-       title="weaving from an aspectpath jar into that same jar.."  >
-        <compile files="WeaveLocal.java" aspectpath="notAJar.jar" outjar="notAJar.jar" >               
-        </compile>
-    </ajc-test>