Add kotlin.test library to build distribution and provide for tests

ayoolaao · Dec 18, 2015 · b57d2ff · b57d2ff
1 parent 7aae2bd
commit b57d2ff
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 0 deletions.
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
@@ -36,6 +36,11 @@ public static File runtimeJarForTests() {
         return assertExists(new File("dist/kotlinc/lib/kotlin-runtime.jar"));
     }
 
+    @NotNull
+    public static File kotlinTestJarForTests() {
+        return assertExists(new File("dist/kotlinc/lib/kotlin-test.jar"));
+    }
+
     @NotNull
     public static File reflectJarForTests() {
         return assertExists(new File("dist/kotlinc/lib/kotlin-reflect.jar"));

diff --git a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
@@ -446,6 +446,7 @@ else if (jdkKind == TestJdkKind.ANDROID_API) {
 
         if (configurationKind.getWithRuntime()) {
             JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.runtimeJarForTests());
+            JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.kotlinTestJarForTests());
         }
         if (configurationKind.getWithReflection()) {
             JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.reflectJarForTests());

diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java
@@ -33,6 +33,9 @@ public interface KotlinPaths {
     @NotNull
     File getReflectPath();
 
+    @NotNull
+    File getKotlinTestPath();
+
     @NotNull
     File getRuntimeSourcesPath();
 

diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java
@@ -52,6 +52,12 @@ public File getReflectPath() {
         return getLibraryFile(PathUtil.KOTLIN_JAVA_REFLECT_JAR);
     }
 
+    @NotNull
+    @Override
+    public File getKotlinTestPath() {
+        return getLibraryFile(PathUtil.KOTLIN_TEST_JAR);
+    }
+
     @NotNull
     @Override
     public File getRuntimeSourcesPath() {

diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java
@@ -34,6 +34,7 @@ public class PathUtil {
     public static final String ANDROID_SDK_ANNOTATIONS_JAR = "kotlin-android-sdk-annotations.jar";
     public static final String KOTLIN_JAVA_RUNTIME_JAR = "kotlin-runtime.jar";
     public static final String KOTLIN_JAVA_REFLECT_JAR = "kotlin-reflect.jar";
+    public static final String KOTLIN_TEST_JAR = "kotlin-test.jar";
     public static final String KOTLIN_JAVA_RUNTIME_SRC_JAR = "kotlin-runtime-sources.jar";
     public static final String KOTLIN_COMPILER_JAR = "kotlin-compiler.jar";
 

diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java
@@ -41,6 +41,7 @@
  */
 public class ConfigLibraryUtil {
     private static final String DEFAULT_JAVA_RUNTIME_LIB_NAME = "JAVA_RUNTIME_LIB_NAME";
+    private static final String DEFAULT_KOTLIN_TEST_LIB_NAME = "KOTLIN_TEST_LIB_NAME";
     private static final String DEFAULT_KOTLIN_JS_STDLIB_NAME = "KOTLIN_JS_STDLIB_NAME";
 
     private ConfigLibraryUtil() {
@@ -67,6 +68,8 @@ public static void configureKotlinJsRuntimeAndSdk(Module module, Sdk sdk) {
     public static void configureKotlinRuntime(Module module) {
         addLibrary(getKotlinRuntimeLibEditor(DEFAULT_JAVA_RUNTIME_LIB_NAME, PathUtil.getKotlinPathsForDistDirectory().getRuntimePath()),
                    module);
+        addLibrary(getKotlinRuntimeLibEditor(DEFAULT_KOTLIN_TEST_LIB_NAME, PathUtil.getKotlinPathsForDistDirectory().getKotlinTestPath()),
+                   module);
     }
 
     public static void configureKotlinJsRuntime(Module module) {
@@ -76,6 +79,7 @@ public static void configureKotlinJsRuntime(Module module) {
 
     public static void unConfigureKotlinRuntime(Module module) {
         removeLibrary(module, DEFAULT_JAVA_RUNTIME_LIB_NAME);
+        removeLibrary(module, DEFAULT_KOTLIN_TEST_LIB_NAME);
     }
 
     public static void unConfigureKotlinRuntimeAndSdk(Module module, Sdk sdk) {

diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
@@ -500,6 +500,7 @@ public abstract class AbstractIncrementalJpsTest(
             moduleNames = nameToModule.keySet()
         }
         AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject)
+        AbstractKotlinJpsBuildTestCase.addKotlinTestRuntimeDependency(myProject)
         return moduleNames
     }
 

diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java
@@ -91,6 +91,10 @@ static JpsLibrary addKotlinRuntimeDependency(@NotNull JpsProject project) {
        return addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false);
     }
 
+    static JpsLibrary addKotlinTestRuntimeDependency(@NotNull JpsProject project) {
+        return addDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false, "kotlin-test", PathUtil.getKotlinPathsForDistDirectory().getKotlinTestPath());
+    }
+
     static JpsLibrary addKotlinJavaScriptStdlibDependency(@NotNull JpsProject project) {
         return addKotlinJavaScriptStdlibDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false);
     }

diff --git a/resources/kotlinManifest.properties b/resources/kotlinManifest.properties
@@ -18,5 +18,7 @@ manifest.impl.title.kotlin.preloader=Kotlin Preloader
 
 manifest.impl.title.kotlin.runner=Kotlin Runner
 
+manifest.impl.title.kotlin.test=Kotlin Reflect Sources
+
 manifest.impl.title.kotlin.jdk.annotations=Kotlin Compiler JDK Annotations
 manifest.impl.title.kotlin.android.sdk.annotations=Kotlin Compiler Android SDK Annotations
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,9 @@ public interface KotlinPaths { @@
         @NotNull
         File getReflectPath();
+        @NotNull
+        File getKotlinTestPath();
         @NotNull
         File getRuntimeSourcesPath();
@@ Expand Down @@