From 2253567e36574860929b066879ae7ebe76108cab Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 28 Jan 2015 18:14:22 +0300
Subject: [PATCH] Tests: use preloader instead of URLClassLoader in
 MockLibraryUtil

This fixes runtime dependency of the compiler and thus allows to run tests
which use MockLibraryUtil in case of an ABI-incompatible change; also it's
slightly more efficient (noticeable when running a single test)
---
 compiler/tests/compiler-tests.iml                |  1 +
 .../jetbrains/kotlin/test/MockLibraryUtil.java   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index c42bfcd7910..caacdfc6482 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -19,6 +19,7 @@
     <orderEntry type="module" module-name="builtins-serializer" />
     <orderEntry type="module" module-name="js.frontend" />
     <orderEntry type="module" module-name="js.tests" />
+    <orderEntry type="module" module-name="preloader" />
     <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java b/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java
index fa5715a8880..f64aa720a1f 100644
--- a/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java
+++ b/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java
@@ -23,14 +23,13 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.cli.common.ExitCode;
 import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler;
 import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
+import org.jetbrains.kotlin.preloading.ClassPreloadingUtils;
 import org.jetbrains.kotlin.utils.PathUtil;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
 import java.io.*;
+import java.lang.ref.SoftReference;
 import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -42,7 +41,7 @@ import static org.junit.Assert.assertEquals;
 
 public class MockLibraryUtil {
 
-    private static Class<?> compilerClass = null;
+    private static SoftReference<Class<?>> compilerClassRef = new SoftReference<Class<?>>(null);
 
     @NotNull
     public static File compileLibraryToJar(
@@ -123,14 +122,15 @@ public class MockLibraryUtil {
     }
 
     @NotNull
-    private static Class<?> getCompilerClass() throws MalformedURLException, ClassNotFoundException {
+    private static synchronized Class<?> getCompilerClass() throws IOException, ClassNotFoundException {
+        Class<?> compilerClass = compilerClassRef.get();
         if (compilerClass == null) {
             File kotlinCompilerJar = new File(PathUtil.getKotlinPathsForDistDirectory().getLibPath(), "kotlin-compiler.jar");
-            File kotlinRuntimeJar = new File(PathUtil.getKotlinPathsForDistDirectory().getLibPath(), "kotlin-runtime.jar");
-            URLClassLoader classLoader = new URLClassLoader(new URL[] {kotlinCompilerJar.toURI().toURL(), kotlinRuntimeJar.toURI().toURL()},
-                                                            Object.class.getClassLoader());
+            ClassLoader classLoader =
+                    ClassPreloadingUtils.preloadClasses(Collections.singletonList(kotlinCompilerJar), 4096, null, null, null);
 
             compilerClass = classLoader.loadClass(K2JVMCompiler.class.getName());
+            compilerClassRef = new SoftReference<Class<?>>(compilerClass);
         }
         return compilerClass;
     }