fixes for tests on windows

diff --git a/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingURLClassLoaderTest.java b/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingURLClassLoaderTest.java
index 2af64a5f62fecfc1834812a4fc2dff250386a0c4..03b378ba2484edcb598c0d4926e86a0e63ce4e5d 100644 (file)
--- a/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingURLClassLoaderTest.java
+++ b/loadtime/src/test/java/org/aspectj/weaver/loadtime/WeavingURLClassLoaderTest.java
@@ -15,6 +15,7 @@ package org.aspectj.weaver.loadtime;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.Properties;
@@ -22,6 +23,7 @@ import java.util.Properties;
 import junit.framework.TestCase;
 
 import org.aspectj.bridge.AbortException;
+import org.aspectj.testing.util.TestUtil;
 import org.aspectj.testing.util.TestUtil.TestError;
 import org.aspectj.util.FileUtil;
 import org.aspectj.weaver.tools.WeavingAdaptor;
@@ -348,8 +350,7 @@ public class WeavingURLClassLoaderTest extends TestCase {
         * Aspects on ASPECTPATH but missing from CLASSPATH
         */
        public void testIncompletePath() {
-               URL aspectjrt = FileUtil.getFileURL(new File(ASPECTJRT));
-               setSystemProperty(WeavingURLClassLoader.WEAVING_ASPECT_PATH, ADVICE_ASPECTS+File.pathSeparator+aspectjrt.toString());
+               setSystemProperty(WeavingURLClassLoader.WEAVING_ASPECT_PATH, ADVICE_ASPECTS+File.pathSeparator+new File(ASPECTJRT).toString());
                setSystemProperty(WeavingURLClassLoader.WEAVING_CLASS_PATH, CLASSES_JAR);
                WeavingURLClassLoader loader = new WeavingURLClassLoader(getClass().getClassLoader());
 

diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java
index 620b06b0a44bacdea431decb7b1ae3d3229546d3..e30c6f0eec6cd6b4449c786db3561d87631cc0fe 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java
@@ -93,7 +93,7 @@ public class MultiProjTestCompilerConfiguration implements ICompilerConfiguratio
                StringTokenizer st = new StringTokenizer(cp,File.pathSeparator);
                while (st.hasMoreElements()) {
                        String cpElement = st.nextToken();
-                       System.out.println("Checking: "+cpElement+" exists? "+new File(cpElement).exists());
+//                     System.out.println("Checking: "+cpElement+" exists? "+new File(cpElement).exists());
                }
        }