fixing test failures running under eclipse

diff --git a/lib/test/aspectjrt.jar b/lib/test/aspectjrt.jar
index 969043f4aa308edc46f713d91675ab51def604d7..fe29ee5e66d897d94c7f85968afce5a00a550f67 100644 (file)
Binary files a/lib/test/aspectjrt.jar and b/lib/test/aspectjrt.jar differ

diff --git a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java
index 88a754d67f2e5f02a3958525ed32c2189b0a5130..d35f9989618ebe56426b9f7f4626000f64c3d1c4 100644 (file)
--- a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java
+++ b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java
@@ -74,9 +74,9 @@ public final class TestUtil {
        private static File ASPECTJRT_PATH;
        static {
                {
-                       String[] paths = { "sp:aspectjrt.path", "sp:aspectjrt.jar", "../runtime/target/classes"
-//                                     "../lib/test/aspectjrt.jar",
-//                                     "../aj-build/jars/aspectj5rt-all.jar", "../aj-build/jars/runtime.jar", "../runtime/bin"
+                       String[] paths = { "sp:aspectjrt.path", "sp:aspectjrt.jar"
+                                       ,"../lib/test/aspectjrt.jar", "../runtime/target/classes"
+//                                     ,"../aj-build/jars/aspectj5rt-all.jar", "../aj-build/jars/runtime.jar", "../runtime/bin"
                                        };
                        ASPECTJRT_PATH = FileUtil.getBestFile(paths);
                }

diff --git a/weaver/src/test/java/org/aspectj/weaver/bcel/ClassLoaderRepositoryTest.java b/weaver/src/test/java/org/aspectj/weaver/bcel/ClassLoaderRepositoryTest.java
index 1d668def2724487efb62553faab303b93e12f798..2af341d224e6bd87703907c9692e4c3f734ddc6f 100644 (file)
--- a/weaver/src/test/java/org/aspectj/weaver/bcel/ClassLoaderRepositoryTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/bcel/ClassLoaderRepositoryTest.java
@@ -167,7 +167,7 @@ public class ClassLoaderRepositoryTest extends TestCase {
                                String clazzname = classfileName.substring(0,classfileName.length()-6).replace('/','.');
                                
                                rep.loadClass(clazzname);
-                               assertEquals("expected one entry in shared URL cache "+map.size(), 1, map.size());
+                               assertEquals("expected one entry in shared URL cache "+map.size()+": "+map, 1, map.size());
                                ref = (Reference)map.values().iterator().next();
                                ref.clear();
                                ref.enqueue();