azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reuse class loader for kotlin-runtime.jar in codegen tests

Browse Source 
Also delete questionable ClassPathInParentClassLoaderTest
This commit is contained in:
Alexander Udalov
2015-02-25 14:23:21 +03:00
parent b99b1883bc
commit 6f0ccbfab8
9 changed files with 63 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+6 -18
View File
@@ -122,25 +122,19 @@ public abstract class CodegenTestCase extends UsefulTestCase {
}
@NotNull
protected GeneratedClassLoader createClassLoader(@NotNull ClassFileFactory factory) {
protected GeneratedClassLoader generateAndCreateClassLoader() {
if (initializedClassLoader != null) {
fail("Double initialization of class loader in same test");
}
initializedClassLoader = new GeneratedClassLoader(factory, null, getClassPathURLs());
return initializedClassLoader;
}
@NotNull
protected GeneratedClassLoader generateAndCreateClassLoader() {
ClassFileFactory factory = generateClassesInFile();
GeneratedClassLoader loader = createClassLoader(factory);
initializedClassLoader = new GeneratedClassLoader(factory, ForTestCompileRuntime.runtimeJarClassLoader(), getClassPathURLs());
if (!verifyAllFilesWithAsm(factory, loader)) {
if (!verifyAllFilesWithAsm(factory, initializedClassLoader)) {
fail("Verification failed: see exceptions above");
}
return loader;
return initializedClassLoader;
}
@NotNull
@@ -149,17 +143,11 @@ public abstract class CodegenTestCase extends UsefulTestCase {
for (File file : myEnvironment.getConfiguration().getList(JVMConfigurationKeys.CLASSPATH_KEY)) {
try {
urls.add(file.toURI().toURL());
} catch (MalformedURLException e) {
}
catch (MalformedURLException e) {
throw new RuntimeException(e);
}
}
try {
//add runtime library
urls.add(ForTestCompileRuntime.runtimeJarForTests().toURI().toURL());
}
catch (MalformedURLException e) {
throw new RuntimeException(e);
}
return urls.toArray(new URL[urls.size()]);
}