From: Andy Clement <aclement@pivotal.io>
Date: Mon, 11 Feb 2019 21:54:42 +0000 (-0800)
Subject: fixing test failures running under eclipse
X-Git-Tag: V1_9_3RC1~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b1dcf8207f328c91ad3ae462d104f24854f67856;p=aspectj.git

fixing test failures running under eclipse
---

diff --git a/lib/test/aspectjrt.jar b/lib/test/aspectjrt.jar
index 969043f4a..fe29ee5e6 100644
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 88a754d67..d35f99896 100644
--- 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 1d668def2..2af341d22 100644
--- 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();