fixing test failures running under eclipse

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);
 		}

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();