From 6baa8614e6d443a05840519c3e86c16214383b01 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 13 Jul 2017 12:26:01 +0200
Subject: [PATCH] Fix JS tests in AbstractConfigureKotlinTest

---
 .../jsLibraryVersion106/projectFile.ipr       |  2 +-
 .../jsLibraryVersion11/projectFile.ipr        |  2 +-
 .../AbstractConfigureKotlinTest.kt            | 37 ++++++++++---------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/idea/testData/configuration/jsLibraryVersion106/projectFile.ipr b/idea/testData/configuration/jsLibraryVersion106/projectFile.ipr
index edc8cddda06..52dd88be6b2 100644
--- a/idea/testData/configuration/jsLibraryVersion106/projectFile.ipr
+++ b/idea/testData/configuration/jsLibraryVersion106/projectFile.ipr
@@ -29,7 +29,7 @@
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="libraryTable">
-    <library name="KotlinJavaRuntime (2)">
+    <library name="KotlinJavaRuntime (2)" type="kotlin.js">
       <CLASSES>
         <root url="jar://$PROJECT_DIR$/../jsRuntime106/kotlin-jslib.jar!/" />
       </CLASSES>
diff --git a/idea/testData/configuration/jsLibraryVersion11/projectFile.ipr b/idea/testData/configuration/jsLibraryVersion11/projectFile.ipr
index 6446db85e1d..04132a31306 100644
--- a/idea/testData/configuration/jsLibraryVersion11/projectFile.ipr
+++ b/idea/testData/configuration/jsLibraryVersion11/projectFile.ipr
@@ -29,7 +29,7 @@
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="libraryTable">
-    <library name="KotlinJavaRuntime (2)">
+    <library name="KotlinJavaRuntime (2)" type="kotlin.js">
       <CLASSES>
         <root url="jar://$PROJECT_DIR$/../jsRuntime11Maven/kotlin-stdlib-js-1.1.0.jar!/" />
       </CLASSES>
diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt
index 0c3f723864b..714433736fa 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt
@@ -126,14 +126,15 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() {
     companion object {
         private val BASE_PATH = "idea/testData/configuration/"
         private val TEMP_DIR_MACRO_KEY = "TEMP_TEST_DIR"
-        protected val JAVA_CONFIGURATOR: KotlinJavaModuleConfigurator = object : KotlinJavaModuleConfigurator() {
-            override fun getDefaultPathToJarFile(project: Project): String {
-                return getPathRelativeToTemp("default_jvm_lib")
+        protected val JAVA_CONFIGURATOR: KotlinJavaModuleConfigurator by lazy {
+            object : KotlinJavaModuleConfigurator() {
+                override fun getDefaultPathToJarFile(project: Project) = getPathRelativeToTemp("default_jvm_lib")
             }
         }
-        protected val JS_CONFIGURATOR: KotlinJsModuleConfigurator = object : KotlinJsModuleConfigurator() {
-            override fun getDefaultPathToJarFile(project: Project): String {
-                return getPathRelativeToTemp("default_js_lib")
+
+        protected val JS_CONFIGURATOR: KotlinJsModuleConfigurator by lazy {
+            object : KotlinJsModuleConfigurator() {
+                override fun getDefaultPathToJarFile(project: Project) = getPathRelativeToTemp("default_js_lib")
             }
         }
 
@@ -187,24 +188,24 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() {
         }
 
         private val pathToNonexistentRuntimeJar: String
-            get() {
-                val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/" + PathUtil.KOTLIN_JAVA_RUNTIME_JAR
-                PlatformTestCase.myFilesToDelete.add(File(pathToTempKotlinRuntimeJar))
-                return pathToTempKotlinRuntimeJar
-            }
+        get() {
+            val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/" + PathUtil.KOTLIN_JAVA_RUNTIME_JAR
+            PlatformTestCase.myFilesToDelete.add(File(pathToTempKotlinRuntimeJar))
+            return pathToTempKotlinRuntimeJar
+        }
 
         private val pathToNonexistentJsJar: String
-            get() {
-                val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/" + PathUtil.JS_LIB_JAR_NAME
-                PlatformTestCase.myFilesToDelete.add(File(pathToTempKotlinRuntimeJar))
-                return pathToTempKotlinRuntimeJar
-            }
+        get() {
+            val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/" + PathUtil.JS_LIB_JAR_NAME
+            PlatformTestCase.myFilesToDelete.add(File(pathToTempKotlinRuntimeJar))
+            return pathToTempKotlinRuntimeJar
+        }
 
         private val pathToExistentRuntimeJar: String
-            get() = PathUtil.getKotlinPathsForDistDirectory().stdlibPath.parent
+        get() = PathUtil.getKotlinPathsForDistDirectory().stdlibPath.parent
 
         private val pathToExistentJsJar: String
-            get() = PathUtil.getKotlinPathsForDistDirectory().jsStdLibJarPath.parent
+        get() = PathUtil.getKotlinPathsForDistDirectory().jsStdLibJarPath.parent
 
         protected fun assertNotConfigured(module: Module, configurator: KotlinWithLibraryConfigurator) {
             TestCase.assertFalse(