From 0e803e159d53b87c79213cb0c4872b195099da38 Mon Sep 17 00:00:00 2001 From: avasseur Date: Wed, 11 May 2005 14:36:35 +0000 Subject: [PATCH] remove bad _IDE folder instead of bin/ that leads to odd side effects, add tools.jar to tests .classpath module for LTW tests using AntSpec --- .../testsrc/org/aspectj/tools/ajc/Ajc.java | 9 +-------- .../org/aspectj/tools/ajc/AjcTestCase.java | 20 ++++--------------- .../newsrc/org/aspectj/testing/AntSpec.java | 3 +-- tests/.classpath | 1 + .../java5/ataspectj/ataspectj/TestHelper.java | 2 +- .../systemtest/ajc150/ataspectj/syntax.xml | 1 - 6 files changed, 8 insertions(+), 28 deletions(-) diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java index edfb056f1..9e5f8cc2d 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java +++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java @@ -52,18 +52,11 @@ public class Ajc { ".."+File.separator+"lib"+File.separator+"test"+File.separator+"aspectjrt.jar"+ File.pathSeparator+ ".."+File.separator+"lib"+File.separator+"test"+File.separator+"testing-client.jar" + File.pathSeparator + ".."+File.separator+"aspectj5rt"+File.separator+"bin" + File.pathSeparator - //Alex: adding "_IDE" since there is no "bin" output when working within IDEA. - // my convention is thus to have a "modules/_IDE" folder where IDEA will write - // Since modules/* have circular dependancies, there is no way to have multiple "modules" - // (like Eclipse projects in one workspace) in IDEA, so all will be build there. - // Note: adding it last means that a change in the IDE aspectj5rt module f.e. without - // "ant compile" to rebuild "aspect5rt/bin" will not expose the IDE changes... - // but I don't want to have it first to avoid side effects when running from Ant. - + File.pathSeparator + ".." + File.separator + "_IDE" + File.pathSeparator+ ".."+File.separator+"lib"+File.separator+"junit"+File.separator+"junit.jar" + File.pathSeparator+ ".."+File.separator+"bridge"+File.separator+"bin" + File.pathSeparator+ ".."+File.separator+"loadtime"+File.separator+"bin" ; + private CompilationResult result; private File sandbox; private File baseDir; diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java index 0d41d06c0..c4cace3b3 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java +++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java @@ -72,23 +72,11 @@ public class AjcTestCase extends TestCase { protected Ajc ajc; public static final String DEFAULT_CLASSPATH_ENTRIES = - File.pathSeparator + - ".." + File.separator + "runtime" + File.separator + "bin" + - File.pathSeparator + - ".." + File.separator + "testing-client" + File.separator + "bin" + - File.pathSeparator + - ".." + File.separator + "bridge" + File.separator + "bin" + - File.pathSeparator + - ".." + File.separator + "util" + File.separator + "bin" + + File.pathSeparator + ".." + File.separator + "runtime" + File.separator + "bin" + + File.pathSeparator + ".." + File.separator + "testing-client" + File.separator + "bin" + + File.pathSeparator + ".." + File.separator + "bridge" + File.separator + "bin" + + File.pathSeparator + ".." + File.separator + "util" + File.separator + "bin" + File.pathSeparator + ".." + File.separator + "aspectj5rt" + File.separator + "bin" + - //Alex: adding "_IDE" since there is no "bin" output when working within IDEA. - // my convention is thus to have a "modules/_IDE" folder where IDEA will write - // Since modules/* have circular dependancies, there is no way to have multiple "modules" - // (like Eclipse projects in one workspace) in IDEA, so all will be build there. - // Note: adding it last means that a change in the IDE aspectj5rt module f.e. without - // "ant compile" to rebuild "aspect5rt/bin" will not expose the IDE changes... - // but I don't want to have it first to avoid side effects when running from Ant. - File.pathSeparator + ".." + File.separator + "_IDE" + File.pathSeparator+ ".."+File.separator+"lib"+File.separator+"junit"+File.separator+"junit.jar" + File.pathSeparator+ ".."+File.separator+"loadtime"+File.separator+"bin" ; diff --git a/testing/newsrc/org/aspectj/testing/AntSpec.java b/testing/newsrc/org/aspectj/testing/AntSpec.java index 0623923be..6d31ea619 100644 --- a/testing/newsrc/org/aspectj/testing/AntSpec.java +++ b/testing/newsrc/org/aspectj/testing/AntSpec.java @@ -45,8 +45,7 @@ import java.util.StringTokenizer; public class AntSpec implements ITestStep { private final static String DEFAULT_LTW_CLASSPATH_ENTRIES = - ".." + File.separator + "_IDE"//ALEX hack since IntelliJ does not produce modules/bin/ - + File.pathSeparator + ".." + File.separator + "asm/bin" + ".." + File.separator + "asm/bin" + File.pathSeparator + ".." + File.separator + "bridge/bin" + File.pathSeparator + ".." + File.separator + "loadtime/bin" + File.pathSeparator + ".." + File.separator + "loadtime5/bin" diff --git a/tests/.classpath b/tests/.classpath index db20e7332..a2a5a14f1 100644 --- a/tests/.classpath +++ b/tests/.classpath @@ -12,5 +12,6 @@ + diff --git a/tests/java5/ataspectj/ataspectj/TestHelper.java b/tests/java5/ataspectj/ataspectj/TestHelper.java index ba8eab807..c1e75532d 100644 --- a/tests/java5/ataspectj/ataspectj/TestHelper.java +++ b/tests/java5/ataspectj/ataspectj/TestHelper.java @@ -31,7 +31,7 @@ import org.aspectj.weaver.loadtime.DefaultMessageHandler; * * @author Alexandre Vasseur */ -public class TestHelper extends DefaultMessageHandler { +public class TestHelper extends DefaultMessageHandler { public static void runAndThrowOnFailure(junit.framework.Test test) { TestRunner r = new TestRunner(); diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml index 12a84bf09..2cf179be8 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml @@ -58,7 +58,6 @@ - -- 2.39.5