Browse Source

fixing test failures running under eclipse

tags/V1_9_3RC1
Andy Clement 5 years ago
parent
commit
b1dcf8207f

BIN
lib/test/aspectjrt.jar View File


+ 3
- 3
testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java View File

private static File ASPECTJRT_PATH; private static File ASPECTJRT_PATH;
static { 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); ASPECTJRT_PATH = FileUtil.getBestFile(paths);
} }

+ 1
- 1
weaver/src/test/java/org/aspectj/weaver/bcel/ClassLoaderRepositoryTest.java View File

String clazzname = classfileName.substring(0,classfileName.length()-6).replace('/','.'); String clazzname = classfileName.substring(0,classfileName.length()-6).replace('/','.');
rep.loadClass(clazzname); 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 = (Reference)map.values().iterator().next();
ref.clear(); ref.clear();
ref.enqueue(); ref.enqueue();

Loading…
Cancel
Save