From 640adecde6e6b9b2d5d6a2626c2e3084ee4b2dfe Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 16 Feb 2015 21:39:18 +0300
Subject: [PATCH] Fix KotlinJpsBuildTest, run J+K tests with runtime

Otherwise javac is not able to find class KotlinClass$Kind, which is used in
annotation argument and for some reason this leads to an exception (in javac)
which gets swallowed and unresolved reference is reported in Java code.

java:INFO:com.sun.tools.javac.code.Symbol$CompletionFailure: class file for
kotlin.jvm.internal.KotlinClass$Kind not found
java:INFO:Errors occurred while compiling module 'm1'
---
 .../kotlin/jps/build/KotlinJpsBuildTest.java      |  8 ++++----
 .../kotlin/jps/build/SimpleKotlinJpsBuildTest.kt  | 15 +++------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java
index c30fbd6c73e..25061ee5916 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java
@@ -324,19 +324,19 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase {
     }
 
     public void testKotlinJavaProject() {
-        doTest();
+        doTestWithRuntime();
     }
 
     public void testJKJProject() {
-        doTest();
+        doTestWithRuntime();
     }
 
     public void testKJKProject() {
-        doTest();
+        doTestWithRuntime();
     }
 
     public void testKJCircularProject() {
-        doTest();
+        doTestWithRuntime();
     }
 
     public void testJKJInheritanceProject() {
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
index 10aee550912..ff1a9588ffb 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
@@ -16,21 +16,10 @@
 
 package org.jetbrains.kotlin.jps.build
 
-import org.jetbrains.jps.builders.JpsBuildTestCase
 import com.intellij.util.PathUtil
 import org.jetbrains.jps.model.java.JpsJavaExtensionService
 
-public class SimpleKotlinJpsBuildTest : JpsBuildTestCase() {
-    override fun setUp() {
-        super.setUp()
-        System.setProperty("kotlin.jps.tests", "true")
-    }
-
-    override fun tearDown() {
-        System.clearProperty("kotlin.jps.tests")
-        super.tearDown()
-    }
-
+public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
     public fun testThreeModulesNoReexport() {
         val aFile = createFile("a/a.kt",
                                """
@@ -69,6 +58,7 @@ public class SimpleKotlinJpsBuildTest : JpsBuildTestCase() {
         val c = addModule("c", PathUtil.getParentPath(cFile))
         c.getDependenciesList().addModuleDependency(b)
 
+        addKotlinRuntimeDependency()
         rebuildAll()
     }
 
@@ -104,6 +94,7 @@ public class SimpleKotlinJpsBuildTest : JpsBuildTestCase() {
                 b.getDependenciesList().addModuleDependency(a)
         ).setExported(false)
 
+        addKotlinRuntimeDependency()
         rebuildAll()
     }
 }