remove bad _IDE folder instead of bin/ that leads to odd side effects, add tools...

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 edfb056f17ce6aeb949a43e499980f3a9b221551..9e5f8cc2dbd89aff923f5ca1f8f29570346ca253 100644 (file)
--- 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 0d41d06c078732e98e9e1b2223b66c58ce609427..c4cace3b30a7409e0da1f974897babd7b3f3b1ad 100644 (file)
--- 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 0623923bebb20b9bfc08225200992bcbc510f5fb..6d31ea6193a20b6a296310ccdadb3fcb3bd112e3 100644 (file)
--- 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 db20e73321fb431845b46d7635cdd160602c6f8f..a2a5a14f1b9308f8a889def7b9a7f539ef51e287 100644 (file)
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -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>

diff --git a/tests/java5/ataspectj/ataspectj/TestHelper.java b/tests/java5/ataspectj/ataspectj/TestHelper.java
index ba8eab80719a13e81fa9cf451afde0e6ff331771..c1e75532dc015331111e607ca7b69909a1a6d6dd 100644 (file)
--- 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 <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();

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml
index 12a84bf096e13fab289a3964b8da6343866b0db5..2cf179be8bdd6ec6d2efc24cf7f6d18afdead78e 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml
@@ -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"/>