From 1f66dac4c201c23c624cff7cf0751c2aa811e27b Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@pivotal.io>
Date: Thu, 31 Jan 2019 12:01:53 -0800
Subject: [PATCH] various polish to previously mavenized projects to support
 newer ones

---
 .../java/org/aspectj/testing/AntSpec.java     | 22 ++++++++++++++-----
 .../aspectj/testing/XMLBasedAjcTestCase.java  | 12 +---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/testing/src/test/java/org/aspectj/testing/AntSpec.java b/testing/src/test/java/org/aspectj/testing/AntSpec.java
index ceba08b29..bd0301d28 100644
--- a/testing/src/test/java/org/aspectj/testing/AntSpec.java
+++ b/testing/src/test/java/org/aspectj/testing/AntSpec.java
@@ -46,12 +46,24 @@ import org.aspectj.tools.ajc.AjcTestCase;
  */
 public class AntSpec implements ITestStep {
 
+	
+	public static final String outputFolders(String... modules) {
+		StringBuilder s = new StringBuilder();
+		for (String module: modules) {
+			s.append(File.pathSeparator + ".." +File.separator + module + File.separator + "target" + File.separator + "classes");
+		}
+		return s.toString();
+	}
+	
+	
 	// ALSO SEE AJC
-	private final static String DEFAULT_LTW_CLASSPATH_ENTRIES = ".." + File.separator + "asm/bin" + File.pathSeparator + ".."
-			+ File.separator + "bridge/bin" + File.pathSeparator + ".." + File.separator + "loadtime/bin" + File.pathSeparator
-			+ ".." + File.separator + "loadtime5/bin" + File.pathSeparator + ".." + File.separator + "weaver/bin"
-			+ File.pathSeparator + ".." + File.separator + "org.aspectj.matcher/bin" + File.pathSeparator + ".." + File.separator
-			+ "lib/bcel/bcel.jar" + File.pathSeparator + ".." + File.separator + "lib/bcel/bcel-verifier.jar";;
+	private final static String DEFAULT_LTW_CLASSPATH_ENTRIES =
+			outputFolders("asm", "bridge", "loadtime", "weaver", "org.aspectj.matcher", "bcel-builder");
+//	private final static String DEFAULT_LTW_CLASSPATH_ENTRIES = ".." + File.separator + "asm/bin" + File.pathSeparator + ".."
+//			+ File.separator + "bridge/bin" + File.pathSeparator + ".." + File.separator + "loadtime/bin" + File.pathSeparator
+//			+ ".." + File.separator + "loadtime5/bin" + File.pathSeparator + ".." + File.separator + "weaver/bin"
+//			+ File.pathSeparator + ".." + File.separator + "org.aspectj.matcher/bin" + File.pathSeparator + ".." + File.separator
+//			+ "lib/bcel/bcel.jar" + File.pathSeparator + ".." + File.separator + "lib/bcel/bcel-verifier.jar";;
 
 	private boolean m_verbose = false;
 	private AjcTest m_ajcTest;
diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java
index 13bbf844e..ff448647b 100644
--- a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java
+++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java
@@ -73,7 +73,7 @@ public abstract class XMLBasedAjcTestCase extends AjcTestCase {
 	 * 
 	 * <pre>
 	 * public static Test suite() {
-	 * 	return XMLBasedAjcTestCase.loadSuite(MyTestCaseClass.class);
+	 * 	 return XMLBasedAjcTestCase.loadSuite(MyTestCaseClass.class);
 	 * }
 	 * </pre>
 	 * 
@@ -84,21 +84,11 @@ public abstract class XMLBasedAjcTestCase extends AjcTestCase {
 		TestSuite suite = new TestSuite(testCaseClass.getName());
 		suite.addTestSuite(testCaseClass);
 		TestSetup wrapper = new TestSetup(suite) {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see junit.extensions.TestSetup#setUp()
-			 */
 			protected void setUp() throws Exception {
 				super.setUp();
 				suiteLoaded = false;
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see junit.extensions.TestSetup#tearDown()
-			 */
 			protected void tearDown() throws Exception {
 				super.tearDown();
 				suiteLoaded = false;
-- 
2.39.5