@@ -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; |
@@ -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" | |||
; |
@@ -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" |
@@ -12,5 +12,6 @@ | |||
<classpathentry kind="src" path="/asm"/> | |||
<classpathentry kind="var" path="JAVA_HOME/lib/tools.jar"/> | |||
<classpathentry sourcepath="/lib/bcel/bcel-src.zip" kind="lib" path="/lib/bcel/bcel.jar"/> | |||
<classpathentry kind="var" path="JAVA_HOME/lib/tools.jar"/> | |||
<classpathentry kind="output" path="bin"/> | |||
</classpath> |
@@ -31,7 +31,7 @@ import org.aspectj.weaver.loadtime.DefaultMessageHandler; | |||
* | |||
* @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a> | |||
*/ | |||
public class TestHelper extends DefaultMessageHandler { | |||
public class TestHelper extends DefaultMessageHandler { | |||
public static void runAndThrowOnFailure(junit.framework.Test test) { | |||
TestRunner r = new TestRunner(); |
@@ -58,7 +58,6 @@ | |||
<run class="ataspectj.PrecedenceTest"/> | |||
</ajc-test> | |||
<!-- <comment>FIXME AV when JDT of M6 is in</comment> --> | |||
<ajc-test dir="java5/ataspectj" title="AfterXTest"> | |||
<compile files="ataspectj/AfterXTest.java,ataspectj/TestHelper.java" options="-1.5"/> | |||
<run class="ataspectj.AfterXTest"/> |