Bug 152982 "org.aspectj Restructure - Phase 2: Move tests" (fail XML test if JVM...

diff --git a/testing/newsrc/org/aspectj/testing/AjcTest.java b/testing/newsrc/org/aspectj/testing/AjcTest.java
index 93c95487c711667b09c06935f1a03416b5bf8007..04ef81eae2ac7f2e6f0147887861eb0c4ec9c265 100644 (file)
--- a/testing/newsrc/org/aspectj/testing/AjcTest.java
+++ b/testing/newsrc/org/aspectj/testing/AjcTest.java
@@ -57,8 +57,8 @@ public class AjcTest {
                step.setTest(this);
        }
        
-       public void runTest(AjcTestCase testCase) {
-               if (!canRunOnThisVM()) return;
+       public boolean runTest(AjcTestCase testCase) {
+               if (!canRunOnThisVM()) return false;
                try {
                        System.out.print("TEST: " + getTitle() + "\t");                 
                        for (Iterator iter = testSteps.iterator(); iter.hasNext();) {
@@ -70,6 +70,7 @@ public class AjcTest {
                } finally {
                        System.out.println("DONE");
                }
+               return true;
        }
        
        public boolean canRunOnThisVM() {               

diff --git a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java b/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java
index ed76b52c64f0ab1f6d1529bb3a7bc83260f6c06d..dcf663fe85c028f6ee7d08c7e3d2184c79033958 100644 (file)
--- a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java
+++ b/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java
@@ -108,7 +108,8 @@ public abstract class XMLBasedAjcTestCase extends AjcTestCase {
             }
                } 
                ajc.setShouldEmptySandbox(true);
-               currentTest.runTest(this);
+               boolean run = currentTest.runTest(this);
+               assertTrue("Test not run",run);
         if (clearTest) {
             testMap.remove(title);
         }