Fix tests

Author: Sergey Mashkov

kotlin-frontend/src/test/kotlin/org/jetbrains/kotlin/gradle/frontend/AbstractFrontendTest.kt

@@ -5,6 +5,7 @@ import org.gradle.testkit.runner.internal.*
 import org.jetbrains.kotlin.preprocessor.*
 import org.junit.*
 import org.junit.rules.*
+import org.junit.runner.*
 import java.io.*
 
 abstract class AbstractFrontendTest(val gradleVersion: String, val kotlinVersion: String) {
@@ -15,6 +16,28 @@ abstract class AbstractFrontendTest(val gradleVersion: String, val kotlinVersion
     protected lateinit var srcDir: File
     protected lateinit var runner: GradleRunner
 
+    @get:Rule
+    val testName = TestName()
+
+    @get:Rule
+    val failedRule = object : TestWatcher() {
+        override fun failed(e: Throwable?, description: Description?) {
+            val dst = File("build/tests/${testName.methodName.replace("[", "-").replace("]", "")}").apply { mkdirsOrFail() }
+            projectDir.root.copyRecursively(dst, true) { file, e ->
+                System.err.println("Failed to copy $file due to ${e.message}")
+                OnErrorAction.SKIP
+            }
+            println("Copied project to ${dst.absolutePath}")
+        }
+
+        /*
+        // useful for debugging
+        override fun succeeded(description: Description?) {
+            failed(null, description)
+        }
+        // */
+    }
+
     @get:Rule
     val projectDir = TemporaryFolder()
 
@@ -39,6 +62,6 @@ abstract class AbstractFrontendTest(val gradleVersion: String, val kotlinVersion
         builder.scriptClassPath += "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         builder.scriptClassPath.addAll(cp.filter { "org.jetbrains.kotlin" !in it.path.replace("\\", "/") || kotlinVersion in it.name })
 
-        builder.compileDependencies += "org.jetbrains.kotlin:kotlin-js-library:$kotlinVersion"
+        builder.addJsDependency()
     }
 }

kotlin-frontend/src/test/kotlin/org/jetbrains/kotlin/gradle/frontend/BuildScriptBuilder.kt

@@ -5,7 +5,7 @@ import java.io.*
 import java.util.*
 
 class BuildScriptBuilder {
-    var kotlinVersion = "1.0.5-2"
+    var kotlinVersion = "1.0.6"
 
     val scriptClassPath = ArrayList<Any>()
     val compileDependencies = ArrayList<String>()
@@ -20,6 +20,15 @@ class BuildScriptBuilder {
         applyPlugins += "kotlin2js"
     }
 
+    fun addJsDependency() {
+        if (kotlinVersion.startsWith("1.0."))
+            compileDependencies += "org.jetbrains.kotlin:kotlin-js-library:$kotlinVersion"
+        else if (kotlinVersion.startsWith("1.1."))
+            compileDependencies += "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion"
+        else
+            throw IllegalArgumentException("Only 1.0 and 1.1 kotlin supported")
+    }
+
     fun build(body: Builder.() -> Unit = {}): String {
         val builder = Builder()
 

kotlin-frontend/src/test/kotlin/org/jetbrains/kotlin/gradle/frontend/SimpleFrontendProjectTest.kt

@@ -1,6 +1,7 @@
 package org.jetbrains.kotlin.gradle.frontend
 
 import groovy.json.*
+import javafx.concurrent.*
 import org.gradle.testkit.runner.*
 import org.jetbrains.kotlin.gradle.frontend.util.*
 import org.jetbrains.kotlin.preprocessor.*
@@ -26,7 +27,7 @@ class SimpleFrontendProjectTest(gradleVersion: String, kotlinVersion: String) :
                 .build()
 
         assertNull(result.task(":webpack-bundle"))
-        assertNull(result.task(":npm-install"))
+        assertNotFailed(result.task(":npm-install"))
     }
 
     @Test
@@ -47,7 +48,7 @@ class SimpleFrontendProjectTest(gradleVersion: String, kotlinVersion: String) :
         val result = runner.withArguments("bundle").build()
 
         assertNull(result.task(":webpack-bundle"))
-        assertNull(result.task(":npm-install"))
+        assertNotFailed(result.task(":npm-install"))
         assertEquals(TaskOutcome.SUCCESS, result.task(":compileKotlin2Js")?.outcome)
         assertTrue { projectDir.root.resolve("build/js/script.js").isFile }
     }
@@ -264,7 +265,7 @@ class SimpleFrontendProjectTest(gradleVersion: String, kotlinVersion: String) :
         try {
             assertEquals(TaskOutcome.SUCCESS, result.task(":webpack-config")?.outcome)
             assertEquals(TaskOutcome.SUCCESS, result.task(":webpack-run")?.outcome)
-            assertNull(result.task(":karma-start"))
+            assertNotExecuted(result.task(":karma-start"))
             assertNull(result.task(":ktor-start"))
 
             assertFalse { projectDir.root.resolve("build/bundle/main.bundle.js").exists() }
@@ -359,7 +360,7 @@ class SimpleFrontendProjectTest(gradleVersion: String, kotlinVersion: String) :
             applyKotlin2JsPlugin()
             applyFrontendPlugin()
 
-            compileDependencies += "org.jetbrains.kotlin:kotlin-js-library:$kotlinVersion"
+            addJsDependency()
         }
 
         val builder2 = BuildScriptBuilder().apply {
@@ -432,13 +433,23 @@ class SimpleFrontendProjectTest(gradleVersion: String, kotlinVersion: String) :
         assertTrue { "my-special-const-1" in bundleContent }
     }
 
+    private fun assertNotExecuted(task: BuildTask?) {
+        if (task != null && task.outcome != TaskOutcome.UP_TO_DATE && task.outcome != TaskOutcome.SKIPPED) {
+            fail("${task.path} should be skipped or up-to-date for empty project but it is ${task.outcome}")
+        }
+    }
+
+    private fun assertNotFailed(task: BuildTask?) {
+        assertNotEquals(TaskOutcome.FAILED, task?.outcome, "Task ${task?.path} is failed")
+    }
+
     companion object {
         @JvmStatic
         @Parameters
         fun versions() = listOf(
-                arrayOf("3.1", "1.0.5-2"),
-                arrayOf("3.1", "1.1.0-dev-5520"),
-                arrayOf("3.2.1", "1.0.5-2")
+                arrayOf("3.1", "1.0.6"),
+                arrayOf("3.1", "1.1.0"),
+                arrayOf("3.2.1", "1.0.6")
         )
     }
 }