diff options
| author | Andy Clement <aclement@pivotal.io> | 2019-01-31 12:01:53 -0800 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2019-01-31 12:01:53 -0800 |
| commit | 1f66dac4c201c23c624cff7cf0751c2aa811e27b (patch) | |
| tree | 92cb0d7948374b22a5d95bfff5393a7e60002281 /testing | |
| parent | 762b9c287285fd447dfeb17eda6ab65e0143b39e (diff) | |
| download | aspectj-1f66dac4c201c23c624cff7cf0751c2aa811e27b.tar.gz aspectj-1f66dac4c201c23c624cff7cf0751c2aa811e27b.zip | |
various polish to previously mavenized projects to support newer ones
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/src/test/java/org/aspectj/testing/AntSpec.java | 22 | ||||
| -rw-r--r-- | testing/src/test/java/org/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; |