Fix tests

compiler/testData/codegen/boxWithJava/reflection/callPrivateJavaMethod/K.kt

@@ -5,7 +5,7 @@ import kotlin.test.*
 fun box(): String {
     val c = J::class.constructors.single()
     assertFalse(c.isAccessible)
-    failsWith(javaClass<IllegalCallableAccessException>()) { c.call("") }
+    assertFailsWith(javaClass<IllegalCallableAccessException>()) { c.call("") }
 
     c.isAccessible = true
     assertTrue(c.isAccessible)
@@ -13,7 +13,7 @@ fun box(): String {
 
     val m = J::class.members.single { it.name == "getResult" }
     assertFalse(m.isAccessible)
-    failsWith(javaClass<IllegalCallableAccessException>()) { m.call(j)!! }
+    assertFailsWith(javaClass<IllegalCallableAccessException>()) { m.call(j)!! }
 
     m.isAccessible = true
     return m.call(j) as String

compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt

@@ -1,8 +1,7 @@
 import kotlin.jvm.JvmStatic as static
 import kotlin.reflect.KFunction
 import kotlin.reflect.jvm.*
-import kotlin.test.assertEquals
+import kotlin.test.*
-import kotlin.test.failsWith
 
 class C {
     companion object {
@@ -25,7 +24,7 @@ fun box(): String {
              return "Fail: no Kotlin function found for static bridge for @JvmStatic method in companion object C::foo"
     assertEquals(3, k2.call(C, "ghi"))
 
-    failsWith(javaClass<NullPointerException>()) { k2.call(null, "")!! }
+    assertFailsWith(javaClass<NullPointerException>()) { k2.call(null, "")!! }
 
     val j2 = k2.javaMethod
     assertEquals(j, j2)

compiler/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java

@@ -58,7 +58,7 @@ public class ForTestCompileRuntime {
     public static synchronized ClassLoader runtimeAndReflectJarClassLoader() {
         ClassLoader loader = reflectJarClassLoader.get();
         if (loader == null) {
-            loader = createClassLoader(runtimeJarForTests(), reflectJarForTests());
+            loader = createClassLoader(runtimeJarForTests(), reflectJarForTests(), kotlinTestJarForTests());
             reflectJarClassLoader = new SoftReference<ClassLoader>(loader);
         }
         return loader;

idea/testData/editor/optimizeImports/UnusedImports.kt

@@ -6,11 +6,13 @@ import java.util.ArrayList
 import java.util.HashMap
 import kotlin.test.asserter
 import kotlin.test.Asserter
+import kotlin.Charsets
 import kotlin.Assertions
 import kotlin.util.measureTimeMillis
 
 class Action {
     fun test() {
+        val chs = Charsets.UTF8
         // val traait : Asserter = asserter
         val traait : Asserter? = null
         val objectImport : Assertions? = null

idea/testData/editor/optimizeImports/UnusedImports.kt.after

@@ -1,10 +1,10 @@
 import java.util.ArrayList
 import java.util.HashMap
-import kotlin.test.Asserter
 import kotlin.util.measureTimeMillis
 
 class Action {
     fun test() {
+        val chs = Charsets.UTF8
         // val traait : Asserter = asserter
         val traait : Asserter? = null
         val objectImport : Assertions? = null

idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java

@@ -27,8 +27,8 @@ public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegre
      * Regression test against KT-3186
      */
     public void testRefToAssertEquals() {
-        PsiElement navigationElement = configureAndResolve("import kotlin.test.assertEquals; val x = <caret>assertEquals(1, 2)");
+        PsiElement navigationElement = configureAndResolve("import kotlin.io.createTempDir; val x = <caret>createTempDir()");
-        assertEquals("Test.kt", navigationElement.getContainingFile().getName());
+        assertEquals("Utils.kt", navigationElement.getContainingFile().getName());
     }
 
     @Override