From 00851bff4ef25e75ae06876306aa90074da57a04 Mon Sep 17 00:00:00 2001
From: mwebster <mwebster>
Date: Wed, 9 Aug 2006 12:52:19 +0000
Subject: [PATCH] Bug 152982 "org.aspectj Restructure - Phase 2: Move tests"
 (fail XML test if JVM not supported)

---
 testing/newsrc/org/aspectj/testing/AjcTest.java             | 5 +++--
 testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/testing/newsrc/org/aspectj/testing/AjcTest.java b/testing/newsrc/org/aspectj/testing/AjcTest.java
index 93c95487c..04ef81eae 100644
--- 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 ed76b52c6..dcf663fe8 100644
--- 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);
         }
-- 
2.39.5