From 31da7662c54ae7f226fc32aaf3020f5eead2af2d Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Wed, 23 Dec 2015 18:14:00 +0300
Subject: [PATCH] Set-up usage for kotlin-test lib

---
 .idea/libraries/kotlin_test.xml                           | 2 +-
 .../kotlin/jps/build/AbstractIncrementalJpsTest.kt        | 8 +++-----
 .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt  | 2 --
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.idea/libraries/kotlin_test.xml b/.idea/libraries/kotlin_test.xml
index 2462725960c..3615f9fa97c 100644
--- a/.idea/libraries/kotlin_test.xml
+++ b/.idea/libraries/kotlin_test.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="kotlin-test">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-test.jar!/" />
+      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test.jar!/"/>
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
index 9c1a215df5d..eeef1b5268d 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
@@ -59,8 +59,6 @@ import java.io.File
 import java.io.PrintStream
 import java.util.*
 import kotlin.properties.Delegates
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
 
 abstract class AbstractIncrementalJpsTest(
         private val allowNoFilesWithSuffixInTestData: Boolean = false,
@@ -189,7 +187,7 @@ abstract class AbstractIncrementalJpsTest(
             UsefulTestCase.assertSameLinesWithFile(initBuildLogFile.absolutePath, makeResult.log)
         }
         else {
-            assertFalse(makeResult.makeFailed, "Initial make failed:\n$makeResult")
+            assertFalse("Initial make failed:\n$makeResult", makeResult.makeFailed)
         }
 
         return makeResult
@@ -212,8 +210,8 @@ abstract class AbstractIncrementalJpsTest(
         }
 
         val rebuildResult = rebuild()
-        assertEquals(rebuildResult.makeFailed, makeOverallResult.makeFailed,
-                     "Rebuild failed: ${rebuildResult.makeFailed}, last make failed: ${makeOverallResult.makeFailed}. Rebuild result: $rebuildResult")
+        assertEquals("Rebuild failed: ${rebuildResult.makeFailed}, last make failed: ${makeOverallResult.makeFailed}. Rebuild result: $rebuildResult",
+                     rebuildResult.makeFailed, makeOverallResult.makeFailed)
 
         if (!outAfterMake.exists()) {
             assertFalse(outDir.exists())
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
index ad8ca19e874..9c0abbfcce8 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
@@ -57,8 +57,6 @@ import java.io.*
 import java.util.*
 import java.util.regex.Pattern
 import java.util.zip.ZipOutputStream
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
 
 class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
     companion object {