remove Jet from names of classes in tests: phase 2

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompiledKotlinInJavaCompletionTest.kt

@@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.CompletionType
 import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 
-public abstract class AbstractCompiledKotlinInJavaCompletionTest : JetFixtureCompletionBaseTestCase() {
+public abstract class AbstractCompiledKotlinInJavaCompletionTest : KotlinFixtureCompletionBaseTestCase() {
     override fun getPlatform() = JvmPlatform
 
     override fun getProjectDescriptor() = JdkAndMockLibraryProjectDescriptor(COMPLETION_TEST_DATA_BASE_PATH + "/injava/mockLib", false)

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJSBasicCompletionTest.java

@@ -17,16 +17,14 @@
 package org.jetbrains.kotlin.idea.completion.test;
 
 import com.intellij.codeInsight.completion.CompletionType;
-import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager;
 import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor;
 import org.jetbrains.kotlin.js.resolve.JsPlatform;
 import org.jetbrains.kotlin.resolve.TargetPlatform;
 
-public abstract class AbstractJSBasicCompletionTest extends JetFixtureCompletionBaseTestCase {
+public abstract class AbstractJSBasicCompletionTest extends KotlinFixtureCompletionBaseTestCase {
     @NotNull
     @Override
     protected LightProjectDescriptor getProjectDescriptor() {

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmBasicCompletionTest.java

@@ -19,15 +19,15 @@ package org.jetbrains.kotlin.idea.completion.test;
 import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor;
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor;
 import org.jetbrains.kotlin.resolve.TargetPlatform;
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 
-public abstract class AbstractJvmBasicCompletionTest extends JetFixtureCompletionBaseTestCase {
+public abstract class AbstractJvmBasicCompletionTest extends KotlinFixtureCompletionBaseTestCase {
     @NotNull
     @Override
     protected LightProjectDescriptor getProjectDescriptor() {
-        return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
+        return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
     }
 
     @NotNull

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmSmartCompletionTest.java

@@ -19,15 +19,15 @@ package org.jetbrains.kotlin.idea.completion.test;
 import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor;
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor;
 import org.jetbrains.kotlin.resolve.TargetPlatform;
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 
-public abstract class AbstractJvmSmartCompletionTest extends JetFixtureCompletionBaseTestCase {
+public abstract class AbstractJvmSmartCompletionTest extends KotlinFixtureCompletionBaseTestCase {
     @NotNull
     @Override
     protected LightProjectDescriptor getProjectDescriptor() {
-        return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
+        return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
     }
 
     @NotNull

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt

@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 
-public abstract class AbstractJvmWithLibBasicCompletionTest : JetFixtureCompletionBaseTestCase() {
+public abstract class AbstractJvmWithLibBasicCompletionTest : KotlinFixtureCompletionBaseTestCase() {
     private val TEST_PATH = COMPLETION_TEST_DATA_BASE_PATH + "/basic/withLib"
 
     override fun getProjectDescriptor(): LightProjectDescriptor {

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKeywordCompletionTest.kt

@@ -19,10 +19,10 @@ package org.jetbrains.kotlin.idea.completion.test
 import com.intellij.codeInsight.completion.CompletionType
 import com.intellij.codeInsight.lookup.LookupElement
 import org.jetbrains.kotlin.idea.completion.KeywordLookupObject
-import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 
-public abstract class AbstractKeywordCompletionTest : JetFixtureCompletionBaseTestCase() {
+public abstract class AbstractKeywordCompletionTest : KotlinFixtureCompletionBaseTestCase() {
     override fun getPlatform() = JvmPlatform
 
     override fun defaultCompletionType() = CompletionType.BASIC
@@ -32,7 +32,7 @@ public abstract class AbstractKeywordCompletionTest : JetFixtureCompletionBaseTe
         return items.filter { it.`object` is KeywordLookupObject }.toTypedArray()
     }
 
-    override fun getProjectDescriptor() = JetLightProjectDescriptor.INSTANCE
+    override fun getProjectDescriptor() = KotlinLightProjectDescriptor.INSTANCE
 
     override fun defaultInvocationCount() = 1
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt

@@ -26,7 +26,7 @@ import junit.framework.TestCase
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 import java.io.File
 
-public abstract class AbstractKotlinSourceInJavaCompletionTest : JetFixtureCompletionBaseTestCase() {
+public abstract class AbstractKotlinSourceInJavaCompletionTest : KotlinFixtureCompletionBaseTestCase() {
     override fun getPlatform() = JvmPlatform
 
     override fun doTest(testPath: String) {

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,168 +32,168 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompiledKotlinInJavaCompletionTest {
     public void testAllFilesPresentInInjava() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/injava"), Pattern.compile("^(.+)\\.java$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/injava"), Pattern.compile("^(.+)\\.java$"), true);
     }
 
     @TestMetadata("AnnotationParameter.java")
     public void testAnnotationParameter() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/AnnotationParameter.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/AnnotationParameter.java");
         doTest(fileName);
     }
 
     @TestMetadata("Class.java")
     public void testClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Class.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Class.java");
         doTest(fileName);
     }
 
     @TestMetadata("ClassMembers.java")
     public void testClassMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("ClassObject.java")
     public void testClassObject() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObject.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObject.java");
         doTest(fileName);
     }
 
     @TestMetadata("ClassObjectField.java")
     public void testClassObjectField() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObjectField.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObjectField.java");
         doTest(fileName);
     }
 
     @TestMetadata("ClassesFromNamespace.java")
     public void testClassesFromNamespace() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassesFromNamespace.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassesFromNamespace.java");
         doTest(fileName);
     }
 
     @TestMetadata("EnumConstants.java")
     public void testEnumConstants() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/EnumConstants.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/EnumConstants.java");
         doTest(fileName);
     }
 
     @TestMetadata("InterfaceDefaultImpl.java")
     public void testInterfaceDefaultImpl() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImpl.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImpl.java");
         doTest(fileName);
     }
 
     @TestMetadata("InterfaceDefaultImplImportedMembers.java")
     public void testInterfaceDefaultImplImportedMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplImportedMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplImportedMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("InterfaceDefaultImplMembers.java")
     public void testInterfaceDefaultImplMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("InterfaceDefaultImplStaticImportedMembers.java")
     public void testInterfaceDefaultImplStaticImportedMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplStaticImportedMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplStaticImportedMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("MultiFileFacade.java")
     public void testMultiFileFacade() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacade.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacade.java");
         doTest(fileName);
     }
 
     @TestMetadata("MultiFileFacadeMembers.java")
     public void testMultiFileFacadeMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("MultiFileFacadeNoImport.java")
     public void testMultiFileFacadeNoImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeNoImport.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeNoImport.java");
         doTest(fileName);
     }
 
     @TestMetadata("Nested.java")
     public void testNested() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Nested.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Nested.java");
         doTest(fileName);
     }
 
     @TestMetadata("NestedClassMembers.java")
     public void testNestedClassMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("NestedClassMembers2.java")
     public void testNestedClassMembers2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers2.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers2.java");
         doTest(fileName);
     }
 
     @TestMetadata("NestedObjectInstance.java")
     public void testNestedObjectInstance() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedObjectInstance.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedObjectInstance.java");
         doTest(fileName);
     }
 
     @TestMetadata("ObjectInClassObjects.java")
     public void testObjectInClassObjects() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInClassObjects.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInClassObjects.java");
         doTest(fileName);
     }
 
     @TestMetadata("ObjectInstance.java")
     public void testObjectInstance() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInstance.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInstance.java");
         doTest(fileName);
     }
 
     @TestMetadata("RenamedFacade.java")
     public void testRenamedFacade() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/RenamedFacade.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/RenamedFacade.java");
         doTest(fileName);
     }
 
     @TestMetadata("SingleFileFacade.java")
     public void testSingleFileFacade() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacade.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacade.java");
         doTest(fileName);
     }
 
     @TestMetadata("SingleFileFacadeMembers.java")
     public void testSingleFileFacadeMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("SingleFileFacadeNoImport.java")
     public void testSingleFileFacadeNoImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeNoImport.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeNoImport.java");
         doTest(fileName);
     }
 
     @TestMetadata("Subpackage.java")
     public void testSubpackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Subpackage.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Subpackage.java");
         doTest(fileName);
     }
 
     @TestMetadata("TopLevelMembers.java")
     public void testTopLevelMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TopLevelMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TopLevelMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("TraitMember.java")
     public void testTraitMember() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TraitMember.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TraitMember.java");
         doTest(fileName);
     }
 

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompletionTestUtil.kt

@@ -20,12 +20,12 @@ import com.intellij.codeInsight.CodeInsightSettings
 import com.intellij.codeInsight.completion.CompletionType
 import com.intellij.codeInsight.lookup.LookupElement
 import org.jetbrains.kotlin.resolve.TargetPlatform
-import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.junit.Assert
 
 val RELATIVE_COMPLETION_TEST_DATA_BASE_PATH = "idea/idea-completion/testData"
 
-val COMPLETION_TEST_DATA_BASE_PATH = JetTestUtils.getHomeDirectory() + "/" + RELATIVE_COMPLETION_TEST_DATA_BASE_PATH
+val COMPLETION_TEST_DATA_BASE_PATH = KotlinTestUtils.getHomeDirectory() + "/" + RELATIVE_COMPLETION_TEST_DATA_BASE_PATH
 
 fun testCompletion(fileText: String, platform: TargetPlatform?, complete: (CompletionType, Int) -> Array<LookupElement>?, defaultCompletionType: CompletionType = CompletionType.BASIC, defaultInvocationCount: Int = 0) {
     testWithAutoCompleteSetting(fileText) {

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmWithLibBasicCompletionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,54 +32,54 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class JvmWithLibBasicCompletionTestGenerated extends AbstractJvmWithLibBasicCompletionTest {
     public void testAllFilesPresentInWithLib() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/withLib"), Pattern.compile("^(.+)\\.kt$"), false);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/withLib"), Pattern.compile("^(.+)\\.kt$"), false);
     }
 
     @TestMetadata("NamedArgumentsJava.kt")
     public void testNamedArgumentsJava() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/NamedArgumentsJava.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/NamedArgumentsJava.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NamedArgumentsKotlin.kt")
     public void testNamedArgumentsKotlin() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/NamedArgumentsKotlin.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/NamedArgumentsKotlin.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SamAdapter.kt")
     public void testSamAdapter() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/SamAdapter.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/SamAdapter.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SamAdapterAndGenerics.kt")
     public void testSamAdapterAndGenerics() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/SamAdapterAndGenerics.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/SamAdapterAndGenerics.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TopLevelNonImportedExtFun.kt")
     public void testTopLevelNonImportedExtFun() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtFun.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtFun.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TopLevelNonImportedExtProp.kt")
     public void testTopLevelNonImportedExtProp() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtProp.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtProp.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TopLevelNonImportedFun.kt")
     public void testTopLevelNonImportedFun() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedFun.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedFun.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TopLevelNonImportedProperty.kt")
     public void testTopLevelNonImportedProperty() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedProperty.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedProperty.kt");
         doTest(fileName);
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KDocCompletionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,60 +32,60 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class KDocCompletionTestGenerated extends AbstractJvmBasicCompletionTest {
     public void testAllFilesPresentInKdoc() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/kdoc"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/kdoc"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("Link.kt")
     public void testLink() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/Link.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/Link.kt");
         doTest(fileName);
     }
 
     @TestMetadata("MemberLink.kt")
     public void testMemberLink() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/MemberLink.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/MemberLink.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NotTagName.kt")
     public void testNotTagName() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/NotTagName.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/NotTagName.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ParamTag.kt")
     public void testParamTag() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/ParamTag.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/ParamTag.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SkipExistingParamTag.kt")
     public void testSkipExistingParamTag() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/SkipExistingParamTag.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/SkipExistingParamTag.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TagName.kt")
     public void testTagName() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagName.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagName.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TagNameAfterAt.kt")
     public void testTagNameAfterAt() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameAfterAt.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameAfterAt.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TagNameMiddle.kt")
     public void testTagNameMiddle() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameMiddle.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameMiddle.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TagNameStart.kt")
     public void testTagNameStart() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameStart.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameStart.kt");
         doTest(fileName);
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KeywordCompletionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -33,491 +33,491 @@ import java.util.regex.Pattern;
 public class KeywordCompletionTestGenerated extends AbstractKeywordCompletionTest {
     @TestMetadata("AfterClassProperty.kt")
     public void testAfterClassProperty() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterClassProperty.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterClassProperty.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AfterClasses.kt")
     public void testAfterClasses() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterClasses.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterClasses.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AfterDot.kt")
     public void testAfterDot() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterDot.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterDot.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AfterFuns.kt")
     public void testAfterFuns() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterFuns.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterFuns.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AfterSafeDot.kt")
     public void testAfterSafeDot() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterSafeDot.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterSafeDot.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AfterSpaceAndDot.kt")
     public void testAfterSpaceAndDot() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterSpaceAndDot.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterSpaceAndDot.kt");
         doTest(fileName);
     }
 
     public void testAllFilesPresentInKeywords() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/keywords"), Pattern.compile("^(.+)\\.kt$"), false);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/keywords"), Pattern.compile("^(.+)\\.kt$"), false);
     }
 
     @TestMetadata("BeforeClass.kt")
     public void testBeforeClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BeforeClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BeforeClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("BeforeDelegationCall.kt")
     public void testBeforeDelegationCall() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BeforeDelegationCall.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BeforeDelegationCall.kt");
         doTest(fileName);
     }
 
     @TestMetadata("BreakContinue.kt")
     public void testBreakContinue() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BreakContinue.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BreakContinue.kt");
         doTest(fileName);
     }
 
     @TestMetadata("BreakWithLabel.kt")
     public void testBreakWithLabel() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BreakWithLabel.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BreakWithLabel.kt");
         doTest(fileName);
     }
 
     @TestMetadata("CommaExpected.kt")
     public void testCommaExpected() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/CommaExpected.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/CommaExpected.kt");
         doTest(fileName);
     }
 
     @TestMetadata("CompanionObjectBeforeObject.kt")
     public void testCompanionObjectBeforeObject() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/CompanionObjectBeforeObject.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/CompanionObjectBeforeObject.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ContinueWithLabel.kt")
     public void testContinueWithLabel() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ContinueWithLabel.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ContinueWithLabel.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FileKeyword.kt")
     public void testFileKeyword() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/FileKeyword.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/FileKeyword.kt");
         doTest(fileName);
     }
 
     @TestMetadata("GlobalPropertyAccessors.kt")
     public void testGlobalPropertyAccessors() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InAnnotationClassScope.kt")
     public void testInAnnotationClassScope() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InAnnotationClassScope.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InAnnotationClassScope.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InArgumentList.kt")
     public void testInArgumentList() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InArgumentList.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InArgumentList.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InBlockComment.kt")
     public void testInBlockComment() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InBlockComment.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InBlockComment.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InChar.kt")
     public void testInChar() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InChar.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InChar.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InClassBeforeFun.kt")
     public void testInClassBeforeFun() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassBeforeFun.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassBeforeFun.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InClassNoCompletionInValName.kt")
     public void testInClassNoCompletionInValName() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassNoCompletionInValName.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassNoCompletionInValName.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InClassProperty.kt")
     public void testInClassProperty() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassProperty.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassProperty.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InClassScope.kt")
     public void testInClassScope() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassScope.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassScope.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InClassTypeParameters.kt")
     public void testInClassTypeParameters() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassTypeParameters.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassTypeParameters.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InCodeBlock.kt")
     public void testInCodeBlock() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InCodeBlock.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InCodeBlock.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InEnumScope1.kt")
     public void testInEnumScope1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InEnumScope1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InEnumScope1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InEnumScope2.kt")
     public void testInEnumScope2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InEnumScope2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InEnumScope2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InFunctionExpressionBody.kt")
     public void testInFunctionExpressionBody() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionExpressionBody.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionExpressionBody.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InFunctionName.kt")
     public void testInFunctionName() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionName.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionName.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InFunctionRecieverType.kt")
     public void testInFunctionRecieverType() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionRecieverType.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionRecieverType.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InFunctionTypePosition.kt")
     public void testInFunctionTypePosition() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionTypePosition.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionTypePosition.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InGetterExpressionBody.kt")
     public void testInGetterExpressionBody() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InGetterExpressionBody.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InGetterExpressionBody.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InInterfaceScope.kt")
     public void testInInterfaceScope() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InInterfaceScope.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InInterfaceScope.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InMemberFunParametersList.kt")
     public void testInMemberFunParametersList() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InMemberFunParametersList.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InMemberFunParametersList.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InModifierListInsideClass.kt")
     public void testInModifierListInsideClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InModifierListInsideClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InModifierListInsideClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InNotFinishedGenericWithFunAfter.kt")
     public void testInNotFinishedGenericWithFunAfter() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InNotFinishedGenericWithFunAfter.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InNotFinishedGenericWithFunAfter.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InObjectScope.kt")
     public void testInObjectScope() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InObjectScope.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InObjectScope.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InParameterDefaultValue.kt")
     public void testInParameterDefaultValue() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InParameterDefaultValue.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InParameterDefaultValue.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InPrimaryConstructorParametersList.kt")
     public void testInPrimaryConstructorParametersList() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPrimaryConstructorParametersList.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPrimaryConstructorParametersList.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InPropertyInitializer.kt")
     public void testInPropertyInitializer() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPropertyInitializer.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPropertyInitializer.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InPropertyTypeReference.kt")
     public void testInPropertyTypeReference() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPropertyTypeReference.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPropertyTypeReference.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InString.kt")
     public void testInString() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InString.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InString.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InTopFunParametersList.kt")
     public void testInTopFunParametersList() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InTopFunParametersList.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InTopFunParametersList.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InTopScopeAfterPackage.kt")
     public void testInTopScopeAfterPackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt");
         doTest(fileName);
     }
 
     @TestMetadata("LabeledLambdaThis.kt")
     public void testLabeledLambdaThis() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/LabeledLambdaThis.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/LabeledLambdaThis.kt");
         doTest(fileName);
     }
 
     @TestMetadata("LineComment.kt")
     public void testLineComment() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/LineComment.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/LineComment.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NoBreak1.kt")
     public void testNoBreak1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoBreak1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoBreak1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NoBreak2.kt")
     public void testNoBreak2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoBreak2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoBreak2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NoCompanionThis.kt")
     public void testNoCompanionThis() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoCompanionThis.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoCompanionThis.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NoCompletionForCapitalPrefix.kt")
     public void testNoCompletionForCapitalPrefix() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoCompletionForCapitalPrefix.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoCompletionForCapitalPrefix.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NoContinue.kt")
     public void testNoContinue() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoContinue.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoContinue.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NoFinalInParameterList.kt")
     public void testNoFinalInParameterList() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoFinalInParameterList.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoFinalInParameterList.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NotInNotIs.kt")
     public void testNotInNotIs() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NotInNotIs.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NotInNotIs.kt");
         doTest(fileName);
     }
 
     @TestMetadata("PrefixMatcher.kt")
     public void testPrefixMatcher() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PrefixMatcher.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PrefixMatcher.kt");
         doTest(fileName);
     }
 
     @TestMetadata("PropertyAccessors.kt")
     public void testPropertyAccessors() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertyAccessors.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertyAccessors.kt");
         doTest(fileName);
     }
 
     @TestMetadata("PropertyAccessors2.kt")
     public void testPropertyAccessors2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertyAccessors2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertyAccessors2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("PropertySetter.kt")
     public void testPropertySetter() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertySetter.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertySetter.kt");
         doTest(fileName);
     }
 
     @TestMetadata("QualifiedThis.kt")
     public void testQualifiedThis() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/QualifiedThis.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/QualifiedThis.kt");
         doTest(fileName);
     }
 
     @TestMetadata("QualifiedThisInAccessor.kt")
     public void testQualifiedThisInAccessor() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/QualifiedThisInAccessor.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/QualifiedThisInAccessor.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Return1.kt")
     public void testReturn1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Return2.kt")
     public void testReturn2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Return3.kt")
     public void testReturn3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Return4.kt")
     public void testReturn4() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return4.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return4.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Return5.kt")
     public void testReturn5() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return5.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return5.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Return6.kt")
     public void testReturn6() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return6.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return6.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Return7.kt")
     public void testReturn7() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return7.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return7.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Return8.kt")
     public void testReturn8() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return8.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return8.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Return9.kt")
     public void testReturn9() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return9.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return9.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnBoolean.kt")
     public void testReturnBoolean() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnBoolean.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnBoolean.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnCollection.kt")
     public void testReturnCollection() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnCollection.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnCollection.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnIterable.kt")
     public void testReturnIterable() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnIterable.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnIterable.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnKeywordName.kt")
     public void testReturnKeywordName() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnKeywordName.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnKeywordName.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnList.kt")
     public void testReturnList() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnList.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnList.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnNotNull.kt")
     public void testReturnNotNull() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNotNull.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNotNull.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnNull.kt")
     public void testReturnNull() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNull.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNull.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnNullableBoolean.kt")
     public void testReturnNullableBoolean() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNullableBoolean.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNullableBoolean.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnSet.kt")
     public void testReturnSet() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnSet.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnSet.kt");
         doTest(fileName);
     }
 
     @TestMetadata("This.kt")
     public void testThis() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/This.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/This.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ThisPrefixMatching.kt")
     public void testThisPrefixMatching() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ThisPrefixMatching.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ThisPrefixMatching.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TopScope.kt")
     public void testTopScope() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/TopScope.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/TopScope.kt");
         doTest(fileName);
     }
 
     @TestMetadata("UseSiteTargetForPrimaryConstructorParameter.kt")
     public void testUseSiteTargetForPrimaryConstructorParameter() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/UseSiteTargetForPrimaryConstructorParameter.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/UseSiteTargetForPrimaryConstructorParameter.kt");
         doTest(fileName);
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinCompletionTestCase.java

@@ -20,20 +20,20 @@ import com.intellij.codeInsight.CodeInsightSettings;
 import com.intellij.codeInsight.completion.CompletionTestCase;
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
 import com.intellij.util.ArrayUtil;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 
 abstract public class KotlinCompletionTestCase extends CompletionTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory());
         CodeInsightSettings.getInstance().EXCLUDED_PACKAGES = new String[]{"excludedPackage", "somePackage.ExcludedClass"};
     }
 
     @Override
     protected void tearDown() throws Exception {
         CodeInsightSettings.getInstance().EXCLUDED_PACKAGES = ArrayUtil.EMPTY_STRING_ARRAY;
-        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
+        VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory());
         super.tearDown();
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinFixtureCompletionBaseTestCase.kt

@@ -20,11 +20,11 @@ import com.intellij.codeInsight.completion.CompletionType
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.openapi.util.io.FileUtil
 import org.jetbrains.kotlin.idea.caches.resolve.LibraryModificationTracker
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.resolve.TargetPlatform
 import java.io.File
 
-public abstract class KotlinFixtureCompletionBaseTestCase : JetLightCodeInsightFixtureTestCase() {
+public abstract class KotlinFixtureCompletionBaseTestCase : KotlinLightCodeInsightFixtureTestCase() {
     public abstract fun getPlatform(): TargetPlatform
 
     protected open fun complete(completionType: CompletionType, invocationCount: Int): Array<LookupElement>?

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,168 +32,168 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSourceInJavaCompletionTest {
     public void testAllFilesPresentInInjava() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/injava"), Pattern.compile("^(.+)\\.java$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/injava"), Pattern.compile("^(.+)\\.java$"), true);
     }
 
     @TestMetadata("AnnotationParameter.java")
     public void testAnnotationParameter() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/AnnotationParameter.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/AnnotationParameter.java");
         doTest(fileName);
     }
 
     @TestMetadata("Class.java")
     public void testClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Class.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Class.java");
         doTest(fileName);
     }
 
     @TestMetadata("ClassMembers.java")
     public void testClassMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("ClassObject.java")
     public void testClassObject() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObject.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObject.java");
         doTest(fileName);
     }
 
     @TestMetadata("ClassObjectField.java")
     public void testClassObjectField() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObjectField.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObjectField.java");
         doTest(fileName);
     }
 
     @TestMetadata("ClassesFromNamespace.java")
     public void testClassesFromNamespace() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassesFromNamespace.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassesFromNamespace.java");
         doTest(fileName);
     }
 
     @TestMetadata("EnumConstants.java")
     public void testEnumConstants() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/EnumConstants.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/EnumConstants.java");
         doTest(fileName);
     }
 
     @TestMetadata("InterfaceDefaultImpl.java")
     public void testInterfaceDefaultImpl() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImpl.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImpl.java");
         doTest(fileName);
     }
 
     @TestMetadata("InterfaceDefaultImplImportedMembers.java")
     public void testInterfaceDefaultImplImportedMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplImportedMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplImportedMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("InterfaceDefaultImplMembers.java")
     public void testInterfaceDefaultImplMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("InterfaceDefaultImplStaticImportedMembers.java")
     public void testInterfaceDefaultImplStaticImportedMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplStaticImportedMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplStaticImportedMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("MultiFileFacade.java")
     public void testMultiFileFacade() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacade.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacade.java");
         doTest(fileName);
     }
 
     @TestMetadata("MultiFileFacadeMembers.java")
     public void testMultiFileFacadeMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("MultiFileFacadeNoImport.java")
     public void testMultiFileFacadeNoImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeNoImport.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeNoImport.java");
         doTest(fileName);
     }
 
     @TestMetadata("Nested.java")
     public void testNested() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Nested.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Nested.java");
         doTest(fileName);
     }
 
     @TestMetadata("NestedClassMembers.java")
     public void testNestedClassMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("NestedClassMembers2.java")
     public void testNestedClassMembers2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers2.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers2.java");
         doTest(fileName);
     }
 
     @TestMetadata("NestedObjectInstance.java")
     public void testNestedObjectInstance() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedObjectInstance.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedObjectInstance.java");
         doTest(fileName);
     }
 
     @TestMetadata("ObjectInClassObjects.java")
     public void testObjectInClassObjects() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInClassObjects.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInClassObjects.java");
         doTest(fileName);
     }
 
     @TestMetadata("ObjectInstance.java")
     public void testObjectInstance() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInstance.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInstance.java");
         doTest(fileName);
     }
 
     @TestMetadata("RenamedFacade.java")
     public void testRenamedFacade() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/RenamedFacade.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/RenamedFacade.java");
         doTest(fileName);
     }
 
     @TestMetadata("SingleFileFacade.java")
     public void testSingleFileFacade() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacade.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacade.java");
         doTest(fileName);
     }
 
     @TestMetadata("SingleFileFacadeMembers.java")
     public void testSingleFileFacadeMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("SingleFileFacadeNoImport.java")
     public void testSingleFileFacadeNoImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeNoImport.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeNoImport.java");
         doTest(fileName);
     }
 
     @TestMetadata("Subpackage.java")
     public void testSubpackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Subpackage.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Subpackage.java");
         doTest(fileName);
     }
 
     @TestMetadata("TopLevelMembers.java")
     public void testTopLevelMembers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TopLevelMembers.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TopLevelMembers.java");
         doTest(fileName);
     }
 
     @TestMetadata("TraitMember.java")
     public void testTraitMember() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TraitMember.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TraitMember.java");
         doTest(fileName);
     }
 

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,324 +32,324 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class MultiFileJvmBasicCompletionTestGenerated extends AbstractMultiFileJvmBasicCompletionTest {
     public void testAllFilesPresentInMultifile() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/multifile"), Pattern.compile("^([^\\.]+)$"), false);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/multifile"), Pattern.compile("^([^\\.]+)$"), false);
     }
 
     @TestMetadata("CallableReferenceNotImported")
     public void testCallableReferenceNotImported() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallableReferenceNotImported/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallableReferenceNotImported/");
         doTest(fileName);
     }
 
     @TestMetadata("CallableReferenceNotImportedExtension")
     public void testCallableReferenceNotImportedExtension() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallableReferenceNotImportedExtension/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallableReferenceNotImportedExtension/");
         doTest(fileName);
     }
 
     @TestMetadata("CallablesInExcludedPackage")
     public void testCallablesInExcludedPackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallablesInExcludedPackage/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallablesInExcludedPackage/");
         doTest(fileName);
     }
 
     @TestMetadata("ClassInExcludedPackage")
     public void testClassInExcludedPackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ClassInExcludedPackage/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ClassInExcludedPackage/");
         doTest(fileName);
     }
 
     @TestMetadata("CompleteFunctionWithNoSpecifiedType")
     public void testCompleteFunctionWithNoSpecifiedType() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompleteFunctionWithNoSpecifiedType/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompleteFunctionWithNoSpecifiedType/");
         doTest(fileName);
     }
 
     @TestMetadata("CompleteImportedFunction")
     public void testCompleteImportedFunction() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompleteImportedFunction/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompleteImportedFunction/");
         doTest(fileName);
     }
 
     @TestMetadata("CompletionOnImportedFunction")
     public void testCompletionOnImportedFunction() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompletionOnImportedFunction/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompletionOnImportedFunction/");
         doTest(fileName);
     }
 
     @TestMetadata("DoNotCompleteWithConstraints")
     public void testDoNotCompleteWithConstraints() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/DoNotCompleteWithConstraints/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/DoNotCompleteWithConstraints/");
         doTest(fileName);
     }
 
     @TestMetadata("EnumEntry")
     public void testEnumEntry() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/EnumEntry/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/EnumEntry/");
         doTest(fileName);
     }
 
     @TestMetadata("ExcludedClass")
     public void testExcludedClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExcludedClass/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExcludedClass/");
         doTest(fileName);
     }
 
     @TestMetadata("ExcludedJavaClass")
     public void testExcludedJavaClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExcludedJavaClass/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExcludedJavaClass/");
         doTest(fileName);
     }
 
     @TestMetadata("ExtensionFunction")
     public void testExtensionFunction() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionFunction/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionFunction/");
         doTest(fileName);
     }
 
     @TestMetadata("ExtensionFunctionOnImportedFunction")
     public void testExtensionFunctionOnImportedFunction() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionFunctionOnImportedFunction/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionFunctionOnImportedFunction/");
         doTest(fileName);
     }
 
     @TestMetadata("ExtensionOnNullable")
     public void testExtensionOnNullable() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionOnNullable/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionOnNullable/");
         doTest(fileName);
     }
 
     @TestMetadata("ExtensionsForSmartCast")
     public void testExtensionsForSmartCast() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionsForSmartCast/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionsForSmartCast/");
         doTest(fileName);
     }
 
     @TestMetadata("GroovyClassNameCompletionFromDefaultPackage")
     public void testGroovyClassNameCompletionFromDefaultPackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/GroovyClassNameCompletionFromDefaultPackage/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/GroovyClassNameCompletionFromDefaultPackage/");
         doTest(fileName);
     }
 
     @TestMetadata("GroovyClassNameCompletionFromNonDefaultPackage")
     public void testGroovyClassNameCompletionFromNonDefaultPackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/");
         doTest(fileName);
     }
 
     @TestMetadata("HiddenDeclarations")
     public void testHiddenDeclarations() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/HiddenDeclarations/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/HiddenDeclarations/");
         doTest(fileName);
     }
 
     @TestMetadata("InImport")
     public void testInImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/InImport/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/InImport/");
         doTest(fileName);
     }
 
     @TestMetadata("InImportedFunctionLiteralParameter")
     public void testInImportedFunctionLiteralParameter() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/InImportedFunctionLiteralParameter/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/InImportedFunctionLiteralParameter/");
         doTest(fileName);
     }
 
     @TestMetadata("IncorrectGetters")
     public void testIncorrectGetters() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/IncorrectGetters/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/IncorrectGetters/");
         doTest(fileName);
     }
 
     @TestMetadata("JavaInnerClasses")
     public void testJavaInnerClasses() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/JavaInnerClasses/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/JavaInnerClasses/");
         doTest(fileName);
     }
 
     @TestMetadata("MoreSpecificExtensionGeneric")
     public void testMoreSpecificExtensionGeneric() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionGeneric/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionGeneric/");
         doTest(fileName);
     }
 
     @TestMetadata("MoreSpecificExtensionInDifferentPackage")
     public void testMoreSpecificExtensionInDifferentPackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionInDifferentPackage/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionInDifferentPackage/");
         doTest(fileName);
     }
 
     @TestMetadata("MoreSpecificExtensionIsPrivate")
     public void testMoreSpecificExtensionIsPrivate() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionIsPrivate/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionIsPrivate/");
         doTest(fileName);
     }
 
     @TestMetadata("NoAutoInsertionOfNotImported")
     public void testNoAutoInsertionOfNotImported() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoAutoInsertionOfNotImported/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoAutoInsertionOfNotImported/");
         doTest(fileName);
     }
 
     @TestMetadata("NoExtForOuterFromNested")
     public void testNoExtForOuterFromNested() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoExtForOuterFromNested/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoExtForOuterFromNested/");
         doTest(fileName);
     }
 
     @TestMetadata("NoExtensionMethodDuplication")
     public void testNoExtensionMethodDuplication() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoExtensionMethodDuplication/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoExtensionMethodDuplication/");
         doTest(fileName);
     }
 
     @TestMetadata("NoGenericFunDuplication")
     public void testNoGenericFunDuplication() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoGenericFunDuplication/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoGenericFunDuplication/");
         doTest(fileName);
     }
 
     @TestMetadata("NotImportedExtensionForImplicitReceiver")
     public void testNotImportedExtensionForImplicitReceiver() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionForImplicitReceiver/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionForImplicitReceiver/");
         doTest(fileName);
     }
 
     @TestMetadata("NotImportedExtensionFunction")
     public void testNotImportedExtensionFunction() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction/");
         doTest(fileName);
     }
 
     @TestMetadata("NotImportedExtensionFunction2")
     public void testNotImportedExtensionFunction2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction2/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction2/");
         doTest(fileName);
     }
 
     @TestMetadata("NotImportedExtensionFunction3")
     public void testNotImportedExtensionFunction3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction3/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction3/");
         doTest(fileName);
     }
 
     @TestMetadata("NotImportedExtensionFunctionAndAlias")
     public void testNotImportedExtensionFunctionAndAlias() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunctionAndAlias/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunctionAndAlias/");
         doTest(fileName);
     }
 
     @TestMetadata("NotImportedExtensionProperty")
     public void testNotImportedExtensionProperty() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionProperty/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionProperty/");
         doTest(fileName);
     }
 
     @TestMetadata("NotImportedFunction")
     public void testNotImportedFunction() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedFunction/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedFunction/");
         doTest(fileName);
     }
 
     @TestMetadata("NotImportedInfixExtension")
     public void testNotImportedInfixExtension() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedInfixExtension/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedInfixExtension/");
         doTest(fileName);
     }
 
     @TestMetadata("NotImportedJavaClass")
     public void testNotImportedJavaClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedJavaClass/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedJavaClass/");
         doTest(fileName);
     }
 
     @TestMetadata("NotImportedObject")
     public void testNotImportedObject() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedObject/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedObject/");
         doTest(fileName);
     }
 
     @TestMetadata("NotImportedProperty")
     public void testNotImportedProperty() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedProperty/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedProperty/");
         doTest(fileName);
     }
 
     @TestMetadata("ObjectInTypePosition")
     public void testObjectInTypePosition() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ObjectInTypePosition/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ObjectInTypePosition/");
         doTest(fileName);
     }
 
     @TestMetadata("ParameterNameAndTypeNestedClasses")
     public void testParameterNameAndTypeNestedClasses() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/");
         doTest(fileName);
     }
 
     @TestMetadata("PreferMemberToExtension")
     public void testPreferMemberToExtension() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMemberToExtension/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMemberToExtension/");
         doTest(fileName);
     }
 
     @TestMetadata("PreferMemberToGlobal")
     public void testPreferMemberToGlobal() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMemberToGlobal/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMemberToGlobal/");
         doTest(fileName);
     }
 
     @TestMetadata("PreferMoreSpecificExtension1")
     public void testPreferMoreSpecificExtension1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension1/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension1/");
         doTest(fileName);
     }
 
     @TestMetadata("PreferMoreSpecificExtension2")
     public void testPreferMoreSpecificExtension2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension2/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension2/");
         doTest(fileName);
     }
 
     @TestMetadata("PreferMoreSpecificExtension3")
     public void testPreferMoreSpecificExtension3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension3/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension3/");
         doTest(fileName);
     }
 
     @TestMetadata("PropertyKeysEmptyString")
     public void testPropertyKeysEmptyString() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysEmptyString/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysEmptyString/");
         doTest(fileName);
     }
 
     @TestMetadata("PropertyKeysNoPrefix")
     public void testPropertyKeysNoPrefix() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysNoPrefix/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysNoPrefix/");
         doTest(fileName);
     }
 
     @TestMetadata("PropertyKeysWithPrefix")
     public void testPropertyKeysWithPrefix() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysWithPrefix/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysWithPrefix/");
         doTest(fileName);
     }
 
     @TestMetadata("SyntheticExtensionDeprecated")
     public void testSyntheticExtensionDeprecated() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/SyntheticExtensionDeprecated/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/SyntheticExtensionDeprecated/");
         doTest(fileName);
     }
 
     @TestMetadata("SyntheticExtensionForGenericClass")
     public void testSyntheticExtensionForGenericClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/SyntheticExtensionForGenericClass/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/SyntheticExtensionForGenericClass/");
         doTest(fileName);
     }
 
     @TestMetadata("TopLevelFunction")
     public void testTopLevelFunction() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/TopLevelFunction/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/TopLevelFunction/");
         doTest(fileName);
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileSmartCompletionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,108 +32,108 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class MultiFileSmartCompletionTestGenerated extends AbstractMultiFileSmartCompletionTest {
     public void testAllFilesPresentInSmartMultiFile() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smartMultiFile"), Pattern.compile("^([^\\.]+)$"), false);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smartMultiFile"), Pattern.compile("^([^\\.]+)$"), false);
     }
 
     @TestMetadata("AnonymousObjectGenericJava")
     public void testAnonymousObjectGenericJava() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/AnonymousObjectGenericJava/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/AnonymousObjectGenericJava/");
         doTest(fileName);
     }
 
     @TestMetadata("CallableReferenceNotImported")
     public void testCallableReferenceNotImported() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/CallableReferenceNotImported/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/CallableReferenceNotImported/");
         doTest(fileName);
     }
 
     @TestMetadata("CallablesInExcludedPackage")
     public void testCallablesInExcludedPackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/CallablesInExcludedPackage/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/CallablesInExcludedPackage/");
         doTest(fileName);
     }
 
     @TestMetadata("FunctionFromAnotherPackage")
     public void testFunctionFromAnotherPackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/FunctionFromAnotherPackage/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/FunctionFromAnotherPackage/");
         doTest(fileName);
     }
 
     @TestMetadata("GenericInheritors1")
     public void testGenericInheritors1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors1/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors1/");
         doTest(fileName);
     }
 
     @TestMetadata("GenericInheritors2")
     public void testGenericInheritors2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors2/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors2/");
         doTest(fileName);
     }
 
     @TestMetadata("GenericInheritors3")
     public void testGenericInheritors3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors3/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors3/");
         doTest(fileName);
     }
 
     @TestMetadata("GenericInheritors4")
     public void testGenericInheritors4() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors4/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors4/");
         doTest(fileName);
     }
 
     @TestMetadata("InheritorInTheSameFile")
     public void testInheritorInTheSameFile() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/InheritorInTheSameFile/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/InheritorInTheSameFile/");
         doTest(fileName);
     }
 
     @TestMetadata("Inheritors")
     public void testInheritors() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/Inheritors/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/Inheritors/");
         doTest(fileName);
     }
 
     @TestMetadata("InheritorsAndMultipleExpectedTypes")
     public void testInheritorsAndMultipleExpectedTypes() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/");
         doTest(fileName);
     }
 
     @TestMetadata("JavaStaticMethodArgument")
     public void testJavaStaticMethodArgument() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/JavaStaticMethodArgument/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/JavaStaticMethodArgument/");
         doTest(fileName);
     }
 
     @TestMetadata("JavaStaticMethodArgument2")
     public void testJavaStaticMethodArgument2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/JavaStaticMethodArgument2/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/JavaStaticMethodArgument2/");
         doTest(fileName);
     }
 
     @TestMetadata("KT_8751")
     public void testKT_8751() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/KT_8751/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/KT_8751/");
         doTest(fileName);
     }
 
     @TestMetadata("KT_8751_2")
     public void testKT_8751_2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/KT_8751_2/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/KT_8751_2/");
         doTest(fileName);
     }
 
     @TestMetadata("NestedClassAfterAs")
     public void testNestedClassAfterAs() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/NestedClassAfterAs/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/NestedClassAfterAs/");
         doTest(fileName);
     }
 
     @TestMetadata("NoObjectDuplication")
     public void testNoObjectDuplication() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/");
         doTest(fileName);
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractCompletionHandlerTests.kt

@@ -21,7 +21,7 @@ import com.intellij.openapi.util.io.FileUtil
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager
 import org.jetbrains.kotlin.idea.completion.test.ExpectedCompletionUtils
 import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
-import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.utils.addToStdlib.indexOfOrNull
 import java.io.File
@@ -80,7 +80,7 @@ public abstract class AbstractCompletionHandlerTest(private val defaultCompletio
         fixture.configureByFile(testPath)
     }
 
-    override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
+    override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 }
 
 public abstract class AbstractBasicCompletionHandlerTest() : AbstractCompletionHandlerTest(CompletionType.BASIC)

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test.handlers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,132 +32,132 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletionHandlerTest {
     public void testAllFilesPresentInBasic() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("AnnotationInBrackets.kt")
     public void testAnnotationInBrackets() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInBrackets.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInBrackets.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AnnotationInClassAddImport.kt")
     public void testAnnotationInClassAddImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AnnotationInCompanionObjectAddImport.kt")
     public void testAnnotationInCompanionObjectAddImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ClassWithClassObject.kt")
     public void testClassWithClassObject() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ClassWithClassObject.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ClassWithClassObject.kt");
         doTest(fileName);
     }
 
     @TestMetadata("DoNotUseParenthesisOnNextLine.kt")
     public void testDoNotUseParenthesisOnNextLine() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/DoNotUseParenthesisOnNextLine.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/DoNotUseParenthesisOnNextLine.kt");
         doTest(fileName);
     }
 
     @TestMetadata("EA70229.kt")
     public void testEA70229() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/EA70229.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/EA70229.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ExtensionReceiverTypeArg.kt")
     public void testExtensionReceiverTypeArg() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ExtensionReceiverTypeArg.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ExtensionReceiverTypeArg.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FirstTypeArgument.kt")
     public void testFirstTypeArgument() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/FirstTypeArgument.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/FirstTypeArgument.kt");
         doTest(fileName);
     }
 
     @TestMetadata("GenericFunctionWithTab.kt")
     public void testGenericFunctionWithTab() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/GenericFunctionWithTab.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/GenericFunctionWithTab.kt");
         doTest(fileName);
     }
 
     @TestMetadata("GenericFunctionWithTab2.kt")
     public void testGenericFunctionWithTab2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/GenericFunctionWithTab2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/GenericFunctionWithTab2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InterfaceNameBeforeRunBug.kt")
     public void testInterfaceNameBeforeRunBug() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/InterfaceNameBeforeRunBug.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/InterfaceNameBeforeRunBug.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NestedTypeArg.kt")
     public void testNestedTypeArg() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/NestedTypeArg.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/NestedTypeArg.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NoTailFromSmart.kt")
     public void testNoTailFromSmart() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/NoTailFromSmart.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/NoTailFromSmart.kt");
         doTest(fileName);
     }
 
     @TestMetadata("PreferMatchingKeyword.kt")
     public void testPreferMatchingKeyword() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/PreferMatchingKeyword.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/PreferMatchingKeyword.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReplaceFunctionCallByProperty.kt")
     public void testReplaceFunctionCallByProperty() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ReplaceFunctionCallByProperty.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ReplaceFunctionCallByProperty.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReplaceFunctionCallByPropertyArgs.kt")
     public void testReplaceFunctionCallByPropertyArgs() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ReplaceFunctionCallByPropertyArgs.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ReplaceFunctionCallByPropertyArgs.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SecondTypeArg.kt")
     public void testSecondTypeArg() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SecondTypeArg.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SecondTypeArg.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SpaceAfterParenthesisBug.kt")
     public void testSpaceAfterParenthesisBug() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SpaceAfterParenthesisBug.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SpaceAfterParenthesisBug.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SuperTypeArg.kt")
     public void testSuperTypeArg() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SuperTypeArg.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SuperTypeArg.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SyntheticExtension.kt")
     public void testSyntheticExtension() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SyntheticExtension.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SyntheticExtension.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TypeParameter.kt")
     public void testTypeParameter() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/TypeParameter.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/TypeParameter.kt");
         doTest(fileName);
     }
 
@@ -166,36 +166,36 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CallableReference extends AbstractBasicCompletionHandlerTest {
         public void testAllFilesPresentInCallableReference() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/callableReference"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/callableReference"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("ClassConstructor.kt")
         public void testClassConstructor() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/ClassConstructor.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/ClassConstructor.kt");
             doTest(fileName);
         }
 
         @TestMetadata("EmptyQualifier.kt")
         public void testEmptyQualifier() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/EmptyQualifier.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/EmptyQualifier.kt");
             doTest(fileName);
         }
 
         @TestMetadata("NonEmptyQualifier.kt")
         public void testNonEmptyQualifier() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/NonEmptyQualifier.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/NonEmptyQualifier.kt");
             doTest(fileName);
         }
 
         @TestMetadata("NotImportedTopLevel.kt")
         public void testNotImportedTopLevel() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/NotImportedTopLevel.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/NotImportedTopLevel.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Property.kt")
         public void testProperty() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/Property.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/Property.kt");
             doTest(fileName);
         }
     }
@@ -206,36 +206,36 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion
     public static class ExclChar extends AbstractBasicCompletionHandlerTest {
         @TestMetadata("1.kt")
         public void test1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/1.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/1.kt");
             doTest(fileName);
         }
 
         @TestMetadata("2.kt")
         public void test2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/2.kt");
             doTest(fileName);
         }
 
         @TestMetadata("3.kt")
         public void test3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/3.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/3.kt");
             doTest(fileName);
         }
 
         @TestMetadata("4.kt")
         public void test4() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/4.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/4.kt");
             doTest(fileName);
         }
 
         @TestMetadata("5.kt")
         public void test5() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/5.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/5.kt");
             doTest(fileName);
         }
 
         public void testAllFilesPresentInExclChar() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/exclChar"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/exclChar"), Pattern.compile("^(.+)\\.kt$"), true);
         }
     }
 
@@ -244,114 +244,114 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion
     @RunWith(JUnit3RunnerWithInners.class)
     public static class HighOrderFunctions extends AbstractBasicCompletionHandlerTest {
         public void testAllFilesPresentInHighOrderFunctions() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/highOrderFunctions"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/highOrderFunctions"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("ContextVariable.kt")
         public void testContextVariable() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ContextVariable.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ContextVariable.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ContextVariableDot.kt")
         public void testContextVariableDot() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ContextVariableDot.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ContextVariableDot.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ContextVariableTypeArgsNeeded.kt")
         public void testContextVariableTypeArgsNeeded() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ContextVariableTypeArgsNeeded.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ContextVariableTypeArgsNeeded.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ForceParenthesisForTabChar.kt")
         public void testForceParenthesisForTabChar() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ForceParenthesisForTabChar.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ForceParenthesisForTabChar.kt");
             doTest(fileName);
         }
 
         @TestMetadata("FunctionLiteralInsertOnSpace.kt")
         public void testFunctionLiteralInsertOnSpace() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/FunctionLiteralInsertOnSpace.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/FunctionLiteralInsertOnSpace.kt");
             doTest(fileName);
         }
 
         @TestMetadata("FunctionLiteralInsertWhenNoSpacesForBraces.kt")
         public void testFunctionLiteralInsertWhenNoSpacesForBraces() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/FunctionLiteralInsertWhenNoSpacesForBraces.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/FunctionLiteralInsertWhenNoSpacesForBraces.kt");
             doTest(fileName);
         }
 
         @TestMetadata("HigherOrderFunction.kt")
         public void testHigherOrderFunction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunction.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunction.kt");
             doTest(fileName);
         }
 
         @TestMetadata("HigherOrderFunctionWithArg.kt")
         public void testHigherOrderFunctionWithArg() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArg.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArg.kt");
             doTest(fileName);
         }
 
         @TestMetadata("HigherOrderFunctionWithArgs1.kt")
         public void testHigherOrderFunctionWithArgs1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs1.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs1.kt");
             doTest(fileName);
         }
 
         @TestMetadata("HigherOrderFunctionWithArgs2.kt")
         public void testHigherOrderFunctionWithArgs2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs2.kt");
             doTest(fileName);
         }
 
         @TestMetadata("HigherOrderFunctionWithArgs3.kt")
         public void testHigherOrderFunctionWithArgs3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs3.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs3.kt");
             doTest(fileName);
         }
 
         @TestMetadata("InsertFunctionWithSingleParameterWithBrace.kt")
         public void testInsertFunctionWithSingleParameterWithBrace() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/InsertFunctionWithSingleParameterWithBrace.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/InsertFunctionWithSingleParameterWithBrace.kt");
             doTest(fileName);
         }
 
         @TestMetadata("OptionalParameters1.kt")
         public void testOptionalParameters1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/OptionalParameters1.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/OptionalParameters1.kt");
             doTest(fileName);
         }
 
         @TestMetadata("OptionalParameters2.kt")
         public void testOptionalParameters2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/OptionalParameters2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/OptionalParameters2.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ParameterTypeIsDerivedFromFunction.kt")
         public void testParameterTypeIsDerivedFromFunction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ParameterTypeIsDerivedFromFunction.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ParameterTypeIsDerivedFromFunction.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ReplaceByLambdaTemplateNoClosingParenth.kt")
         public void testReplaceByLambdaTemplateNoClosingParenth() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ReplaceByLambdaTemplateNoClosingParenth.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ReplaceByLambdaTemplateNoClosingParenth.kt");
             doTest(fileName);
         }
 
         @TestMetadata("WithArgsEmptyLambdaAfter.kt")
         public void testWithArgsEmptyLambdaAfter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsEmptyLambdaAfter.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsEmptyLambdaAfter.kt");
             doTest(fileName);
         }
 
         @TestMetadata("WithArgsNonEmptyLambdaAfter.kt")
         public void testWithArgsNonEmptyLambdaAfter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt");
             doTest(fileName);
         }
     }
@@ -361,90 +361,90 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Override extends AbstractBasicCompletionHandlerTest {
         public void testAllFilesPresentInOverride() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/override"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/override"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("ImplementFunction.kt")
         public void testImplementFunction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ImplementFunction.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ImplementFunction.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ImplementVal.kt")
         public void testImplementVal() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ImplementVal.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ImplementVal.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ImplementVar.kt")
         public void testImplementVar() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ImplementVar.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ImplementVar.kt");
             doTest(fileName);
         }
 
         @TestMetadata("KeepAnnotationBefore.kt")
         public void testKeepAnnotationBefore() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/KeepAnnotationBefore.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/KeepAnnotationBefore.kt");
             doTest(fileName);
         }
 
         @TestMetadata("KeepModifiersBefore.kt")
         public void testKeepModifiersBefore() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/KeepModifiersBefore.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/KeepModifiersBefore.kt");
             doTest(fileName);
         }
 
         @TestMetadata("OverrideFunction.kt")
         public void testOverrideFunction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/OverrideFunction.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/OverrideFunction.kt");
             doTest(fileName);
         }
 
         @TestMetadata("OverrideVar.kt")
         public void testOverrideVar() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/OverrideVar.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/OverrideVar.kt");
             doTest(fileName);
         }
 
         @TestMetadata("PublicValInConstructorParameter.kt")
         public void testPublicValInConstructorParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/PublicValInConstructorParameter.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/PublicValInConstructorParameter.kt");
             doTest(fileName);
         }
 
         @TestMetadata("TypeFunctionName.kt")
         public void testTypeFunctionName() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/TypeFunctionName.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/TypeFunctionName.kt");
             doTest(fileName);
         }
 
         @TestMetadata("TypeNameInConstructorParameter.kt")
         public void testTypeNameInConstructorParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/TypeNameInConstructorParameter.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/TypeNameInConstructorParameter.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ValInConstructorParameter.kt")
         public void testValInConstructorParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ValInConstructorParameter2.kt")
         public void testValInConstructorParameter2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter2.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ValInConstructorParameter3.kt")
         public void testValInConstructorParameter3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter3.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter3.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ValInConstructorParameter4.kt")
         public void testValInConstructorParameter4() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter4.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter4.kt");
             doTest(fileName);
         }
     }
@@ -454,66 +454,66 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ParameterNameAndType extends AbstractBasicCompletionHandlerTest {
         public void testAllFilesPresentInParameterNameAndType() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/parameterNameAndType"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/parameterNameAndType"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("CodeStyleSettings.kt")
         public void testCodeStyleSettings() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Comma.kt")
         public void testComma() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt");
             doTest(fileName);
         }
 
         @TestMetadata("InsertImport.kt")
         public void testInsertImport() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt");
             doTest(fileName);
         }
 
         @TestMetadata("NoInsertionOnTypingColon.kt")
         public void testNoInsertionOnTypingColon() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/NoInsertionOnTypingColon.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/NoInsertionOnTypingColon.kt");
             doTest(fileName);
         }
 
         @TestMetadata("NoInsertionOnTypingSpace.kt")
         public void testNoInsertionOnTypingSpace() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/NoInsertionOnTypingSpace.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/NoInsertionOnTypingSpace.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ParameterInFile.kt")
         public void testParameterInFile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ParameterInFile2.kt")
         public void testParameterInFile2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile2.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt");
             doTest(fileName);
         }
 
         @TestMetadata("TypeParameter.kt")
         public void testTypeParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt");
             doTest(fileName);
         }
 
         @TestMetadata("UserPrefix.kt")
         public void testUserPrefix() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt");
             doTest(fileName);
         }
     }
@@ -524,41 +524,41 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion
     public static class StringTemplate extends AbstractBasicCompletionHandlerTest {
         @TestMetadata("1.kt")
         public void test1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/1.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/1.kt");
             doTest(fileName);
         }
 
         @TestMetadata("2.kt")
         public void test2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/2.kt");
             doTest(fileName);
         }
 
         @TestMetadata("3.kt")
         public void test3() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/3.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/3.kt");
             doTest(fileName);
         }
 
         @TestMetadata("4.kt")
         public void test4() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/4.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/4.kt");
             doTest(fileName);
         }
 
         public void testAllFilesPresentInStringTemplate() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("NotEmptyPrefix.kt")
         public void testNotEmptyPrefix() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/NotEmptyPrefix.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/NotEmptyPrefix.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Replace.kt")
         public void testReplace() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/Replace.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/Replace.kt");
             doTest(fileName);
         }
     }
@@ -568,72 +568,72 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TypeArgsForCall extends AbstractBasicCompletionHandlerTest {
         public void testAllFilesPresentInTypeArgsForCall() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/typeArgsForCall"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/typeArgsForCall"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("ExpectedTypeDoesNotHelp.kt")
         public void testExpectedTypeDoesNotHelp() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ExpectedTypeDoesNotHelp.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ExpectedTypeDoesNotHelp.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ExpectedTypeDoesNotHelp2.kt")
         public void testExpectedTypeDoesNotHelp2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ExpectedTypeDoesNotHelp2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ExpectedTypeDoesNotHelp2.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ExplicitLambdaSignature.kt")
         public void testExplicitLambdaSignature() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ExplicitLambdaSignature.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ExplicitLambdaSignature.kt");
             doTest(fileName);
         }
 
         @TestMetadata("FunctionTypeParameter1.kt")
         public void testFunctionTypeParameter1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/FunctionTypeParameter1.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/FunctionTypeParameter1.kt");
             doTest(fileName);
         }
 
         @TestMetadata("FunctionTypeParameter2.kt")
         public void testFunctionTypeParameter2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/FunctionTypeParameter2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/FunctionTypeParameter2.kt");
             doTest(fileName);
         }
 
         @TestMetadata("HasExpectedType.kt")
         public void testHasExpectedType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/HasExpectedType.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/HasExpectedType.kt");
             doTest(fileName);
         }
 
         @TestMetadata("NotAllTypeArgumentsFromParameters.kt")
         public void testNotAllTypeArgumentsFromParameters() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/NotAllTypeArgumentsFromParameters.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/NotAllTypeArgumentsFromParameters.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ReplaceByTab1.kt")
         public void testReplaceByTab1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ReplaceByTab1.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ReplaceByTab1.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ReplaceByTab2.kt")
         public void testReplaceByTab2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ReplaceByTab2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ReplaceByTab2.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/Simple.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/Simple.kt");
             doTest(fileName);
         }
 
         @TestMetadata("TypeArgumentsFromParameters.kt")
         public void testTypeArgumentsFromParameters() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/TypeArgumentsFromParameters.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/TypeArgumentsFromParameters.kt");
             doTest(fileName);
         }
     }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionCharFilterTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test.handlers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,174 +32,174 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class CompletionCharFilterTestGenerated extends AbstractCompletionCharFilterTest {
     public void testAllFilesPresentInCharFilter() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/charFilter"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/charFilter"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("Colon.kt")
     public void testColon() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Colon.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Colon.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma1.kt")
     public void testComma1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma2.kt")
     public void testComma2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma3.kt")
     public void testComma3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma4.kt")
     public void testComma4() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma4.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma4.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma5.kt")
     public void testComma5() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma5.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma5.kt");
         doTest(fileName);
     }
 
     @TestMetadata("CommaForFunction1.kt")
     public void testCommaForFunction1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/CommaForFunction1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/CommaForFunction1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("CommaForFunction2.kt")
     public void testCommaForFunction2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/CommaForFunction2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/CommaForFunction2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConstructorWithLambdaArg1.kt")
     public void testConstructorWithLambdaArg1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/ConstructorWithLambdaArg1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/ConstructorWithLambdaArg1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConstructorWithLambdaArg2.kt")
     public void testConstructorWithLambdaArg2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/ConstructorWithLambdaArg2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/ConstructorWithLambdaArg2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Dot.kt")
     public void testDot() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Dot.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Dot.kt");
         doTest(fileName);
     }
 
     @TestMetadata("DotAfterFun1.kt")
     public void testDotAfterFun1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/DotAfterFun1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/DotAfterFun1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("DotAfterFun2.kt")
     public void testDotAfterFun2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/DotAfterFun2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/DotAfterFun2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Eq1.kt")
     public void testEq1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Eq1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Eq1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Eq2.kt")
     public void testEq2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Eq2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Eq2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FunctionLiteralParameter1.kt")
     public void testFunctionLiteralParameter1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FunctionLiteralParameter2.kt")
     public void testFunctionLiteralParameter2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FunctionLiteralParameter3.kt")
     public void testFunctionLiteralParameter3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FunctionWithLambdaArg1.kt")
     public void testFunctionWithLambdaArg1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionWithLambdaArg1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionWithLambdaArg1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FunctionWithLambdaArg2.kt")
     public void testFunctionWithLambdaArg2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionWithLambdaArg2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionWithLambdaArg2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InfixCallAndSpace.kt")
     public void testInfixCallAndSpace() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/InfixCallAndSpace.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/InfixCallAndSpace.kt");
         doTest(fileName);
     }
 
     @TestMetadata("KeywordAndSpace.kt")
     public void testKeywordAndSpace() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/KeywordAndSpace.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/KeywordAndSpace.kt");
         doTest(fileName);
     }
 
     @TestMetadata("LParenth.kt")
     public void testLParenth() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/LParenth.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/LParenth.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NamedParameter1.kt")
     public void testNamedParameter1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/NamedParameter1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/NamedParameter1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NamedParameter2.kt")
     public void testNamedParameter2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/NamedParameter2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/NamedParameter2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("QualifiedThis.kt")
     public void testQualifiedThis() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/QualifiedThis.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/QualifiedThis.kt");
         doTest(fileName);
     }
 
     @TestMetadata("RangeTyping.kt")
     public void testRangeTyping() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/RangeTyping.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/RangeTyping.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Space.kt")
     public void testSpace() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Space.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Space.kt");
         doTest(fileName);
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt

@@ -26,11 +26,11 @@ import com.intellij.openapi.application.Result
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
 import org.jetbrains.kotlin.idea.completion.test.ExpectedCompletionUtils
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import kotlin.test.fail
 
-public abstract class CompletionHandlerTestBase() : JetLightCodeInsightFixtureTestCase() {
+public abstract class CompletionHandlerTestBase() : KotlinLightCodeInsightFixtureTestCase() {
     protected val fixture: JavaCodeInsightTestFixture
         get() = myFixture
 
@@ -109,7 +109,7 @@ public abstract class CompletionHandlerTestBase() : JetLightCodeInsightFixtureTe
         return foundElement
     }
 
-    override fun getTestDataPath() = JetTestUtils.getHomeDirectory()
+    override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory()
 
     protected fun selectItem(item: LookupElement?, completionChar: Char) {
         val lookup = (fixture.getLookup() as LookupImpl)

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/KeywordCompletionHandlerTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test.handlers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -33,137 +33,137 @@ import java.util.regex.Pattern;
 public class KeywordCompletionHandlerTestGenerated extends AbstractKeywordCompletionHandlerTest {
     @TestMetadata("AddCompanionToObject.kt")
     public void testAddCompanionToObject() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/AddCompanionToObject.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/AddCompanionToObject.kt");
         doTest(fileName);
     }
 
     public void testAllFilesPresentInKeywords() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/keywords"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/keywords"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("Break.kt")
     public void testBreak() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Break.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Break.kt");
         doTest(fileName);
     }
 
     @TestMetadata("CompanionObject.kt")
     public void testCompanionObject() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/CompanionObject.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/CompanionObject.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FileKeyword.kt")
     public void testFileKeyword() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/FileKeyword.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/FileKeyword.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Getter1.kt")
     public void testGetter1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Getter1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Getter1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Getter2.kt")
     public void testGetter2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Getter2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Getter2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NoSpaceAfterNull.kt")
     public void testNoSpaceAfterNull() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/NoSpaceAfterNull.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/NoSpaceAfterNull.kt");
         doTest(fileName);
     }
 
     @TestMetadata("QualifiedReturnNonUnit.kt")
     public void testQualifiedReturnNonUnit() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnit.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnit.kt");
         doTest(fileName);
     }
 
     @TestMetadata("QualifiedReturnNonUnitExplicit.kt")
     public void testQualifiedReturnNonUnitExplicit() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnitExplicit.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnitExplicit.kt");
         doTest(fileName);
     }
 
     @TestMetadata("QualifiedReturnUnit.kt")
     public void testQualifiedReturnUnit() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnUnit.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnUnit.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnEmptyList.kt")
     public void testReturnEmptyList() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnEmptyList.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnEmptyList.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnInEmptyType.kt")
     public void testReturnInEmptyType() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInEmptyType.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInEmptyType.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnInProperty.kt")
     public void testReturnInProperty() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInProperty.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInProperty.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnInTypeFunction.kt")
     public void testReturnInTypeFunction() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInTypeFunction.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInTypeFunction.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnInUnit.kt")
     public void testReturnInUnit() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInUnit.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInUnit.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnNull.kt")
     public void testReturnNull() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnNull.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnNull.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Setter1.kt")
     public void testSetter1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Setter1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Setter1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Setter2.kt")
     public void testSetter2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Setter2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Setter2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SpaceAfterImport.kt")
     public void testSpaceAfterImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/SpaceAfterImport.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/SpaceAfterImport.kt");
         doTest(fileName);
     }
 
     @TestMetadata("UseSiteAnnotationTarget1.kt")
     public void testUseSiteAnnotationTarget1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("UseSiteAnnotationTarget2.kt")
     public void testUseSiteAnnotationTarget2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("UseSiteAnnotationTarget3.kt")
     public void testUseSiteAnnotationTarget3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget3.kt");
         doTest(fileName);
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/SmartCompletionHandlerTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test.handlers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -33,839 +33,839 @@ import java.util.regex.Pattern;
 public class SmartCompletionHandlerTestGenerated extends AbstractSmartCompletionHandlerTest {
     @TestMetadata("AfterAs.kt")
     public void testAfterAs() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterAs.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterAs.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AfterAs2.kt")
     public void testAfterAs2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterAs2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterAs2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AfterAs3.kt")
     public void testAfterAs3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterAs3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterAs3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AfterSafeAs.kt")
     public void testAfterSafeAs() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterSafeAs.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterSafeAs.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AfterVararg.kt")
     public void testAfterVararg() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterVararg.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterVararg.kt");
         doTest(fileName);
     }
 
     public void testAllFilesPresentInSmart() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/smart"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/smart"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("AnonymousObject1.kt")
     public void testAnonymousObject1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObject1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObject1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AnonymousObject2.kt")
     public void testAnonymousObject2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObject2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObject2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AnonymousObject3.kt")
     public void testAnonymousObject3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObject3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObject3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AnonymousObjectInsertsImport.kt")
     public void testAnonymousObjectInsertsImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AnonymousObjectUninferredTypeArgs.kt")
     public void testAnonymousObjectUninferredTypeArgs() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AutoCompleteAfterAs1.kt")
     public void testAutoCompleteAfterAs1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AutoCompleteAfterAs1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AutoCompleteAfterAs1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AutoCompleteAfterAs2.kt")
     public void testAutoCompleteAfterAs2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AutoCompleteAfterAs2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AutoCompleteAfterAs2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AutoCompleteAfterAs3.kt")
     public void testAutoCompleteAfterAs3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AutoCompleteAfterAs3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AutoCompleteAfterAs3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("CallableReference1.kt")
     public void testCallableReference1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("CallableReference2.kt")
     public void testCallableReference2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("CallableReference3.kt")
     public void testCallableReference3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("CallableReference4.kt")
     public void testCallableReference4() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference4.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference4.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ClassInClassObject.kt")
     public void testClassInClassObject() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassInClassObject.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassInClassObject.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ClassInObject.kt")
     public void testClassInObject() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassInObject.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassInObject.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ClassObjectFieldKeywordName.kt")
     public void testClassObjectFieldKeywordName() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectFieldKeywordName.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectFieldKeywordName.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ClassObjectMethod1.kt")
     public void testClassObjectMethod1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ClassObjectMethod2.kt")
     public void testClassObjectMethod2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ClassObjectMethod3.kt")
     public void testClassObjectMethod3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ClassObjectMethod4.kt")
     public void testClassObjectMethod4() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod4.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod4.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ClosingParenthesis1.kt")
     public void testClosingParenthesis1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClosingParenthesis1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClosingParenthesis1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ClosingParenthesis2.kt")
     public void testClosingParenthesis2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClosingParenthesis2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClosingParenthesis2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma1.kt")
     public void testComma1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma10.kt")
     public void testComma10() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma10.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma10.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma11.kt")
     public void testComma11() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma11.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma11.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma2.kt")
     public void testComma2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma3.kt")
     public void testComma3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma4.kt")
     public void testComma4() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma4.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma4.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma5.kt")
     public void testComma5() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma5.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma5.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma6.kt")
     public void testComma6() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma6.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma6.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma7.kt")
     public void testComma7() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma7.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma7.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma8.kt")
     public void testComma8() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma8.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma8.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Comma9.kt")
     public void testComma9() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma9.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma9.kt");
         doTest(fileName);
     }
 
     @TestMetadata("CommaInSuperConstructorCall.kt")
     public void testCommaInSuperConstructorCall() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CommaInSuperConstructorCall.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CommaInSuperConstructorCall.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConcreteJavaClass.kt")
     public void testConcreteJavaClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConcreteJavaClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConcreteJavaClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConcreteJavaClass2.kt")
     public void testConcreteJavaClass2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConcreteJavaClass2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConcreteJavaClass2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConcreteKClass.kt")
     public void testConcreteKClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConcreteKClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConcreteKClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Constructor.kt")
     public void testConstructor() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Constructor.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Constructor.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConstructorForGenericType.kt")
     public void testConstructorForGenericType() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForGenericType.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForGenericType.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConstructorForGenericType2.kt")
     public void testConstructorForGenericType2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForGenericType2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForGenericType2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConstructorForJavaClass.kt")
     public void testConstructorForJavaClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForJavaClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForJavaClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConstructorForNullable.kt")
     public void testConstructorForNullable() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForNullable.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForNullable.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConstructorInsertsImport.kt")
     public void testConstructorInsertsImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConstructorInsertsImport2.kt")
     public void testConstructorInsertsImport2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConstructorWithKeywordName.kt")
     public void testConstructorWithKeywordName() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithKeywordName.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithKeywordName.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConstructorWithLambdaParameter1.kt")
     public void testConstructorWithLambdaParameter1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithLambdaParameter1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithLambdaParameter1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConstructorWithLambdaParameter2.kt")
     public void testConstructorWithLambdaParameter2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithLambdaParameter2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithLambdaParameter2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ConstructorWithParameters.kt")
     public void testConstructorWithParameters() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithParameters.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithParameters.kt");
         doTest(fileName);
     }
 
     @TestMetadata("DefaultParams.kt")
     public void testDefaultParams() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DefaultParams.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DefaultParams.kt");
         doTest(fileName);
     }
 
     @TestMetadata("DoNotEraseBraceOnTab.kt")
     public void testDoNotEraseBraceOnTab() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DoNotEraseBraceOnTab.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DoNotEraseBraceOnTab.kt");
         doTest(fileName);
     }
 
     @TestMetadata("DoNotInsertTypeArguments.kt")
     public void testDoNotInsertTypeArguments() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DoNotInsertTypeArguments.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DoNotInsertTypeArguments.kt");
         doTest(fileName);
     }
 
     @TestMetadata("DoNotReplaceOnEnter.kt")
     public void testDoNotReplaceOnEnter() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DoNotReplaceOnEnter.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DoNotReplaceOnEnter.kt");
         doTest(fileName);
     }
 
     @TestMetadata("EnumMember.kt")
     public void testEnumMember() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/EnumMember.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/EnumMember.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ExclChar.kt")
     public void testExclChar() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ExclChar.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ExclChar.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ForLoopRange.kt")
     public void testForLoopRange() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ForLoopRange.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ForLoopRange.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ForLoopRange2.kt")
     public void testForLoopRange2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ForLoopRange2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ForLoopRange2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FunctionLiteralParamAlreadyExist.kt")
     public void testFunctionLiteralParamAlreadyExist() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/FunctionLiteralParamAlreadyExist.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/FunctionLiteralParamAlreadyExist.kt");
         doTest(fileName);
     }
 
     @TestMetadata("GenericFunction.kt")
     public void testGenericFunction() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/GenericFunction.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/GenericFunction.kt");
         doTest(fileName);
     }
 
     @TestMetadata("GetWithBrackets.kt")
     public void testGetWithBrackets() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/GetWithBrackets.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/GetWithBrackets.kt");
         doTest(fileName);
     }
 
     @TestMetadata("IfCondition.kt")
     public void testIfCondition() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfCondition.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfCondition.kt");
         doTest(fileName);
     }
 
     @TestMetadata("IfValue1.kt")
     public void testIfValue1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValue1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValue1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("IfValue2.kt")
     public void testIfValue2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValue2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValue2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("IfValue3.kt")
     public void testIfValue3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValue3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValue3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("IfValueInBlock.kt")
     public void testIfValueInBlock() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValueInBlock.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValueInBlock.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InElvisOperator.kt")
     public void testInElvisOperator() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InElvisOperator.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InElvisOperator.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InnerClassInstantiation1.kt")
     public void testInnerClassInstantiation1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InnerClassInstantiation1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InnerClassInstantiation1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InnerClassInstantiation2.kt")
     public void testInnerClassInstantiation2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InnerClassInstantiation2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InnerClassInstantiation2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InsertTypeArguments.kt")
     public void testInsertTypeArguments() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InsertTypeArguments.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InsertTypeArguments.kt");
         doTest(fileName);
     }
 
     @TestMetadata("JavaEnumMemberInsertsImport.kt")
     public void testJavaEnumMemberInsertsImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaEnumMemberInsertsImport.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaEnumMemberInsertsImport.kt");
         doTest(fileName);
     }
 
     @TestMetadata("JavaStaticField.kt")
     public void testJavaStaticField() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticField.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticField.kt");
         doTest(fileName);
     }
 
     @TestMetadata("JavaStaticFieldInsertImport.kt")
     public void testJavaStaticFieldInsertImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticFieldInsertImport.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticFieldInsertImport.kt");
         doTest(fileName);
     }
 
     @TestMetadata("JavaStaticMethod.kt")
     public void testJavaStaticMethod() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticMethod.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticMethod.kt");
         doTest(fileName);
     }
 
     @TestMetadata("JavaStaticMethodInsertsImport.kt")
     public void testJavaStaticMethodInsertsImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticMethodInsertsImport.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticMethodInsertsImport.kt");
         doTest(fileName);
     }
 
     @TestMetadata("kt6179filterTo.kt")
     public void testKt6179filterTo() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/kt6179filterTo.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/kt6179filterTo.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Lambda1.kt")
     public void testLambda1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Lambda2.kt")
     public void testLambda2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Lambda3.kt")
     public void testLambda3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Lambda4.kt")
     public void testLambda4() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda4.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda4.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Lambda5.kt")
     public void testLambda5() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda5.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda5.kt");
         doTest(fileName);
     }
 
     @TestMetadata("LambdaInsertImport.kt")
     public void testLambdaInsertImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LambdaInsertImport.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LambdaInsertImport.kt");
         doTest(fileName);
     }
 
     @TestMetadata("LambdaValue1.kt")
     public void testLambdaValue1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LambdaValue1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LambdaValue1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("LambdaValue2.kt")
     public void testLambdaValue2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LambdaValue2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LambdaValue2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("LastNonOptionalParamIsFunction.kt")
     public void testLastNonOptionalParamIsFunction() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt");
         doTest(fileName);
     }
 
     @TestMetadata("LastParamIsFunction.kt")
     public void testLastParamIsFunction() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LastParamIsFunction.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LastParamIsFunction.kt");
         doTest(fileName);
     }
 
     @TestMetadata("MergeTail1.kt")
     public void testMergeTail1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("MergeTail2.kt")
     public void testMergeTail2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("MergeTail3.kt")
     public void testMergeTail3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("MergeTail4.kt")
     public void testMergeTail4() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail4.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail4.kt");
         doTest(fileName);
     }
 
     @TestMetadata("MultipleArgsIntoBrackets.kt")
     public void testMultipleArgsIntoBrackets() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MultipleArgsIntoBrackets.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MultipleArgsIntoBrackets.kt");
         doTest(fileName);
     }
 
     @TestMetadata("MultipleArgsItem.kt")
     public void testMultipleArgsItem() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MultipleArgsItem.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MultipleArgsItem.kt");
         doTest(fileName);
     }
 
     @TestMetadata("MultipleArgsItemByTab.kt")
     public void testMultipleArgsItemByTab() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MultipleArgsItemByTab.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MultipleArgsItemByTab.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NamedArgument1.kt")
     public void testNamedArgument1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgument1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgument1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NamedArgument2.kt")
     public void testNamedArgument2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgument2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgument2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NamedArgument3.kt")
     public void testNamedArgument3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgument3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgument3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NamedArgumentVararg1.kt")
     public void testNamedArgumentVararg1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgumentVararg1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgumentVararg1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NamedArgumentVararg2.kt")
     public void testNamedArgumentVararg2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgumentVararg2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgumentVararg2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NamedArgumentVararg3.kt")
     public void testNamedArgumentVararg3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgumentVararg3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgumentVararg3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NestedDataClass.kt")
     public void testNestedDataClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NestedDataClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NestedDataClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NestedDataClassComma.kt")
     public void testNestedDataClassComma() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NestedDataClassComma.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NestedDataClassComma.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NullableValue1.kt")
     public void testNullableValue1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValue1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValue1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NullableValue2.kt")
     public void testNullableValue2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValue2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValue2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NullableValue3.kt")
     public void testNullableValue3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValue3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValue3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NullableValueKeepOldArguments.kt")
     public void testNullableValueKeepOldArguments() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValueKeepOldArguments.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValueKeepOldArguments.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ObjectFromType.kt")
     public void testObjectFromType() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ObjectFromType.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ObjectFromType.kt");
         doTest(fileName);
     }
 
     @TestMetadata("QualifiedCallReplacementBug.kt")
     public void testQualifiedCallReplacementBug() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/QualifiedCallReplacementBug.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/QualifiedCallReplacementBug.kt");
         doTest(fileName);
     }
 
     @TestMetadata("QualifiedThisKeywordName1.kt")
     public void testQualifiedThisKeywordName1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/QualifiedThisKeywordName1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/QualifiedThisKeywordName1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("QualifiedThisKeywordName2.kt")
     public void testQualifiedThisKeywordName2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/QualifiedThisKeywordName2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/QualifiedThisKeywordName2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReplaceArgument.kt")
     public void testReplaceArgument() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ReplaceArgument.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ReplaceArgument.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SAMExpected1.kt")
     public void testSAMExpected1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SAMExpected1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SAMExpected1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SAMExpected2.kt")
     public void testSAMExpected2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SAMExpected2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SAMExpected2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SecondVararg.kt")
     public void testSecondVararg() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SecondVararg.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SecondVararg.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SetWithBrackets.kt")
     public void testSetWithBrackets() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SetWithBrackets.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SetWithBrackets.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TabReplaceComma1.kt")
     public void testTabReplaceComma1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceComma1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceComma1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TabReplaceComma2.kt")
     public void testTabReplaceComma2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceComma2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceComma2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TabReplaceExpression.kt")
     public void testTabReplaceExpression() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TabReplaceExpression2.kt")
     public void testTabReplaceExpression2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TabReplaceExpression3.kt")
     public void testTabReplaceExpression3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TabReplaceExpression4.kt")
     public void testTabReplaceExpression4() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression4.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression4.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TabReplaceFunctionName1.kt")
     public void testTabReplaceFunctionName1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceFunctionName1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceFunctionName1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TabReplaceFunctionName2.kt")
     public void testTabReplaceFunctionName2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceFunctionName2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceFunctionName2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TabReplaceFunctionName3.kt")
     public void testTabReplaceFunctionName3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceFunctionName3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceFunctionName3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TabReplaceIdentifier.kt")
     public void testTabReplaceIdentifier() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceIdentifier.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceIdentifier.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TabReplaceOperand.kt")
     public void testTabReplaceOperand() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceOperand.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceOperand.kt");
         doTest(fileName);
     }
 
     @TestMetadata("True.kt")
     public void testTrue() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/True.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/True.kt");
         doTest(fileName);
     }
 
     @TestMetadata("True2.kt")
     public void testTrue2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/True2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/True2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TypeParameterAfterAs.kt")
     public void testTypeParameterAfterAs() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TypeParameterAfterAs.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TypeParameterAfterAs.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Vararg1.kt")
     public void testVararg1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Vararg2.kt")
     public void testVararg2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Vararg3.kt")
     public void testVararg3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Vararg4.kt")
     public void testVararg4() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg4.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg4.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Vararg5.kt")
     public void testVararg5() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg5.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg5.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Vararg6.kt")
     public void testVararg6() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg6.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg6.kt");
         doTest(fileName);
     }
 
     @TestMetadata("VarargAfterStar.kt")
     public void testVarargAfterStar() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/VarargAfterStar.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/VarargAfterStar.kt");
         doTest(fileName);
     }
 
     @TestMetadata("VarargWithParameterAfter.kt")
     public void testVarargWithParameterAfter() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/VarargWithParameterAfter.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/VarargWithParameterAfter.kt");
         doTest(fileName);
     }
 
     @TestMetadata("WhenElse.kt")
     public void testWhenElse() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/WhenElse.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/WhenElse.kt");
         doTest(fileName);
     }
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/AbstractCompletionWeigherTest.kt

@@ -19,16 +19,16 @@ package org.jetbrains.kotlin.idea.completion.test.weighers
 import com.intellij.codeInsight.completion.CompletionType
 import org.jetbrains.kotlin.idea.completion.test.COMPLETION_TEST_DATA_BASE_PATH
 import org.jetbrains.kotlin.idea.completion.test.RELATIVE_COMPLETION_TEST_DATA_BASE_PATH
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor
-import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
-import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.util.configureWithExtraFile
 import org.junit.Assert
 import java.io.File
 
-public abstract class AbstractCompletionWeigherTest(val completionType: CompletionType, val relativeTestDataPath: String) : JetLightCodeInsightFixtureTestCase() {
+public abstract class AbstractCompletionWeigherTest(val completionType: CompletionType, val relativeTestDataPath: String) : KotlinLightCodeInsightFixtureTestCase() {
     fun doTest(path: String) {
         val pathPrefix = RELATIVE_COMPLETION_TEST_DATA_BASE_PATH + "/" + relativeTestDataPath
         assert(path.startsWith(pathPrefix))
@@ -49,9 +49,9 @@ public abstract class AbstractCompletionWeigherTest(val completionType: Completi
 }
 
 public abstract class AbstractBasicCompletionWeigherTest() : AbstractCompletionWeigherTest(CompletionType.BASIC, "weighers/basic") {
-    override fun getProjectDescriptor() = JetLightProjectDescriptor.INSTANCE
+    override fun getProjectDescriptor() = KotlinLightProjectDescriptor.INSTANCE
 }
 
 public abstract class AbstractSmartCompletionWeigherTest() : AbstractCompletionWeigherTest(CompletionType.SMART, "weighers/smart") {
-    override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
+    override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test.weighers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -33,113 +33,113 @@ import java.util.regex.Pattern;
 public class BasicCompletionWeigherTestGenerated extends AbstractBasicCompletionWeigherTest {
     @TestMetadata("AfterNullable.kt")
     public void testAfterNullable() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/AfterNullable.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/AfterNullable.kt");
         doTest(fileName);
     }
 
     public void testAllFilesPresentInBasic() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/basic"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/basic"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
     }
 
     @TestMetadata("Callables.kt")
     public void testCallables() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/Callables.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/Callables.kt");
         doTest(fileName);
     }
 
     @TestMetadata("DeprecatedFun.kt")
     public void testDeprecatedFun() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/DeprecatedFun.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/DeprecatedFun.kt");
         doTest(fileName);
     }
 
     @TestMetadata("DeprecatedJavaClass.kt")
     public void testDeprecatedJavaClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/DeprecatedJavaClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/DeprecatedJavaClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ExactMatchForKeyword.kt")
     public void testExactMatchForKeyword() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ExactMatchForKeyword.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ExactMatchForKeyword.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ImportedFirst.kt")
     public void testImportedFirst() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedFirst.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedFirst.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ImportedFirstForJavaClass.kt")
     public void testImportedFirstForJavaClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedFirstForJavaClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedFirstForJavaClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ImportedOrder.kt")
     public void testImportedOrder() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedOrder.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedOrder.kt");
         doTest(fileName);
     }
 
     @TestMetadata("KeywordsLast.kt")
     public void testKeywordsLast() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/KeywordsLast.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/KeywordsLast.kt");
         doTest(fileName);
     }
 
     @TestMetadata("LocalFileBeforeImported.kt")
     public void testLocalFileBeforeImported() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalFileBeforeImported.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalFileBeforeImported.kt");
         doTest(fileName);
     }
 
     @TestMetadata("LocalValuesAndParams.kt")
     public void testLocalValuesAndParams() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalValuesAndParams.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalValuesAndParams.kt");
         doTest(fileName);
     }
 
     @TestMetadata("LocalsBeforeKeywords.kt")
     public void testLocalsBeforeKeywords() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalsBeforeKeywords.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalsBeforeKeywords.kt");
         doTest(fileName);
     }
 
     @TestMetadata("LocalsPropertiesKeywords.kt")
     public void testLocalsPropertiesKeywords() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalsPropertiesKeywords.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalsPropertiesKeywords.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NamedParameters.kt")
     public void testNamedParameters() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/NamedParameters.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/NamedParameters.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Packages.kt")
     public void testPackages() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/Packages.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/Packages.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ParametersBeforeKeywords.kt")
     public void testParametersBeforeKeywords() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ParametersBeforeKeywords.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ParametersBeforeKeywords.kt");
         doTest(fileName);
     }
 
     @TestMetadata("PreferFromJdk.kt")
     public void testPreferFromJdk() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/PreferFromJdk.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/PreferFromJdk.kt");
         doTest(fileName);
     }
 
     @TestMetadata("PropertiesBeforeKeywords.kt")
     public void testPropertiesBeforeKeywords() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/PropertiesBeforeKeywords.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/PropertiesBeforeKeywords.kt");
         doTest(fileName);
     }
 
@@ -149,95 +149,95 @@ public class BasicCompletionWeigherTestGenerated extends AbstractBasicCompletion
     public static class ExpectedInfo extends AbstractBasicCompletionWeigherTest {
         @TestMetadata("AfterAs.kt")
         public void testAfterAs() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/AfterAs.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/AfterAs.kt");
             doTest(fileName);
         }
 
         public void testAllFilesPresentInExpectedInfo() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/basic/expectedInfo"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/basic/expectedInfo"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
         }
 
         @TestMetadata("CompanionObjectMethod.kt")
         public void testCompanionObjectMethod() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/CompanionObjectMethod.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/CompanionObjectMethod.kt");
             doTest(fileName);
         }
 
         @TestMetadata("EnumEntries.kt")
         public void testEnumEntries() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/EnumEntries.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/EnumEntries.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ExpectedType.kt")
         public void testExpectedType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/ExpectedType.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/ExpectedType.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ExpectedType2.kt")
         public void testExpectedType2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/ExpectedType2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/ExpectedType2.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LambdaValue.kt")
         public void testLambdaValue() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/LambdaValue.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/LambdaValue.kt");
             doTest(fileName);
         }
 
         @TestMetadata("MultiArgsItem.kt")
         public void testMultiArgsItem() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/MultiArgsItem.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/MultiArgsItem.kt");
             doTest(fileName);
         }
 
         @TestMetadata("NameSimilarity.kt")
         public void testNameSimilarity() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarity.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarity.kt");
             doTest(fileName);
         }
 
         @TestMetadata("NameSimilarityAndNoExpectedType.kt")
         public void testNameSimilarityAndNoExpectedType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarityAndNoExpectedType.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarityAndNoExpectedType.kt");
             doTest(fileName);
         }
 
         @TestMetadata("NameSimilarityAndNoExpectedType2.kt")
         public void testNameSimilarityAndNoExpectedType2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarityAndNoExpectedType2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarityAndNoExpectedType2.kt");
             doTest(fileName);
         }
 
         @TestMetadata("NoStupidComparison.kt")
         public void testNoStupidComparison() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NoStupidComparison.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NoStupidComparison.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Null.kt")
         public void testNull() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/Null.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/Null.kt");
             doTest(fileName);
         }
 
         @TestMetadata("PreferMatchingThis.kt")
         public void testPreferMatchingThis() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/PreferMatchingThis.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/PreferMatchingThis.kt");
             doTest(fileName);
         }
 
         @TestMetadata("TrueFalse.kt")
         public void testTrueFalse() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/TrueFalse.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/TrueFalse.kt");
             doTest(fileName);
         }
 
         @TestMetadata("WhenByEnum.kt")
         public void testWhenByEnum() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/WhenByEnum.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/WhenByEnum.kt");
             doTest(fileName);
         }
     }
@@ -247,48 +247,48 @@ public class BasicCompletionWeigherTestGenerated extends AbstractBasicCompletion
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ParameterNameAndType extends AbstractBasicCompletionWeigherTest {
         public void testAllFilesPresentInParameterNameAndType() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/basic/parameterNameAndType"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/basic/parameterNameAndType"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
         }
 
         @TestMetadata("Deprecated.kt")
         public void testDeprecated() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt");
             doTest(fileName);
         }
 
         @TestMetadata("FromCurrentFilePriority.kt")
         public void testFromCurrentFilePriority() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ImportedFirst.kt")
         public void testImportedFirst() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt");
             doTest(fileName);
         }
 
         @TestMetadata("MoreWordsMatchFirst.kt")
         public void testMoreWordsMatchFirst() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ShorterFirst.kt")
         public void testShorterFirst() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt");
             doTest(fileName);
         }
 
         @TestMetadata("StartMatchFirst.kt")
         public void testStartMatchFirst() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt");
             doTest(fileName);
         }
 
         @TestMetadata("UserPrefix.kt")
         public void testUserPrefix() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt");
             doTest(fileName);
         }
     }

idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/SmartCompletionWeigherTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test.weighers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,204 +32,204 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class SmartCompletionWeigherTestGenerated extends AbstractSmartCompletionWeigherTest {
     public void testAllFilesPresentInSmart() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/smart"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/smart"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
     }
 
     @TestMetadata("BooleanExpected.kt")
     public void testBooleanExpected() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/BooleanExpected.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/BooleanExpected.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FunctionExpected.kt")
     public void testFunctionExpected() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/FunctionExpected.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/FunctionExpected.kt");
         doTest(fileName);
     }
 
     @TestMetadata("It.kt")
     public void testIt() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/It.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/It.kt");
         doTest(fileName);
     }
 
     @TestMetadata("MultipleArgsItem.kt")
     public void testMultipleArgsItem() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/MultipleArgsItem.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/MultipleArgsItem.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarity1.kt")
     public void testNameSimilarity1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarity2.kt")
     public void testNameSimilarity2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarity3.kt")
     public void testNameSimilarity3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityAndCompiledParameters.kt")
     public void testNameSimilarityAndCompiledParameters() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityAndCompiledParameters.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityAndCompiledParameters.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForAssignment.kt")
     public void testNameSimilarityForAssignment() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForAssignment.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForAssignment.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForBlock.kt")
     public void testNameSimilarityForBlock() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForBlock.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForBlock.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForElse.kt")
     public void testNameSimilarityForElse() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForElse.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForElse.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForElvis.kt")
     public void testNameSimilarityForElvis() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForElvis.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForElvis.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForEq1.kt")
     public void testNameSimilarityForEq1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForEq2.kt")
     public void testNameSimilarityForEq2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForEq3.kt")
     public void testNameSimilarityForEq3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq3.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForEq4.kt")
     public void testNameSimilarityForEq4() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq4.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq4.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForExpressionBody.kt")
     public void testNameSimilarityForExpressionBody() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForExpressionBody.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForExpressionBody.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForGetterExpressionBody.kt")
     public void testNameSimilarityForGetterExpressionBody() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForGetterExpressionBody.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForGetterExpressionBody.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForGetterReturn.kt")
     public void testNameSimilarityForGetterReturn() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForGetterReturn.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForGetterReturn.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForInitializer.kt")
     public void testNameSimilarityForInitializer() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForInitializer.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForInitializer.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForReturn.kt")
     public void testNameSimilarityForReturn() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForReturn.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForReturn.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForThen.kt")
     public void testNameSimilarityForThen() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForThen.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForThen.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityForVararg.kt")
     public void testNameSimilarityForVararg() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForVararg.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForVararg.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilarityInImplicitlyTypedVarInitializer.kt")
     public void testNameSimilarityInImplicitlyTypedVarInitializer() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityInImplicitlyTypedVarInitializer.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityInImplicitlyTypedVarInitializer.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NameSimilaritySorterPlacement.kt")
     public void testNameSimilaritySorterPlacement() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilaritySorterPlacement.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilaritySorterPlacement.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NoExpectedType.kt")
     public void testNoExpectedType() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NoExpectedType.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NoExpectedType.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NoNameSimilarityForQualifier.kt")
     public void testNoNameSimilarityForQualifier() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NoNameSimilarityForQualifier.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NoNameSimilarityForQualifier.kt");
         doTest(fileName);
     }
 
     @TestMetadata("NullableExpected.kt")
     public void testNullableExpected() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NullableExpected.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NullableExpected.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnValue1.kt")
     public void testReturnValue1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/ReturnValue1.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/ReturnValue1.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnValue2.kt")
     public void testReturnValue2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/ReturnValue2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/ReturnValue2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SmartPriority.kt")
     public void testSmartPriority() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SmartPriority2.kt")
     public void testSmartPriority2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("SmartPriority3.kt")
     public void testSmartPriority3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority3.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority3.kt");
         doTest(fileName);
     }
 }

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java

@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.test;
 
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.roots.ContentEntry;
 import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.libraries.Library;
@@ -27,7 +26,7 @@ import org.jetbrains.kotlin.test.MockLibraryUtil;
 
 import java.io.File;
 
-public class JdkAndMockLibraryProjectDescriptor extends JetLightProjectDescriptor {
+public class JdkAndMockLibraryProjectDescriptor extends KotlinLightProjectDescriptor {
     public static final String LIBRARY_NAME = "myKotlinLib";
 
     private final String sourcesPath;

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java

@@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea.test;
 
 import com.intellij.codeInsight.CodeInsightTestCase;
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 
 public abstract class KotlinCodeInsightTestCase extends CodeInsightTestCase {
     @Override
     protected void setUp() throws Exception {
-        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory());
         super.setUp();
     }
 
     @Override
     protected void tearDown() throws Exception {
         super.tearDown();
-        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
+        VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory());
     }
 }

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt

@@ -88,13 +88,13 @@ public abstract class KotlinLightCodeInsightFixtureTestCase : LightCodeInsightFi
         val testName = StringUtil.toLowerCase(getTestName(false))
 
         if (testName.endsWith("runtime")) {
-            return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
+            return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
         }
         else if (testName.endsWith("stdlib")) {
             return ProjectDescriptorWithStdlibSources.INSTANCE
         }
 
-        return JetLightProjectDescriptor.INSTANCE
+        return KotlinLightProjectDescriptor.INSTANCE
     }
 
     protected fun getProjectDescriptorFromFileDirective(): LightProjectDescriptor {
@@ -110,7 +110,7 @@ public abstract class KotlinLightCodeInsightFixtureTestCase : LightCodeInsightFi
                     return ProjectDescriptorWithStdlibSources.INSTANCE
                 }
                 else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "RUNTIME")) {
-                    return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
+                    return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
                 }
                 else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "JS")) {
                     return KotlinStdJSProjectDescriptor.instance
@@ -121,7 +121,7 @@ public abstract class KotlinLightCodeInsightFixtureTestCase : LightCodeInsightFi
             }
         }
 
-        return JetLightProjectDescriptor.INSTANCE
+        return KotlinLightProjectDescriptor.INSTANCE
     }
 
     protected fun isAllFilesPresentInTest(): Boolean

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightFixtureTestCase.kt

@@ -21,7 +21,7 @@ import com.intellij.openapi.startup.StartupManager
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
 import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode
-import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.test.KotlinTestUtils
 
 public abstract class KotlinLightPlatformCodeInsightFixtureTestCase: LightPlatformCodeInsightFixtureTestCase() {
     private var kotlinInternalModeOriginalValue: Boolean = false
@@ -29,7 +29,7 @@ public abstract class KotlinLightPlatformCodeInsightFixtureTestCase: LightPlatfo
     override fun setUp() {
         super.setUp()
         (StartupManager.getInstance(getProject()) as StartupManagerImpl).runPostStartupActivities()
-        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory())
+        VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory())
         invalidateLibraryCache(project)
 
         kotlinInternalModeOriginalValue = KotlinInternalMode.enabled
@@ -38,7 +38,7 @@ public abstract class KotlinLightPlatformCodeInsightFixtureTestCase: LightPlatfo
 
     override fun tearDown() {
         KotlinInternalMode.enabled = kotlinInternalModeOriginalValue
-        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory())
+        VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory())
 
         unInvalidateBuiltinsAndStdLib(getProject()) {
             super.tearDown()

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt

@@ -21,7 +21,7 @@ import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.refactoring.MultiFileTestCase
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
-import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.test.KotlinTestUtils
 
 public abstract class KotlinMultiFileTestCase : MultiFileTestCase() {
     protected fun extractCaretOffset(doc: Document): Int {
@@ -45,11 +45,11 @@ public abstract class KotlinMultiFileTestCase : MultiFileTestCase() {
 
     override fun setUp() {
         super.setUp()
-        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory())
+        VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory())
     }
 
     override fun tearDown() {
-        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory())
+        VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory())
         super.tearDown()
     }
 }

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.test
 
 import com.intellij.testFramework.LightProjectDescriptor
 
-public open class KotlinStdJSProjectDescriptor : JetLightProjectDescriptor() {
+public open class KotlinStdJSProjectDescriptor : KotlinLightProjectDescriptor() {
     companion object {
         public val instance: KotlinStdJSProjectDescriptor
                 = Class.forName("org.jetbrains.kotlin.test.KotlinStdJSProjectDescriptorImpl").newInstance() as KotlinStdJSProjectDescriptor

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java

@@ -20,7 +20,7 @@ import com.intellij.openapi.projectRoots.JavaSdk;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 
 import java.io.File;
 
@@ -32,7 +32,7 @@ public class PluginTestCaseBase {
 
     @NotNull
     public static String getTestDataPathBase() {
-        return JetTestUtils.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE;
+        return KotlinTestUtils.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE;
     }
 
     @NotNull

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java

@@ -17,17 +17,15 @@
 package org.jetbrains.kotlin.idea.test;
 
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.roots.ContentEntry;
 import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.vfs.VfsUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 
-public class ProjectDescriptorWithStdlibSources extends JetWithJdkAndRuntimeLightProjectDescriptor {
+public class ProjectDescriptorWithStdlibSources extends KotlinWithJdkAndRuntimeLightProjectDescriptor {
     public static final ProjectDescriptorWithStdlibSources INSTANCE = new ProjectDescriptorWithStdlibSources();
 
     @Override

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt

@@ -44,7 +44,7 @@ public enum class ModuleKind {
     KOTLIN_JAVASCRIPT
 }
 
-public fun Module.configureAs(descriptor: JetLightProjectDescriptor) {
+public fun Module.configureAs(descriptor: KotlinLightProjectDescriptor) {
     val module = this
     updateModel(module, object : Consumer<ModifiableRootModel> {
         override fun consume(model: ModifiableRootModel) {

idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt

@@ -19,17 +19,17 @@ package org.jetbrains.kotlin
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager
 import com.intellij.psi.codeStyle.PackageEntry
 import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
-import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import java.io.File
 
-public abstract class AbstractImportsTest : JetLightCodeInsightFixtureTestCase() {
-    override fun getTestDataPath() = JetTestUtils.getHomeDirectory()
-    override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
+public abstract class AbstractImportsTest : KotlinLightCodeInsightFixtureTestCase() {
+    override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory()
+    override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 
     protected fun doTest(testPath: String) {
         val settingManager = CodeStyleSettingsManager.getInstance()
@@ -70,7 +70,7 @@ public abstract class AbstractImportsTest : JetLightCodeInsightFixtureTestCase()
                 doTest(file)
             }
 
-            JetTestUtils.assertEqualsToFile(File(testPath + ".after"), myFixture.getFile().getText())
+            KotlinTestUtils.assertEqualsToFile(File(testPath + ".after"), myFixture.getFile().getText())
         }
         finally {
             settingManager.dropTemporarySettings()

idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt

@@ -20,17 +20,17 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.idea.completion.renderDataFlowValue
-import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import com.intellij.openapi.util.io.FileUtil
 import java.io.File
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 
-public abstract class AbstractDataFlowValueRenderingTest: JetLightCodeInsightFixtureTestCase() {
+public abstract class AbstractDataFlowValueRenderingTest: KotlinLightCodeInsightFixtureTestCase() {
     override fun getTestDataPath() : String {
         return PluginTestCaseBase.getTestDataPathBase() + "/dataFlowValueRendering/"
     }
@@ -51,6 +51,6 @@ public abstract class AbstractDataFlowValueRenderingTest: JetLightCodeInsightFix
         val allValues = (info.getCompleteTypeInfo().keySet() + info.getCompleteNullabilityInfo().keySet()).toSet()
         val actual = allValues.map { renderDataFlowValue(it) }.filterNotNull().sorted().joinToString("\n")
 
-        JetTestUtils.assertEqualsToFile(File(FileUtil.getNameWithoutExtension(fileName) + ".txt"), actual)
+        KotlinTestUtils.assertEqualsToFile(File(FileUtil.getNameWithoutExtension(fileName) + ".txt"), actual)
     }
 }

idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,66 +32,66 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class DataFlowValueRenderingTestGenerated extends AbstractDataFlowValueRenderingTest {
     public void testAllFilesPresentInDataFlowValueRendering() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/dataFlowValueRendering"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/dataFlowValueRendering"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("classProperty.kt")
     public void testClassProperty() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/classProperty.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/classProperty.kt");
         doTest(fileName);
     }
 
     @TestMetadata("complexIdentifier.kt")
     public void testComplexIdentifier() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifier.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifier.kt");
         doTest(fileName);
     }
 
     @TestMetadata("complexIdentifierWithImplicitReceiver.kt")
     public void testComplexIdentifierWithImplicitReceiver() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithImplicitReceiver.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithImplicitReceiver.kt");
         doTest(fileName);
     }
 
     @TestMetadata("complexIdentifierWithInitiallyNullableReceiver.kt")
     public void testComplexIdentifierWithInitiallyNullableReceiver() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithInitiallyNullableReceiver.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithInitiallyNullableReceiver.kt");
         doTest(fileName);
     }
 
     @TestMetadata("complexIdentifierWithReceiver.kt")
     public void testComplexIdentifierWithReceiver() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithReceiver.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithReceiver.kt");
         doTest(fileName);
     }
 
     @TestMetadata("multipleVariables.kt")
     public void testMultipleVariables() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/multipleVariables.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/multipleVariables.kt");
         doTest(fileName);
     }
 
     @TestMetadata("packageProperty.kt")
     public void testPackageProperty() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/packageProperty.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/packageProperty.kt");
         doTest(fileName);
     }
 
     @TestMetadata("receivers.kt")
     public void testReceivers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/receivers.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/receivers.kt");
         doTest(fileName);
     }
 
     @TestMetadata("smartCast.kt")
     public void testSmartCast() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/smartCast.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/smartCast.kt");
         doTest(fileName);
     }
 
     @TestMetadata("smartNotNull.kt")
     public void testSmartNotNull() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/smartNotNull.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/smartNotNull.kt");
         doTest(fileName);
     }
 }

idea/tests/org/jetbrains/kotlin/asJava/KotlinLightClassInheritorTest.kt

@@ -19,13 +19,13 @@ package org.jetbrains.kotlin.asJava
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.testFramework.LightProjectDescriptor
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtFile
 import org.junit.Assert
 
-public class KotlinLightClassInheritorTest : JetLightCodeInsightFixtureTestCase() {
+public class KotlinLightClassInheritorTest : KotlinLightCodeInsightFixtureTestCase() {
     public fun testAnnotation() {
         doTestInheritorByText("annotation class A", "java.lang.annotation.Annotation", false)
     }
@@ -54,5 +54,5 @@ public class KotlinLightClassInheritorTest : JetLightCodeInsightFixtureTestCase(
         Assert.assertTrue(psiClass.isInheritor(baseClass, checkDeep))
     }
 
-    override fun getProjectDescriptor(): LightProjectDescriptor = JetLightProjectDescriptor.INSTANCE
+    override fun getProjectDescriptor(): LightProjectDescriptor = KotlinLightProjectDescriptor.INSTANCE
 }

idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.java

@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase;
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil;
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
 
 import java.io.File;
@@ -107,6 +107,6 @@ public abstract class AbstractJavaAgainstKotlinCheckerTest extends KotlinDaemonA
 
     @Override
     protected String getTestDataPath() {
-        return JetTestUtils.getHomeDirectory() + "/";
+        return KotlinTestUtils.getHomeDirectory() + "/";
     }
 }

idea/tests/org/jetbrains/kotlin/checkers/AbstractJsCheckerTest.java

@@ -18,10 +18,10 @@ package org.jetbrains.kotlin.checkers;
 
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase;
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
 import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor;
 
-public abstract class AbstractJsCheckerTest extends JetLightCodeInsightFixtureTestCase {
+public abstract class AbstractJsCheckerTest extends KotlinLightCodeInsightFixtureTestCase {
     @NotNull
     @Override
     protected LightProjectDescriptor getProjectDescriptor() {

idea/tests/org/jetbrains/kotlin/checkers/AbstractPsiCheckerTest.java

@@ -21,11 +21,11 @@ import com.intellij.spellchecker.inspections.SpellCheckingInspection;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.highlighter.NameHighlighter;
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase;
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
 
 import java.io.File;
 
-public abstract class AbstractPsiCheckerTest extends JetLightCodeInsightFixtureTestCase {
+public abstract class AbstractPsiCheckerTest extends KotlinLightCodeInsightFixtureTestCase {
     public void doTest(@NotNull String filePath) throws Exception {
         myFixture.configureByFile(filePath);
         checkHighlighting(true, false, false);

idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.checkers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,84 +32,84 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class JavaAgainstKotlinBinariesCheckerTestGenerated extends AbstractJavaAgainstKotlinBinariesCheckerTest {
     public void testAllFilesPresentInJavaAgainstKotlin() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("AssignKotlinClassToObjectInJava.kt")
     public void testAssignKotlinClassToObjectInJava() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt");
         doTest(fileName);
     }
 
     @TestMetadata("AssignMappedKotlinType.kt")
     public void testAssignMappedKotlinType() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ClassObjects.kt")
     public void testClassObjects() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt");
         doTest(fileName);
     }
 
     @TestMetadata("EnumAutoGeneratedMethods.kt")
     public void testEnumAutoGeneratedMethods() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt");
         doTest(fileName);
     }
 
     @TestMetadata("EnumEntriesInSwitch.kt")
     public void testEnumEntriesInSwitch() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt");
         doTest(fileName);
     }
 
     @TestMetadata("EnumStaticImportInJava.kt")
     public void testEnumStaticImportInJava() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ImplementedMethodsFromTraits.kt")
     public void testImplementedMethodsFromTraits() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt");
         doTest(fileName);
     }
 
     @TestMetadata("JvmOverloadsFunctions.kt")
     public void testJvmOverloadsFunctions() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt");
         doTest(fileName);
     }
 
     @TestMetadata("KotlinAnnotations.kt")
     public void testKotlinAnnotations() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt");
         doTest(fileName);
     }
 
     @TestMetadata("ReturnInnerClasses.kt")
     public void testReturnInnerClasses() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
         doTest(fileName);
     }
 
     @TestMetadata("TopLevelFunctionInDataFlowInspection.kt")
     public void testTopLevelFunctionInDataFlowInspection() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt");
         doTest(fileName);
     }
 
     @TestMetadata("UseKotlinSubclassesOfMappedTypes.kt")
     public void testUseKotlinSubclassesOfMappedTypes() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt");
         doTest(fileName);
     }
 
     @TestMetadata("UsingKotlinPackageDeclarations.kt")
     public void testUsingKotlinPackageDeclarations() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt");
         doTest(fileName);
     }
 }

idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.checkers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -34,84 +34,84 @@ public class JavaAgainstKotlinSourceCheckerTestGenerated extends AbstractJavaAga
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JavaAgainstKotlin extends AbstractJavaAgainstKotlinSourceCheckerTest {
         public void testAllFilesPresentInJavaAgainstKotlin() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("AssignKotlinClassToObjectInJava.kt")
         public void testAssignKotlinClassToObjectInJava() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt");
             doTest(fileName);
         }
 
         @TestMetadata("AssignMappedKotlinType.kt")
         public void testAssignMappedKotlinType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ClassObjects.kt")
         public void testClassObjects() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt");
             doTest(fileName);
         }
 
         @TestMetadata("EnumAutoGeneratedMethods.kt")
         public void testEnumAutoGeneratedMethods() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt");
             doTest(fileName);
         }
 
         @TestMetadata("EnumEntriesInSwitch.kt")
         public void testEnumEntriesInSwitch() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt");
             doTest(fileName);
         }
 
         @TestMetadata("EnumStaticImportInJava.kt")
         public void testEnumStaticImportInJava() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ImplementedMethodsFromTraits.kt")
         public void testImplementedMethodsFromTraits() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt");
             doTest(fileName);
         }
 
         @TestMetadata("JvmOverloadsFunctions.kt")
         public void testJvmOverloadsFunctions() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt");
             doTest(fileName);
         }
 
         @TestMetadata("KotlinAnnotations.kt")
         public void testKotlinAnnotations() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ReturnInnerClasses.kt")
         public void testReturnInnerClasses() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt");
             doTest(fileName);
         }
 
         @TestMetadata("TopLevelFunctionInDataFlowInspection.kt")
         public void testTopLevelFunctionInDataFlowInspection() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt");
             doTest(fileName);
         }
 
         @TestMetadata("UseKotlinSubclassesOfMappedTypes.kt")
         public void testUseKotlinSubclassesOfMappedTypes() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt");
             doTest(fileName);
         }
 
         @TestMetadata("UsingKotlinPackageDeclarations.kt")
         public void testUsingKotlinPackageDeclarations() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt");
             doTest(fileName);
         }
     }
@@ -121,12 +121,12 @@ public class JavaAgainstKotlinSourceCheckerTestGenerated extends AbstractJavaAga
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JavaWithKotlin extends AbstractJavaAgainstKotlinSourceCheckerTest {
         public void testAllFilesPresentInJavaWithKotlin() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("NoNotNullOnParameterInOverride.kt")
         public void testNoNotNullOnParameterInOverride() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaWithKotlin/NoNotNullOnParameterInOverride.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaWithKotlin/NoNotNullOnParameterInOverride.kt");
             doTest(fileName);
         }
     }

idea/tests/org/jetbrains/kotlin/checkers/JsCheckerTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.checkers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -30,26 +30,26 @@ import java.util.regex.Pattern;
 @TestMetadata("idea/testData/checker/js")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
-public class JetJsCheckerTestGenerated extends AbstractJetJsCheckerTest {
+public class JsCheckerTestGenerated extends AbstractJsCheckerTest {
     public void testAllFilesPresentInJs() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/js"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/js"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("basic.kt")
     public void testBasic() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/js/basic.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/js/basic.kt");
         doTest(fileName);
     }
 
     @TestMetadata("dynamic.kt")
     public void testDynamic() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/js/dynamic.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/js/dynamic.kt");
         doTest(fileName);
     }
 
     @TestMetadata("helloWorld.kt")
     public void testHelloWorld() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/js/helloWorld.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/js/helloWorld.kt");
         doTest(fileName);
     }
 }

idea/tests/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.checkers;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -28,342 +28,342 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @RunWith(JUnit3RunnerWithInners.class)
-public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
+public class PsiCheckerTestGenerated extends AbstractPsiCheckerTest {
     @TestMetadata("idea/testData/checker")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class Checker extends AbstractJetPsiCheckerTest {
+    public static class Checker extends AbstractPsiCheckerTest {
         @TestMetadata("Abstract.kt")
         public void testAbstract() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Abstract.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Abstract.kt");
             doTest(fileName);
         }
 
         public void testAllFilesPresentInChecker() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker"), Pattern.compile("^(.+)\\.kt$"), false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker"), Pattern.compile("^(.+)\\.kt$"), false);
         }
 
         @TestMetadata("AnnotationOnFile.kt")
         public void testAnnotationOnFile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/AnnotationOnFile.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/AnnotationOnFile.kt");
             doTest(fileName);
         }
 
         @TestMetadata("AnonymousInitializers.kt")
         public void testAnonymousInitializers() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/AnonymousInitializers.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/AnonymousInitializers.kt");
             doTest(fileName);
         }
 
         @TestMetadata("BinaryCallsOnNullableValues.kt")
         public void testBinaryCallsOnNullableValues() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/BinaryCallsOnNullableValues.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/BinaryCallsOnNullableValues.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Bounds.kt")
         public void testBounds() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Bounds.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Bounds.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Bounds2.kt")
         public void testBounds2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Bounds2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Bounds2.kt");
             doTest(fileName);
         }
 
         @TestMetadata("BoundsWithSubstitutors.kt")
         public void testBoundsWithSubstitutors() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/BoundsWithSubstitutors.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/BoundsWithSubstitutors.kt");
             doTest(fileName);
         }
 
         @TestMetadata("BreakContinue.kt")
         public void testBreakContinue() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/BreakContinue.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/BreakContinue.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Builders.kt")
         public void testBuilders() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Builders.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Builders.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Casts.kt")
         public void testCasts() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Casts.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Casts.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ClassObjectInEnum.kt")
         public void testClassObjectInEnum() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ClassObjectInEnum.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ClassObjectInEnum.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ClassObjects.kt")
         public void testClassObjects() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ClassObjects.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ClassObjects.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Constants.kt")
         public void testConstants() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Constants.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Constants.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Constructors.kt")
         public void testConstructors() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Constructors.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Constructors.kt");
             doTest(fileName);
         }
 
         @TestMetadata("CyclicHierarchy.kt")
         public void testCyclicHierarchy() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/CyclicHierarchy.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/CyclicHierarchy.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ExtensionFunctions.kt")
         public void testExtensionFunctions() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ExtensionFunctions.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ExtensionFunctions.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ForRangeConventions.kt")
         public void testForRangeConventions() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ForRangeConventions.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ForRangeConventions.kt");
             doTest(fileName);
         }
 
         @TestMetadata("FunctionReturnTypes.kt")
         public void testFunctionReturnTypes() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/FunctionReturnTypes.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/FunctionReturnTypes.kt");
             doTest(fileName);
         }
 
         @TestMetadata("GenericArgumentConsistency.kt")
         public void testGenericArgumentConsistency() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/GenericArgumentConsistency.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/GenericArgumentConsistency.kt");
             doTest(fileName);
         }
 
         @TestMetadata("IncDec.kt")
         public void testIncDec() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/IncDec.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/IncDec.kt");
             doTest(fileName);
         }
 
         @TestMetadata("IsExpressions.kt")
         public void testIsExpressions() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/IsExpressions.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/IsExpressions.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LocalObjects.kt")
         public void testLocalObjects() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/LocalObjects.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/LocalObjects.kt");
             doTest(fileName);
         }
 
         @TestMetadata("MultipleBounds.kt")
         public void testMultipleBounds() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/MultipleBounds.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/MultipleBounds.kt");
             doTest(fileName);
         }
 
         @TestMetadata("NestedObjects.kt")
         public void testNestedObjects() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/NestedObjects.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/NestedObjects.kt");
             doTest(fileName);
         }
 
         @TestMetadata("NotFinishedGenericDeclaration.kt")
         public void testNotFinishedGenericDeclaration() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/NotFinishedGenericDeclaration.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/NotFinishedGenericDeclaration.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Nullability.kt")
         public void testNullability() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Nullability.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Nullability.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Objects.kt")
         public void testObjects() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Objects.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Objects.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Override.kt")
         public void testOverride() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Override.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Override.kt");
             doTest(fileName);
         }
 
         @TestMetadata("OverridesAndGenerics.kt")
         public void testOverridesAndGenerics() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/OverridesAndGenerics.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/OverridesAndGenerics.kt");
             doTest(fileName);
         }
 
         @TestMetadata("PackageAsExpression.kt")
         public void testPackageAsExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/PackageAsExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/PackageAsExpression.kt");
             doTest(fileName);
         }
 
         @TestMetadata("PackageQualified.kt")
         public void testPackageQualified() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/PackageQualified.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/PackageQualified.kt");
             doTest(fileName);
         }
 
         @TestMetadata("PlatformStaticUsagesRuntime.kt")
         public void testPlatformStaticUsagesRuntime() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/PlatformStaticUsagesRuntime.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/PlatformStaticUsagesRuntime.kt");
             doTest(fileName);
         }
 
         @TestMetadata("PrimaryConstructors.kt")
         public void testPrimaryConstructors() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/PrimaryConstructors.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/PrimaryConstructors.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ProjectionsInSupertypes.kt")
         public void testProjectionsInSupertypes() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ProjectionsInSupertypes.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ProjectionsInSupertypes.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Properties.kt")
         public void testProperties() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Properties.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Properties.kt");
             doTest(fileName);
         }
 
         @TestMetadata("QualifiedExpressions.kt")
         public void testQualifiedExpressions() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/QualifiedExpressions.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/QualifiedExpressions.kt");
             doTest(fileName);
         }
 
         @TestMetadata("QualifiedThis.kt")
         public void testQualifiedThis() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/QualifiedThis.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/QualifiedThis.kt");
             doTest(fileName);
         }
 
         @TestMetadata("QualifiedThisInClosures.kt")
         public void testQualifiedThisInClosures() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/QualifiedThisInClosures.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/QualifiedThisInClosures.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Redeclaration.kt")
         public void testRedeclaration() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Redeclaration.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Redeclaration.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Redeclarations.kt")
         public void testRedeclarations() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Redeclarations.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Redeclarations.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ResolveToJava.kt")
         public void testResolveToJava() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ResolveToJava.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ResolveToJava.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ResolveTypeInAnnotationArgumentRuntime.kt")
         public void testResolveTypeInAnnotationArgumentRuntime() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ResolveTypeInAnnotationArgumentRuntime.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ResolveTypeInAnnotationArgumentRuntime.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ReturnTypeMismatchOnOverride.kt")
         public void testReturnTypeMismatchOnOverride() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ReturnTypeMismatchOnOverride.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ReturnTypeMismatchOnOverride.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Shadowing.kt")
         public void testShadowing() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Shadowing.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Shadowing.kt");
             doTest(fileName);
         }
 
         @TestMetadata("StringTemplates.kt")
         public void testStringTemplates() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/StringTemplates.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/StringTemplates.kt");
             doTest(fileName);
         }
 
         @TestMetadata("SupertypeListChecks.kt")
         public void testSupertypeListChecks() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/SupertypeListChecks.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/SupertypeListChecks.kt");
             doTest(fileName);
         }
 
         @TestMetadata("TraitSupertypeList.kt")
         public void testTraitSupertypeList() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/TraitSupertypeList.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/TraitSupertypeList.kt");
             doTest(fileName);
         }
 
         @TestMetadata("trivialHierarchyLoop.kt")
         public void testTrivialHierarchyLoop() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/trivialHierarchyLoop.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/trivialHierarchyLoop.kt");
             doTest(fileName);
         }
 
         @TestMetadata("TypeParameterBounds.kt")
         public void testTypeParameterBounds() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/TypeParameterBounds.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/TypeParameterBounds.kt");
             doTest(fileName);
         }
 
         @TestMetadata("UnreachableCode.kt")
         public void testUnreachableCode() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/UnreachableCode.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/UnreachableCode.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Unresolved.kt")
         public void testUnresolved() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Unresolved.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Unresolved.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Unused.kt")
         public void testUnused() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Unused.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Unused.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Variance.kt")
         public void testVariance() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Variance.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Variance.kt");
             doTest(fileName);
         }
 
         @TestMetadata("When.kt")
         public void testWhen() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/When.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/When.kt");
             doTest(fileName);
         }
 
         @TestMetadata("WhenInEnumInExtensionProperty.kt")
         public void testWhenInEnumInExtensionProperty() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/WhenInEnumInExtensionProperty.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/WhenInEnumInExtensionProperty.kt");
             doTest(fileName);
         }
     }
@@ -371,152 +371,152 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
     @TestMetadata("idea/testData/checker/regression")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class Regression extends AbstractJetPsiCheckerTest {
+    public static class Regression extends AbstractPsiCheckerTest {
         public void testAllFilesPresentInRegression() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/regression"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/regression"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("AmbiguityOnLazyTypeComputation.kt")
         public void testAmbiguityOnLazyTypeComputation() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/AmbiguityOnLazyTypeComputation.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/AmbiguityOnLazyTypeComputation.kt");
             doTest(fileName);
         }
 
         @TestMetadata("AssignmentsUnderOperators.kt")
         public void testAssignmentsUnderOperators() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/AssignmentsUnderOperators.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/AssignmentsUnderOperators.kt");
             doTest(fileName);
         }
 
         @TestMetadata("BadParseForClass.kt")
         public void testBadParseForClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/BadParseForClass.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/BadParseForClass.kt");
             doTest(fileName);
         }
 
         @TestMetadata("CoercionToUnit.kt")
         public void testCoercionToUnit() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/CoercionToUnit.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/CoercionToUnit.kt");
             doTest(fileName);
         }
 
         @TestMetadata("createInnerInstance.kt")
         public void testCreateInnerInstance() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/createInnerInstance.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/createInnerInstance.kt");
             doTest(fileName);
         }
 
         @TestMetadata("DoubleDefine.kt")
         public void testDoubleDefine() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/DoubleDefine.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/DoubleDefine.kt");
             doTest(fileName);
         }
 
         @TestMetadata("extensionMemberInClassObject.kt")
         public void testExtensionMemberInClassObject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/extensionMemberInClassObject.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/extensionMemberInClassObject.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Jet11.kt")
         public void testJet11() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet11.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet11.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Jet121.kt")
         public void testJet121() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet121.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet121.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Jet124.kt")
         public void testJet124() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet124.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet124.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Jet169.kt")
         public void testJet169() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet169.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet169.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Jet183.kt")
         public void testJet183() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet183.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet183.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Jet183-1.kt")
         public void testJet183_1() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet183-1.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet183-1.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Jet53.kt")
         public void testJet53() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet53.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet53.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Jet67.kt")
         public void testJet67() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet67.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet67.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Jet68.kt")
         public void testJet68() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet68.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet68.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Jet69.kt")
         public void testJet69() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet69.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet69.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Jet72.kt")
         public void testJet72() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet72.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet72.kt");
             doTest(fileName);
         }
 
         @TestMetadata("kt251.kt")
         public void testKt251() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/kt251.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/kt251.kt");
             doTest(fileName);
         }
 
         @TestMetadata("kt303.kt")
         public void testKt303() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/kt303.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/kt303.kt");
             doTest(fileName);
         }
 
         @TestMetadata("OverrideResolution.kt")
         public void testOverrideResolution() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/OverrideResolution.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/OverrideResolution.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ScopeForSecondaryConstructors.kt")
         public void testScopeForSecondaryConstructors() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/ScopeForSecondaryConstructors.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/ScopeForSecondaryConstructors.kt");
             doTest(fileName);
         }
 
         @TestMetadata("SpecififcityByReceiver.kt")
         public void testSpecififcityByReceiver() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/SpecififcityByReceiver.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/SpecififcityByReceiver.kt");
             doTest(fileName);
         }
 
         @TestMetadata("WrongTraceInCallResolver.kt")
         public void testWrongTraceInCallResolver() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/WrongTraceInCallResolver.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/WrongTraceInCallResolver.kt");
             doTest(fileName);
         }
     }
@@ -524,20 +524,20 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
     @TestMetadata("idea/testData/checker/recovery")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class Recovery extends AbstractJetPsiCheckerTest {
+    public static class Recovery extends AbstractPsiCheckerTest {
         public void testAllFilesPresentInRecovery() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/recovery"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/recovery"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("namelessMembers.kt")
         public void testNamelessMembers() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/recovery/namelessMembers.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/recovery/namelessMembers.kt");
             doTest(fileName);
         }
 
         @TestMetadata("namelessToplevelDeclarations.kt")
         public void testNamelessToplevelDeclarations() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/recovery/namelessToplevelDeclarations.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/recovery/namelessToplevelDeclarations.kt");
             doTest(fileName);
         }
     }
@@ -545,14 +545,14 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
     @TestMetadata("idea/testData/checker/rendering")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class Rendering extends AbstractJetPsiCheckerTest {
+    public static class Rendering extends AbstractPsiCheckerTest {
         public void testAllFilesPresentInRendering() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/rendering"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/rendering"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("TypeInferenceError.kt")
         public void testTypeInferenceError() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/rendering/TypeInferenceError.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/rendering/TypeInferenceError.kt");
             doTest(fileName);
         }
     }
@@ -560,22 +560,22 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
     @TestMetadata("idea/testData/checker/duplicateJvmSignature")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class DuplicateJvmSignature extends AbstractJetPsiCheckerTest {
+    public static class DuplicateJvmSignature extends AbstractPsiCheckerTest {
         public void testAllFilesPresentInDuplicateJvmSignature() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("idea/testData/checker/duplicateJvmSignature/fields")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
-        public static class Fields extends AbstractJetPsiCheckerTest {
+        public static class Fields extends AbstractPsiCheckerTest {
             public void testAllFilesPresentInFields() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/fields"), Pattern.compile("^(.+)\\.kt$"), true);
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/fields"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
             @TestMetadata("classObjectCopiedFieldObject.kt")
             public void testClassObjectCopiedFieldObject() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt");
                 doTest(fileName);
             }
         }
@@ -583,62 +583,62 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
         @TestMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
-        public static class FunctionAndProperty extends AbstractJetPsiCheckerTest {
+        public static class FunctionAndProperty extends AbstractPsiCheckerTest {
             public void testAllFilesPresentInFunctionAndProperty() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.kt$"), true);
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
             @TestMetadata("class.kt")
             public void testClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/class.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/class.kt");
                 doTest(fileName);
             }
 
             @TestMetadata("classObject.kt")
             public void testClassObject() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt");
                 doTest(fileName);
             }
 
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/localClass.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/localClass.kt");
                 doTest(fileName);
             }
 
             @TestMetadata("nestedClass.kt")
             public void testNestedClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/nestedClass.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/nestedClass.kt");
                 doTest(fileName);
             }
 
             @TestMetadata("object.kt")
             public void testObject() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/object.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/object.kt");
                 doTest(fileName);
             }
 
             @TestMetadata("objectExpression.kt")
             public void testObjectExpression() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/objectExpression.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/objectExpression.kt");
                 doTest(fileName);
             }
 
             @TestMetadata("topLevel.kt")
             public void testTopLevel() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevel.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevel.kt");
                 doTest(fileName);
             }
 
             @TestMetadata("topLevelMultifileRuntime.kt")
             public void testTopLevelMultifileRuntime() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt");
                 doTest(fileName);
             }
 
             @TestMetadata("trait.kt")
             public void testTrait() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt");
                 doTest(fileName);
             }
         }
@@ -646,14 +646,14 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
         @TestMetadata("idea/testData/checker/duplicateJvmSignature/traitImpl")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
-        public static class TraitImpl extends AbstractJetPsiCheckerTest {
+        public static class TraitImpl extends AbstractPsiCheckerTest {
             public void testAllFilesPresentInTraitImpl() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.kt$"), true);
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
             @TestMetadata("twoTraits.kt")
             public void testTwoTraits() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt");
                 doTest(fileName);
             }
         }
@@ -662,50 +662,50 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
     @TestMetadata("idea/testData/checker/infos")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class Infos extends AbstractJetPsiCheckerTest {
+    public static class Infos extends AbstractPsiCheckerTest {
         public void testAllFilesPresentInInfos() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/infos"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/infos"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("CapturedConstructorParameter.kt")
         public void testCapturedConstructorParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/CapturedConstructorParameter.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/infos/CapturedConstructorParameter.kt");
             doTestWithInfos(fileName);
         }
 
         @TestMetadata("CapturedInInlinedClosure.kt")
         public void testCapturedInInlinedClosure() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/CapturedInInlinedClosure.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/infos/CapturedInInlinedClosure.kt");
             doTestWithInfos(fileName);
         }
 
         @TestMetadata("PropertiesWithBackingFields.kt")
         public void testPropertiesWithBackingFields() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/PropertiesWithBackingFields.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/infos/PropertiesWithBackingFields.kt");
             doTestWithInfos(fileName);
         }
 
         @TestMetadata("SmartCasts.kt")
         public void testSmartCasts() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/SmartCasts.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/infos/SmartCasts.kt");
             doTestWithInfos(fileName);
         }
 
         @TestMetadata("SmartCastsWithSafeAccess.kt")
         public void testSmartCastsWithSafeAccess() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/SmartCastsWithSafeAccess.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/infos/SmartCastsWithSafeAccess.kt");
             doTestWithInfos(fileName);
         }
 
         @TestMetadata("Typos.kt")
         public void testTypos() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/Typos.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/infos/Typos.kt");
             doTestWithInfos(fileName);
         }
 
         @TestMetadata("WrapIntoRef.kt")
         public void testWrapIntoRef() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/WrapIntoRef.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/infos/WrapIntoRef.kt");
             doTestWithInfos(fileName);
         }
     }

idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.java

@@ -55,8 +55,8 @@ import org.jetbrains.kotlin.idea.findUsages.KotlinClassFindUsagesOptions;
 import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesHandlerFactory;
 import org.jetbrains.kotlin.idea.findUsages.KotlinFunctionFindUsagesOptions;
 import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions;
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase;
-import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor;
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor;
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil;
 import org.jetbrains.kotlin.psi.*;
@@ -70,7 +70,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-public abstract class AbstractFindUsagesTest extends JetLightCodeInsightFixtureTestCase {
+public abstract class AbstractFindUsagesTest extends KotlinLightCodeInsightFixtureTestCase {
 
     public static final UsageViewPresentation USAGE_VIEW_PRESENTATION = new UsageViewPresentation();
 
@@ -282,7 +282,7 @@ public abstract class AbstractFindUsagesTest extends JetLightCodeInsightFixtureT
     @NotNull
     @Override
     protected LightProjectDescriptor getProjectDescriptor() {
-        return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
+        return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
     }
 
     @Override

idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt

@@ -21,7 +21,7 @@ import com.intellij.testFramework.LightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 
-public abstract class AbstractKotlinFindUsagesWithLibraryTest : AbstractJetFindUsagesTest() {
+public abstract class AbstractKotlinFindUsagesWithLibraryTest : AbstractFindUsagesTest() {
     override fun getProjectDescriptor() =
             JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/findUsages/libraryUsages/_library", true)
 }

idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.findUsages;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,7 +32,7 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class KotlinFindUsagesWithLibraryTestGenerated extends AbstractKotlinFindUsagesWithLibraryTest {
     public void testAllFilesPresentInLibraryUsages() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
     }
 
     @TestMetadata("idea/testData/findUsages/libraryUsages/javaLibrary")
@@ -40,42 +40,42 @@ public class KotlinFindUsagesWithLibraryTestGenerated extends AbstractKotlinFind
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JavaLibrary extends AbstractKotlinFindUsagesWithLibraryTest {
         public void testAllFilesPresentInJavaLibrary() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/javaLibrary"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/javaLibrary"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
         }
 
         @TestMetadata("LibraryClassUsages.0.kt")
         public void testLibraryClassUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryConstructorUsages.0.kt")
         public void testLibraryConstructorUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryFieldUsages.0.kt")
         public void testLibraryFieldUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryMethodUsages.0.kt")
         public void testLibraryMethodUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryStaticFieldUsages.0.kt")
         public void testLibraryStaticFieldUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryStaticMethodUsages.0.kt")
         public void testLibraryStaticMethodUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt");
             doTest(fileName);
         }
     }
@@ -85,78 +85,78 @@ public class KotlinFindUsagesWithLibraryTestGenerated extends AbstractKotlinFind
     @RunWith(JUnit3RunnerWithInners.class)
     public static class KotlinLibrary extends AbstractKotlinFindUsagesWithLibraryTest {
         public void testAllFilesPresentInKotlinLibrary() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/kotlinLibrary"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/kotlinLibrary"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
         }
 
         @TestMetadata("LibraryClassUsages.0.kt")
         public void testLibraryClassUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryCompanionObjectUsages.0.kt")
         public void testLibraryCompanionObjectUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryEnumEntryUsages.0.kt")
         public void testLibraryEnumEntryUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryEnumEntryUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryEnumEntryUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryFunctionUsages.0.kt")
         public void testLibraryFunctionUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryMemberFunctionUsages.0.kt")
         public void testLibraryMemberFunctionUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryNestedClassMemberFunctionUsages.0.kt")
         public void testLibraryNestedClassMemberFunctionUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryNestedClassPrimaryConstructorUsages.0.kt")
         public void testLibraryNestedClassPrimaryConstructorUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryNestedClassSecondaryConstructorUsages.0.kt")
         public void testLibraryNestedClassSecondaryConstructorUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryNestedClassUsages.0.kt")
         public void testLibraryNestedClassUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryObjectUsages.0.kt")
         public void testLibraryObjectUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibraryPrimaryConstructorUsages.0.kt")
         public void testLibraryPrimaryConstructorUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.0.kt");
             doTest(fileName);
         }
 
         @TestMetadata("LibrarySecondaryConstructorUsages.0.kt")
         public void testLibrarySecondaryConstructorUsages() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.0.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.0.kt");
             doTest(fileName);
         }
     }
@@ -166,7 +166,7 @@ public class KotlinFindUsagesWithLibraryTestGenerated extends AbstractKotlinFind
     @RunWith(JUnit3RunnerWithInners.class)
     public static class _library extends AbstractKotlinFindUsagesWithLibraryTest {
         public void testAllFilesPresentIn_library() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/_library"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/_library"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
         }
 
     }

idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java

@@ -87,15 +87,13 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
 
         @TestMetadata("ConsecutiveCallsInSaeCallsMiddle.after.kt")
         public void testConsecutiveCallsInSaeCallsMiddle() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt");
             doNewlineTest(fileName);
         }
 
         @TestMetadata("ConsecutiveCallsInSafeCallsEnd.after.kt")
         public void testConsecutiveCallsInSafeCallsEnd() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt");
             doNewlineTest(fileName);
         }
 
@@ -149,8 +147,7 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
 
         @TestMetadata("InBinaryExpressionsBeforeCloseParenthesis.after.kt")
         public void testInBinaryExpressionsBeforeCloseParenthesis() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt");
             doNewlineTest(fileName);
         }
 
@@ -180,8 +177,7 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
 
         @TestMetadata("InEnumInitializerListAfterComma.after.kt")
         public void testInEnumInitializerListAfterComma() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt");
             doNewlineTest(fileName);
         }
 
@@ -199,8 +195,7 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
 
         @TestMetadata("InExpressionsParenthesesBeforeOperand.after.kt")
         public void testInExpressionsParenthesesBeforeOperand() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt");
             doNewlineTest(fileName);
         }
 
@@ -224,29 +219,25 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
 
         @TestMetadata("InLambdaInsideChainCallSameLine.after.kt")
         public void testInLambdaInsideChainCallSameLine() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt");
             doNewlineTest(fileName);
         }
 
         @TestMetadata("InLambdaInsideChainCallSameLineWithSpaces.after.kt")
         public void testInLambdaInsideChainCallSameLineWithSpaces() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt");
             doNewlineTest(fileName);
         }
 
         @TestMetadata("InLambdaInsideChainCallWithNewLine.after.kt")
         public void testInLambdaInsideChainCallWithNewLine() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt");
             doNewlineTest(fileName);
         }
 
         @TestMetadata("InLambdaInsideChainCallWithNewLineWithSpaces.after.kt")
         public void testInLambdaInsideChainCallWithNewLineWithSpaces() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt");
             doNewlineTest(fileName);
         }
 
@@ -294,8 +285,7 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
 
         @TestMetadata("SettingAlignMultilineParametersInCalls.after.kt")
         public void testSettingAlignMultilineParametersInCalls() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt");
             doNewlineTest(fileName);
         }
 
@@ -315,8 +305,7 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
 
             @TestMetadata("ScriptAfterExpression.after.kts")
             public void testScriptAfterExpression() throws Exception {
-                String fileName = KotlinTestUtils
-                        .navigationMetadata("idea/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts");
                 doNewlineTest(fileName);
             }
 
@@ -362,36 +351,31 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
 
         @TestMetadata("InBinaryExpressionInMiddle.after.inv.kt")
         public void testInBinaryExpressionInMiddle() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt");
             doNewlineTestWithInvert(fileName);
         }
 
         @TestMetadata("InBinaryExpressionUnfinished.after.inv.kt")
         public void testInBinaryExpressionUnfinished() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt");
             doNewlineTestWithInvert(fileName);
         }
 
         @TestMetadata("InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt")
         public void testInBinaryExpressionsBeforeCloseParenthesis() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt");
             doNewlineTestWithInvert(fileName);
         }
 
         @TestMetadata("InDelegationListAfterColon.after.inv.kt")
         public void testInDelegationListAfterColon() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt");
             doNewlineTestWithInvert(fileName);
         }
 
         @TestMetadata("InDelegationListAfterComma.after.inv.kt")
         public void testInDelegationListAfterComma() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt");
             doNewlineTestWithInvert(fileName);
         }
 
@@ -409,15 +393,13 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
 
         @TestMetadata("InEnumInitializerListAfterComma.after.inv.kt")
         public void testInEnumInitializerListAfterComma() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt");
             doNewlineTestWithInvert(fileName);
         }
 
         @TestMetadata("InEnumInitializerListNotEmpty.after.inv.kt")
         public void testInEnumInitializerListNotEmpty() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt");
             doNewlineTestWithInvert(fileName);
         }
 
@@ -429,8 +411,7 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
 
         @TestMetadata("InExpressionsParenthesesBeforeOperand.after.inv.kt")
         public void testInExpressionsParenthesesBeforeOperand() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt");
             doNewlineTestWithInvert(fileName);
         }
 
@@ -442,8 +423,7 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio
 
         @TestMetadata("SettingAlignMultilineParametersInCalls.after.inv.kt")
         public void testSettingAlignMultilineParametersInCalls() throws Exception {
-            String fileName = KotlinTestUtils
-                    .navigationMetadata("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt");
             doNewlineTestWithInvert(fileName);
         }
 

idea/tests/org/jetbrains/kotlin/idea/AbstractCopyPasteTest.kt

@@ -19,11 +19,11 @@ package org.jetbrains.kotlin.idea
 import com.intellij.codeInsight.CodeInsightSettings
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.psi.PsiFile
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.psi.KtFile
 import java.io.File
 
-public abstract class AbstractCopyPasteTest : JetLightCodeInsightFixtureTestCase() {
+public abstract class AbstractCopyPasteTest : KotlinLightCodeInsightFixtureTestCase() {
     private var savedImportsOnPasteSetting: Int = 0
     private val DEFAULT_TO_FILE_TEXT = "package to\n\n<caret>"
 

idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.java

@@ -22,13 +22,13 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil;
 import org.jetbrains.kotlin.psi.KtExpression;
 import org.jetbrains.kotlin.psi.KtFile;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 
 public abstract class AbstractExpressionSelectionTest extends LightCodeInsightTestCase {
 
     public void doTestExpressionSelection(@NotNull String path) throws Exception {
         configureByFile(path);
-        final String expectedExpression = JetTestUtils.getLastCommentInFile((KtFile) getFile());
+        final String expectedExpression = KotlinTestUtils.getLastCommentInFile((KtFile) getFile());
 
         try {
             JetRefactoringUtil.selectExpression(getEditor(), getFile(), new JetRefactoringUtil.SelectExpressionCallback() {

idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.java

@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil;
 import org.jetbrains.kotlin.psi.KtExpression;
 import org.jetbrains.kotlin.psi.KtFile;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,7 +31,7 @@ public abstract class AbstractSmartSelectionTest extends LightCodeInsightTestCas
 
     public void doTestSmartSelection(@NotNull String path) throws Exception {
         configureByFile(path);
-        String expectedResultText = JetTestUtils.getLastCommentInFile((KtFile) getFile());
+        String expectedResultText = KotlinTestUtils.getLastCommentInFile((KtFile) getFile());
 
         List<KtExpression> expressions = JetRefactoringUtil.getSmartSelectSuggestions(
                 getFile(), getEditor().getCaretModel().getOffset());

idea/tests/org/jetbrains/kotlin/idea/ExpressionSelectionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,30 +32,30 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class ExpressionSelectionTestGenerated extends AbstractExpressionSelectionTest {
     public void testAllFilesPresentInExpressionSelection() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/expressionSelection"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/expressionSelection"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
     }
 
     @TestMetadata("binaryExpr.kt")
     public void testBinaryExpr() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/expressionSelection/binaryExpr.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/expressionSelection/binaryExpr.kt");
         doTestExpressionSelection(fileName);
     }
 
     @TestMetadata("labelledStatement.kt")
     public void testLabelledStatement() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/expressionSelection/labelledStatement.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/expressionSelection/labelledStatement.kt");
         doTestExpressionSelection(fileName);
     }
 
     @TestMetadata("labelledThis.kt")
     public void testLabelledThis() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/expressionSelection/labelledThis.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/expressionSelection/labelledThis.kt");
         doTestExpressionSelection(fileName);
     }
 
     @TestMetadata("noExpression.kt")
     public void testNoExpression() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/expressionSelection/noExpression.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/expressionSelection/noExpression.kt");
         doTestExpressionSelection(fileName);
     }
 }

idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java

@@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea;
 
 import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase;
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 
 abstract public class KotlinDaemonAnalyzerTestCase extends DaemonAnalyzerTestCase {
     @Override
     protected void setUp() throws Exception {
-        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory());
         super.setUp();
     }
 
     @Override
     protected void tearDown() throws Exception {
         super.tearDown();
-        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
+        VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory());
     }
 }

idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java

@@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea;
 
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
 import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestBase;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 
 public abstract class KotlinHierarchyViewTestBase extends HierarchyViewTestBase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory());
     }
 
     @Override
     protected void tearDown() throws Exception {
-        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
+        VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory());
         super.tearDown();
     }
 }

idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java

@@ -20,19 +20,19 @@ import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase;
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
 import org.jetbrains.kotlin.idea.test.RunnableWithException;
 import org.jetbrains.kotlin.idea.test.TestUtilsKt;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 
 abstract public class KotlinLightQuickFixTestCase extends LightQuickFixTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory());
+        VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory());
         TestUtilsKt.invalidateLibraryCache(getProject());
     }
 
     @Override
     protected void tearDown() throws Exception {
-        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
+        VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory());
 
         TestUtilsKt.unInvalidateBuiltinsAndStdLib(getProject(), new RunnableWithException() {
             @Override

idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt

@@ -19,11 +19,11 @@ package org.jetbrains.kotlin.idea
 import com.intellij.psi.NonClasspathClassFinder
 import com.intellij.psi.PsiElementFinder
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade
 import org.junit.Assert
 
-public class RegisteredFindersTest : JetLightCodeInsightFixtureTestCase() {
+public class RegisteredFindersTest : KotlinLightCodeInsightFixtureTestCase() {
     override fun getProjectDescriptor() = LightCodeInsightFixtureTestCase.JAVA_LATEST
 
     public fun testKnownNonClasspathFinder() {

idea/tests/org/jetbrains/kotlin/idea/ResolveElementCacheTest.kt

@@ -18,16 +18,16 @@ package org.jetbrains.kotlin.idea
 
 import com.intellij.psi.PsiDocumentManager
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
-public class ResolveElementCacheTest : JetLightCodeInsightFixtureTestCase() {
-    override fun getProjectDescriptor() = JetLightProjectDescriptor.INSTANCE
+public class ResolveElementCacheTest : KotlinLightCodeInsightFixtureTestCase() {
+    override fun getProjectDescriptor() = KotlinLightProjectDescriptor.INSTANCE
 
     private val FILE_TEXT =
 """

idea/tests/org/jetbrains/kotlin/idea/SmartSelectionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,60 +32,60 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class SmartSelectionTestGenerated extends AbstractSmartSelectionTest {
     public void testAllFilesPresentInSmartSelection() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/smartSelection"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/smartSelection"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
     }
 
     @TestMetadata("labelledStatement.kt")
     public void testLabelledStatement() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/labelledStatement.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/labelledStatement.kt");
         doTestSmartSelection(fileName);
     }
 
     @TestMetadata("labelledThis.kt")
     public void testLabelledThis() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/labelledThis.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/labelledThis.kt");
         doTestSmartSelection(fileName);
     }
 
     @TestMetadata("simple.kt")
     public void testSimple() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/simple.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/simple.kt");
         doTestSmartSelection(fileName);
     }
 
     @TestMetadata("superExpression.kt")
     public void testSuperExpression() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/superExpression.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/superExpression.kt");
         doTestSmartSelection(fileName);
     }
 
     @TestMetadata("superExpressionWithLabel.kt")
     public void testSuperExpressionWithLabel() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithLabel.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithLabel.kt");
         doTestSmartSelection(fileName);
     }
 
     @TestMetadata("superExpressionWithLabelAndType.kt")
     public void testSuperExpressionWithLabelAndType() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithLabelAndType.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithLabelAndType.kt");
         doTestSmartSelection(fileName);
     }
 
     @TestMetadata("superExpressionWithType.kt")
     public void testSuperExpressionWithType() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithType.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithType.kt");
         doTestSmartSelection(fileName);
     }
 
     @TestMetadata("typeInSuperExpression.kt")
     public void testTypeInSuperExpression() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/typeInSuperExpression.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/typeInSuperExpression.kt");
         doTestSmartSelection(fileName);
     }
 
     @TestMetadata("typeInSuperExpressionWithLabel.kt")
     public void testTypeInSuperExpressionWithLabel() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/typeInSuperExpressionWithLabel.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/typeInSuperExpressionWithLabel.kt");
         doTestSmartSelection(fileName);
     }
 }

idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java

@@ -22,15 +22,15 @@ import com.intellij.rt.execution.junit.FileComparisonFailure;
 import com.intellij.testFramework.LightProjectDescriptor;
 import com.intellij.testFramework.fixtures.CodeInsightTestUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase;
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TagsTestDataUtil;
 import org.testng.collections.Lists;
 
 import java.io.File;
 
-public class WordSelectionTest extends JetLightCodeInsightFixtureTestCase {
+public class WordSelectionTest extends KotlinLightCodeInsightFixtureTestCase {
     private static final String TEST_RELATIVE_DIR = "wordSelection";
 
     public void testStatements() { doTest(); }
@@ -128,7 +128,7 @@ public class WordSelectionTest extends JetLightCodeInsightFixtureTestCase {
                 editor.getDocument().getText()
         );
 
-        JetTestUtils.assertEqualsToFile(new File(failedFilePath), actualText);
+        KotlinTestUtils.assertEqualsToFile(new File(failedFilePath), actualText);
     }
 
 }

idea/tests/org/jetbrains/kotlin/idea/actions/AbstractGotoTestOrCodeActionTest.kt

@@ -23,19 +23,19 @@ import com.intellij.testFramework.PlatformTestUtil
 import com.intellij.testIntegration.GotoTestOrCodeHandler
 import org.jetbrains.kotlin.idea.navigation.NavigationTestUtils
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
-import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import java.io.File
 
-abstract class AbstractGotoTestOrCodeActionTest : JetLightCodeInsightFixtureTestCase() {
+abstract class AbstractGotoTestOrCodeActionTest : KotlinLightCodeInsightFixtureTestCase() {
     private object Handler: GotoTestOrCodeHandler() {
         public override fun getSourceAndTargetElements(editor: Editor?, file: PsiFile?) = super.getSourceAndTargetElements(editor, file)
     }
 
-    override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
+    override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 
     protected fun doTest(path: String) {
         val mainFile = File(path)
@@ -48,7 +48,7 @@ abstract class AbstractGotoTestOrCodeActionTest : JetLightCodeInsightFixtureTest
             }
             ConfigLibraryUtil.configureLibrariesByDirective(myModule, PlatformTestUtil.getCommunityPath(), fileText)
 
-            myFixture.testDataPath = "${JetTestUtils.getHomeDirectory()}/${mainFile.getParent()}"
+            myFixture.testDataPath = "${KotlinTestUtils.getHomeDirectory()}/${mainFile.getParent()}"
 
             val mainFileName = mainFile.name
             val mainFileBaseName = mainFileName.substring(0, mainFileName.indexOf('.'))

idea/tests/org/jetbrains/kotlin/idea/actions/GotoTestOrCodeActionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.actions;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,36 +32,36 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class GotoTestOrCodeActionTestGenerated extends AbstractGotoTestOrCodeActionTest {
     public void testAllFilesPresentInGotoTestOrCode() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoTestOrCode"), Pattern.compile("^(.+)\\.main\\..+$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoTestOrCode"), Pattern.compile("^(.+)\\.main\\..+$"), true);
     }
 
     @TestMetadata("fromJavaClassToTest.main.java")
     public void testFromJavaClassToTest() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromJavaClassToTest.main.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromJavaClassToTest.main.java");
         doTest(fileName);
     }
 
     @TestMetadata("fromJavaTestToKotlinClass.main.java")
     public void testFromJavaTestToKotlinClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromJavaTestToKotlinClass.main.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromJavaTestToKotlinClass.main.java");
         doTest(fileName);
     }
 
     @TestMetadata("fromKotlinClassToTest.main.kt")
     public void testFromKotlinClassToTest() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinClassToTest.main.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinClassToTest.main.kt");
         doTest(fileName);
     }
 
     @TestMetadata("fromKotlinTestToJavaClass.main.kt")
     public void testFromKotlinTestToJavaClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinTestToJavaClass.main.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinTestToJavaClass.main.kt");
         doTest(fileName);
     }
 
     @TestMetadata("fromKotlinTestToKotlinClass.main.kt")
     public void testFromKotlinTestToKotlinClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinTestToKotlinClass.main.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinTestToKotlinClass.main.kt");
         doTest(fileName);
     }
 }

idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt

@@ -19,11 +19,11 @@ package org.jetbrains.kotlin.idea.caches.resolve
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.asJava.LightClassTestCommon
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import java.io.File
 
-abstract class AbstractIdeLightClassTest : JetLightCodeInsightFixtureTestCase() {
+abstract class AbstractIdeLightClassTest : KotlinLightCodeInsightFixtureTestCase() {
 
     fun doTest(testDataPath: String) {
         myFixture.configureByFile(testDataPath)
@@ -42,5 +42,5 @@ abstract class AbstractIdeLightClassTest : JetLightCodeInsightFixtureTestCase()
         )
     }
 
-    override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
+    override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 }

idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt

@@ -22,17 +22,17 @@ import com.intellij.openapi.roots.libraries.Library
 import java.io.File
 import com.intellij.openapi.roots.OrderRootType
 import com.intellij.openapi.vfs.VfsUtil
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar
-import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.openapi.roots.ContentEntry
 
-public class HighlightingWithDependentLibrariesTest : JetLightCodeInsightFixtureTestCase() {
+public class HighlightingWithDependentLibrariesTest : KotlinLightCodeInsightFixtureTestCase() {
     private val TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/highlightingWithDependentLibraries"
 
-    override fun getProjectDescriptor() = object : JetLightProjectDescriptor() {
+    override fun getProjectDescriptor() = object : KotlinLightProjectDescriptor() {
         override fun configureModule(module: Module, model: ModifiableRootModel) {
             val compiledJar1 = MockLibraryUtil.compileLibraryToJar("$TEST_DATA_PATH/lib1", "lib1", false)
             val compiledJar2 = MockLibraryUtil.compileLibraryToJar("$TEST_DATA_PATH/lib2", "lib2", false, compiledJar1.canonicalPath)

idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.caches.resolve;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,12 +32,12 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
     public void testAllFilesPresentInLightClasses() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^(.+)\\.kt$"), true, "delegation");
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^(.+)\\.kt$"), true, "delegation");
     }
 
     @TestMetadata("annotationClass.kt")
     public void testAnnotationClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/annotationClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/annotationClass.kt");
         doTest(fileName);
     }
 
@@ -46,24 +46,24 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Facades extends AbstractIdeLightClassTest {
         public void testAllFilesPresentInFacades() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("EmptyFile.kt")
         public void testEmptyFile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/EmptyFile.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/EmptyFile.kt");
             doTest(fileName);
         }
 
         @TestMetadata("SingleFile.kt")
         public void testSingleFile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleFile.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleFile.kt");
             doTest(fileName);
         }
 
         @TestMetadata("SingleJvmClassName.kt")
         public void testSingleJvmClassName() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt");
             doTest(fileName);
         }
     }
@@ -73,126 +73,126 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class NullabilityAnnotations extends AbstractIdeLightClassTest {
         public void testAllFilesPresentInNullabilityAnnotations() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ClassObjectField.kt")
         public void testClassObjectField() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ClassWithConstructor.kt")
         public void testClassWithConstructor() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ClassWithConstructorAndProperties.kt")
         public void testClassWithConstructorAndProperties() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
             doTest(fileName);
         }
 
         @TestMetadata("FileFacade.kt")
         public void testFileFacade() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Generic.kt")
         public void testGeneric() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
             doTest(fileName);
         }
 
         @TestMetadata("IntOverridesAny.kt")
         public void testIntOverridesAny() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
             doTest(fileName);
         }
 
         @TestMetadata("JvmOverloads.kt")
         public void testJvmOverloads() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
             doTest(fileName);
         }
 
         @TestMetadata("NullableUnitReturn.kt")
         public void testNullableUnitReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
             doTest(fileName);
         }
 
         @TestMetadata("OverrideAnyWithUnit.kt")
         public void testOverrideAnyWithUnit() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
             doTest(fileName);
         }
 
         @TestMetadata("PlatformTypes.kt")
         public void testPlatformTypes() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Primitives.kt")
         public void testPrimitives() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
             doTest(fileName);
         }
 
         @TestMetadata("PrivateInClass.kt")
         public void testPrivateInClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
             doTest(fileName);
         }
 
         @TestMetadata("PrivateInTrait.kt")
         public void testPrivateInTrait() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Synthetic.kt")
         public void testSynthetic() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
             doTest(fileName);
         }
 
         @TestMetadata("TraitClassObjectField.kt")
         public void testTraitClassObjectField() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt");
             doTest(fileName);
         }
 
         @TestMetadata("UnitAsGenericArgument.kt")
         public void testUnitAsGenericArgument() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
             doTest(fileName);
         }
 
         @TestMetadata("UnitParameter.kt")
         public void testUnitParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
             doTest(fileName);
         }
 
         @TestMetadata("VoidReturn.kt")
         public void testVoidReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
             doTest(fileName);
         }
     }
@@ -202,12 +202,12 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Object extends AbstractIdeLightClassTest {
         public void testAllFilesPresentInObject() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("SimpleObject.kt")
         public void testSimpleObject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/object/SimpleObject.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/object/SimpleObject.kt");
             doTest(fileName);
         }
     }
@@ -217,18 +217,18 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class PublicField extends AbstractIdeLightClassTest {
         public void testAllFilesPresentInPublicField() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("CompanionObject.kt")
         public void testCompanionObject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/Simple.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/Simple.kt");
             doTest(fileName);
         }
     }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.kt

@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.idea.test.dumpTextWithErrors
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
-import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import java.io.File
 
 public abstract class AbstractInsertImportOnPasteTest : AbstractCopyPasteTest() {
@@ -69,13 +69,13 @@ public abstract class AbstractInsertImportOnPasteTest : AbstractCopyPasteTest()
         performNotWriteEditorAction(IdeActions.ACTION_PASTE)
 
         val namesToImportDump = KotlinCopyPasteReferenceProcessor.declarationsToImportSuggested.joinToString("\n")
-        JetTestUtils.assertEqualsToFile(File(path.replace(".kt", ".expected.names")), namesToImportDump)
+        KotlinTestUtils.assertEqualsToFile(File(path.replace(".kt", ".expected.names")), namesToImportDump)
 
         val resultFile = myFixture.getFile() as KtFile
         val resultText = if (InTextDirectivesUtils.isDirectiveDefined(testFileText, NO_ERRORS_DUMP_DIRECTIVE))
             resultFile.getText()
         else
             resultFile.dumpTextWithErrors()
-        JetTestUtils.assertEqualsToFile(File(path.replace(".kt", ".expected.kt")), resultText)
+        KotlinTestUtils.assertEqualsToFile(File(path.replace(".kt", ".expected.kt")), resultText)
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt

@@ -30,8 +30,8 @@ import com.intellij.testFramework.InspectionTestUtil
 import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
@@ -40,12 +40,12 @@ import java.io.File
 import kotlin.test.assertFalse
 import java.util.*
 
-public abstract class AbstractInspectionTest : JetLightCodeInsightFixtureTestCase() {
+public abstract class AbstractInspectionTest : KotlinLightCodeInsightFixtureTestCase() {
     companion object {
         val ENTRY_POINT_ANNOTATION = "test.anno.EntryPoint"
     }
 
-    override fun getProjectDescriptor(): LightProjectDescriptor = JetLightProjectDescriptor.INSTANCE
+    override fun getProjectDescriptor(): LightProjectDescriptor = KotlinLightProjectDescriptor.INSTANCE
 
     override fun setUp() {
         super.setUp()

idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java

@@ -33,13 +33,13 @@ import com.intellij.testFramework.PlatformTestUtil;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil;
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase;
-import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor;
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor;
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
 import org.jetbrains.kotlin.idea.highlighter.markers.SuperDeclarationMarkerNavigationHandler;
 import org.jetbrains.kotlin.idea.navigation.NavigationTestUtils;
 import org.jetbrains.kotlin.psi.KtFile;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.ReferenceUtils;
 import org.jetbrains.kotlin.test.TagsTestDataUtil;
 import org.junit.Assert;
@@ -49,7 +49,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-public abstract class AbstractLineMarkersTest extends JetLightCodeInsightFixtureTestCase {
+public abstract class AbstractLineMarkersTest extends KotlinLightCodeInsightFixtureTestCase {
 
     private static final String LINE_MARKER_PREFIX = "LINEMARKER:";
     private static final String TARGETS_PREFIX = "TARGETS";
@@ -62,7 +62,7 @@ public abstract class AbstractLineMarkersTest extends JetLightCodeInsightFixture
     @NotNull
     @Override
     protected LightProjectDescriptor getProjectDescriptor() {
-        return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
+        return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
     }
 
     public void doTest(String path) {
@@ -96,7 +96,7 @@ public abstract class AbstractLineMarkersTest extends JetLightCodeInsightFixture
             catch (AssertionError error) {
                 try {
                     String actualTextWithTestData = TagsTestDataUtil.insertInfoTags(markers, true, myFixture.getFile().getText());
-                    JetTestUtils.assertEqualsToFile(new File(path), actualTextWithTestData);
+                    KotlinTestUtils.assertEqualsToFile(new File(path), actualTextWithTestData);
                 }
                 catch (FileComparisonFailure failure) {
                     throw new FileComparisonFailure(error.getMessage() + "\n" + failure.getMessage(),
@@ -114,8 +114,8 @@ public abstract class AbstractLineMarkersTest extends JetLightCodeInsightFixture
     }
 
     private void assertNavigationElements(List<LineMarkerInfo> markers) {
-        List<String> navigationDataComments = JetTestUtils.getLastCommentsInFile(
-                (KtFile) myFixture.getFile(), JetTestUtils.CommentType.BLOCK_COMMENT, false);
+        List<String> navigationDataComments = KotlinTestUtils.getLastCommentsInFile(
+                (KtFile) myFixture.getFile(), KotlinTestUtils.CommentType.BLOCK_COMMENT, false);
         if (navigationDataComments.isEmpty()) return;
 
         for (String navigationComment : navigationDataComments) {

idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java

@@ -22,14 +22,14 @@ import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.impl.PsiModificationTrackerImpl;
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase;
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 
 import java.io.File;
 import java.io.IOException;
 
-public abstract class AbstractOutOfBlockModificationTest extends JetLightCodeInsightFixtureTestCase {
+public abstract class AbstractOutOfBlockModificationTest extends KotlinLightCodeInsightFixtureTestCase {
     @Override
     public void setUp() {
         super.setUp();

idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt

@@ -33,21 +33,21 @@ import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler
 import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideImplementMembersHandler
 import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideMemberChooserObject
 import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideMembersHandler
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.dumpTextWithErrors
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.TagsTestDataUtil
 import org.jetbrains.kotlin.utils.rethrow
 import org.junit.Assert
 import java.io.File
 import kotlin.test.assertEquals
 
-public abstract class AbstractOverrideImplementTest : JetLightCodeInsightFixtureTestCase() {
-    override fun getProjectDescriptor(): LightProjectDescriptor = JetLightProjectDescriptor.INSTANCE
+public abstract class AbstractOverrideImplementTest : KotlinLightCodeInsightFixtureTestCase() {
+    override fun getProjectDescriptor(): LightProjectDescriptor = KotlinLightProjectDescriptor.INSTANCE
 
     protected fun doImplementFileTest(memberToOverride: String? = null) {
         doFileTest(ImplementMembersHandler(), memberToOverride)
@@ -202,7 +202,7 @@ public abstract class AbstractOverrideImplementTest : JetLightCodeInsightFixture
             myFixture.checkResultByFile(fileName)
         }
         catch (error: AssertionError) {
-            JetTestUtils.assertEqualsToFile(expectedFile, TagsTestDataUtil.generateTextWithCaretAndSelection(myFixture.editor))
+            KotlinTestUtils.assertEqualsToFile(expectedFile, TagsTestDataUtil.generateTextWithCaretAndSelection(myFixture.editor))
         }
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/InsertImportOnPasteTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -34,342 +34,342 @@ public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPast
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Copy extends AbstractInsertImportOnPasteTest {
         public void testAllFilesPresentInCopy() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), false);
         }
 
         @TestMetadata("AlreadyImportedExtensions.kt")
         public void testAlreadyImportedExtensions() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedExtensions.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedExtensions.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("AlreadyImportedViaStar.kt")
         public void testAlreadyImportedViaStar() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ClassAlreadyImported.kt")
         public void testClassAlreadyImported() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassAlreadyImported.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassAlreadyImported.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ClassMember.kt")
         public void testClassMember() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassMember.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassMember.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ClassObject.kt")
         public void testClassObject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObject.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObject.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ClassObjectFunInsideClass.kt")
         public void testClassObjectFunInsideClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ClassObjectInner.kt")
         public void testClassObjectInner() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectInner.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectInner.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ClassResolvedToPackage.kt")
         public void testClassResolvedToPackage() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ClassType.kt")
         public void testClassType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassType.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassType.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ConflictForTypeWithTypeParameter.kt")
         public void testConflictForTypeWithTypeParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ConflictWithClass.kt")
         public void testConflictWithClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictWithClass.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictWithClass.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("Constructor.kt")
         public void testConstructor() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Constructor.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Constructor.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("DeepInnerClasses.kt")
         public void testDeepInnerClasses() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DeepInnerClasses.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DeepInnerClasses.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("DefaultPackage.kt")
         public void testDefaultPackage() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DefaultPackage.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DefaultPackage.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("DelegatedProperty.kt")
         public void testDelegatedProperty() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DelegatedProperty.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DelegatedProperty.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("DependenciesNotAccessibleOnPaste.kt")
         public void testDependenciesNotAccessibleOnPaste() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependenciesNotAccessibleOnPaste.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependenciesNotAccessibleOnPaste.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("DependencyOnJava.kt")
         public void testDependencyOnJava() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnJava.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnJava.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("DependencyOnKotlinLibrary.kt")
         public void testDependencyOnKotlinLibrary() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("DependencyOnStdLib.kt")
         public void testDependencyOnStdLib() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnStdLib.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnStdLib.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("EnumEntries.kt")
         public void testEnumEntries() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/EnumEntries.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/EnumEntries.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("Extension.kt")
         public void testExtension() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Extension.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Extension.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ExtensionAsInfixOrOperator.kt")
         public void testExtensionAsInfixOrOperator() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ExtensionCannotBeImportedOrLengthened.kt")
         public void testExtensionCannotBeImportedOrLengthened() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ExtensionConflict.kt")
         public void testExtensionConflict() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionConflict.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionConflict.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ForLoop.kt")
         public void testForLoop() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ForLoop.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ForLoop.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("FullyQualified.kt")
         public void testFullyQualified() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FullyQualified.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FullyQualified.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Function.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Function.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("FunctionAlreadyImported.kt")
         public void testFunctionAlreadyImported() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("FunctionParameter.kt")
         public void testFunctionParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionParameter.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionParameter.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("GetExpression.kt")
         public void testGetExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/GetExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/GetExpression.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ImportDependency.kt")
         public void testImportDependency() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDependency.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDependency.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ImportDirective.kt")
         public void testImportDirective() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDirective.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDirective.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ImportableEntityInExtensionLiteral.kt")
         public void testImportableEntityInExtensionLiteral() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ImportedElementCopied.kt")
         public void testImportedElementCopied() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportedElementCopied.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportedElementCopied.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("Inner.kt")
         public void testInner() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Inner.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Inner.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("Invoke.kt")
         public void testInvoke() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Invoke.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Invoke.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("JavaStaticViaClass.kt")
         public void testJavaStaticViaClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/JavaStaticViaClass.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/JavaStaticViaClass.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("Local.kt")
         public void testLocal() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Local.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Local.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("MultiDeclaration.kt")
         public void testMultiDeclaration() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiDeclaration.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiDeclaration.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("MultiReferencePartiallyCopied.kt")
         public void testMultiReferencePartiallyCopied() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("NoImportForBuiltIns.kt")
         public void testNoImportForBuiltIns() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("NoImportForSamePackage.kt")
         public void testNoImportForSamePackage() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForSamePackage.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForSamePackage.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("NotReferencePosition.kt")
         public void testNotReferencePosition() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("NotReferencePosition2.kt")
         public void testNotReferencePosition2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition2.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("Object.kt")
         public void testObject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Object.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Object.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("OverloadedExtensionFunction.kt")
         public void testOverloadedExtensionFunction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/OverloadedExtensionFunction.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/OverloadedExtensionFunction.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("PackageView.kt")
         public void testPackageView() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PackageView.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PackageView.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("PartiallyQualified.kt")
         public void testPartiallyQualified() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PartiallyQualified.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PartiallyQualified.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("QualifiedTypeConflict.kt")
         public void testQualifiedTypeConflict() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ReferencedElementAlsoCopied.kt")
         public void testReferencedElementAlsoCopied() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("Super.kt")
         public void testSuper() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Super.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Super.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("ThisReference.kt")
         public void testThisReference() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ThisReference.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ThisReference.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("TopLevelProperty.kt")
         public void testTopLevelProperty() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TopLevelProperty.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TopLevelProperty.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Trait.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Trait.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("TypeArgForUnresolvedCall.kt")
         public void testTypeArgForUnresolvedCall() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeArgForUnresolvedCall.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeArgForUnresolvedCall.kt");
             doTestCopy(fileName);
         }
 
         @TestMetadata("TypeParameter.kt")
         public void testTypeParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeParameter.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeParameter.kt");
             doTestCopy(fileName);
         }
     }
@@ -379,342 +379,342 @@ public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPast
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Cut extends AbstractInsertImportOnPasteTest {
         public void testAllFilesPresentInCut() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), false);
         }
 
         @TestMetadata("AlreadyImportedExtensions.kt")
         public void testAlreadyImportedExtensions() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedExtensions.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedExtensions.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("AlreadyImportedViaStar.kt")
         public void testAlreadyImportedViaStar() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ClassAlreadyImported.kt")
         public void testClassAlreadyImported() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassAlreadyImported.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassAlreadyImported.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ClassMember.kt")
         public void testClassMember() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassMember.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassMember.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ClassObject.kt")
         public void testClassObject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObject.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObject.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ClassObjectFunInsideClass.kt")
         public void testClassObjectFunInsideClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ClassObjectInner.kt")
         public void testClassObjectInner() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectInner.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectInner.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ClassResolvedToPackage.kt")
         public void testClassResolvedToPackage() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ClassType.kt")
         public void testClassType() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassType.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassType.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ConflictForTypeWithTypeParameter.kt")
         public void testConflictForTypeWithTypeParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ConflictWithClass.kt")
         public void testConflictWithClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictWithClass.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictWithClass.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("Constructor.kt")
         public void testConstructor() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Constructor.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Constructor.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("DeepInnerClasses.kt")
         public void testDeepInnerClasses() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DeepInnerClasses.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DeepInnerClasses.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("DefaultPackage.kt")
         public void testDefaultPackage() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DefaultPackage.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DefaultPackage.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("DelegatedProperty.kt")
         public void testDelegatedProperty() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DelegatedProperty.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DelegatedProperty.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("DependenciesNotAccessibleOnPaste.kt")
         public void testDependenciesNotAccessibleOnPaste() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependenciesNotAccessibleOnPaste.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependenciesNotAccessibleOnPaste.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("DependencyOnJava.kt")
         public void testDependencyOnJava() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnJava.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnJava.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("DependencyOnKotlinLibrary.kt")
         public void testDependencyOnKotlinLibrary() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("DependencyOnStdLib.kt")
         public void testDependencyOnStdLib() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnStdLib.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnStdLib.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("EnumEntries.kt")
         public void testEnumEntries() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/EnumEntries.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/EnumEntries.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("Extension.kt")
         public void testExtension() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Extension.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Extension.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ExtensionAsInfixOrOperator.kt")
         public void testExtensionAsInfixOrOperator() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ExtensionCannotBeImportedOrLengthened.kt")
         public void testExtensionCannotBeImportedOrLengthened() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ExtensionConflict.kt")
         public void testExtensionConflict() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionConflict.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionConflict.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ForLoop.kt")
         public void testForLoop() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ForLoop.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ForLoop.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("FullyQualified.kt")
         public void testFullyQualified() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FullyQualified.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FullyQualified.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Function.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Function.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("FunctionAlreadyImported.kt")
         public void testFunctionAlreadyImported() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("FunctionParameter.kt")
         public void testFunctionParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionParameter.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionParameter.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("GetExpression.kt")
         public void testGetExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/GetExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/GetExpression.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ImportDependency.kt")
         public void testImportDependency() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDependency.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDependency.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ImportDirective.kt")
         public void testImportDirective() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDirective.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDirective.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ImportableEntityInExtensionLiteral.kt")
         public void testImportableEntityInExtensionLiteral() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ImportedElementCopied.kt")
         public void testImportedElementCopied() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportedElementCopied.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportedElementCopied.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("Inner.kt")
         public void testInner() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Inner.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Inner.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("Invoke.kt")
         public void testInvoke() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Invoke.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Invoke.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("JavaStaticViaClass.kt")
         public void testJavaStaticViaClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/JavaStaticViaClass.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/JavaStaticViaClass.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("Local.kt")
         public void testLocal() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Local.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Local.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("MultiDeclaration.kt")
         public void testMultiDeclaration() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiDeclaration.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiDeclaration.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("MultiReferencePartiallyCopied.kt")
         public void testMultiReferencePartiallyCopied() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("NoImportForBuiltIns.kt")
         public void testNoImportForBuiltIns() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("NoImportForSamePackage.kt")
         public void testNoImportForSamePackage() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForSamePackage.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForSamePackage.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("NotReferencePosition.kt")
         public void testNotReferencePosition() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("NotReferencePosition2.kt")
         public void testNotReferencePosition2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition2.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("Object.kt")
         public void testObject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Object.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Object.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("OverloadedExtensionFunction.kt")
         public void testOverloadedExtensionFunction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/OverloadedExtensionFunction.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/OverloadedExtensionFunction.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("PackageView.kt")
         public void testPackageView() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PackageView.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PackageView.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("PartiallyQualified.kt")
         public void testPartiallyQualified() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PartiallyQualified.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PartiallyQualified.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("QualifiedTypeConflict.kt")
         public void testQualifiedTypeConflict() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ReferencedElementAlsoCopied.kt")
         public void testReferencedElementAlsoCopied() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("Super.kt")
         public void testSuper() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Super.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Super.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("ThisReference.kt")
         public void testThisReference() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ThisReference.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ThisReference.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("TopLevelProperty.kt")
         public void testTopLevelProperty() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TopLevelProperty.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TopLevelProperty.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Trait.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Trait.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("TypeArgForUnresolvedCall.kt")
         public void testTypeArgForUnresolvedCall() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeArgForUnresolvedCall.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeArgForUnresolvedCall.kt");
             doTestCut(fileName);
         }
 
         @TestMetadata("TypeParameter.kt")
         public void testTypeParameter() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeParameter.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeParameter.kt");
             doTestCut(fileName);
         }
     }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/InspectionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -28,66 +28,66 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @RunWith(JUnit3RunnerWithInners.class)
-public class JetInspectionTestGenerated extends AbstractJetInspectionTest {
+public class InspectionTestGenerated extends AbstractInspectionTest {
     @TestMetadata("idea/testData/intentions")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class Intentions extends AbstractJetInspectionTest {
+    public static class Intentions extends AbstractInspectionTest {
         public void testAllFilesPresentInIntentions() throws Exception {
-            JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/intentions"), Pattern.compile("^(inspections\\.test)$"));
+            KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/intentions"), Pattern.compile("^(inspections\\.test)$"));
         }
 
         @TestMetadata("branched/ifThenToElvis/inspectionData/inspections.test")
         public void testBranched_ifThenToElvis_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("branched/ifThenToSafeAccess/inspectionData/inspections.test")
         public void testBranched_ifThenToSafeAccess_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("conventionNameCalls/replaceGetOrSet/inspectionData/inspections.test")
         public void testConventionNameCalls_replaceGetOrSet_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("convertToStringTemplate/inspectionData/inspections.test")
         public void testConvertToStringTemplate_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("deprecatedCallableAddReplaceWith/inspectionData/inspections.test")
         public void testDeprecatedCallableAddReplaceWith_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("objectLiteralToLambda/inspectionData/inspections.test")
         public void testObjectLiteralToLambda_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("removeExplicitSuperQualifier/inspectionData/inspections.test")
         public void testRemoveExplicitSuperQualifier_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("removeExplicitTypeArguments/inspectionData/inspections.test")
         public void testRemoveExplicitTypeArguments_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("simplifyNegatedBinaryExpression/inspectionData/inspections.test")
         public void testSimplifyNegatedBinaryExpression_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/inspectionData/inspections.test");
             doTest(fileName);
         }
     }
@@ -95,86 +95,86 @@ public class JetInspectionTestGenerated extends AbstractJetInspectionTest {
     @TestMetadata("idea/testData/inspections")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class Inspections extends AbstractJetInspectionTest {
+    public static class Inspections extends AbstractInspectionTest {
         public void testAllFilesPresentInInspections() throws Exception {
-            JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/inspections"), Pattern.compile("^(inspections\\.test)$"));
+            KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/inspections"), Pattern.compile("^(inspections\\.test)$"));
         }
 
         @TestMetadata("conflictingExtensionProperty/inspectionData/inspections.test")
         public void testConflictingExtensionProperty_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/conflictingExtensionProperty/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/conflictingExtensionProperty/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("equalsAndHashCode/inspectionData/inspections.test")
         public void testEqualsAndHashCode_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/equalsAndHashCode/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/equalsAndHashCode/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("redundantSamConstructor/inspectionData/inspections.test")
         public void testRedundantSamConstructor_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/redundantSamConstructor/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/redundantSamConstructor/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("spelling/inspectionData/inspections.test")
         public void testSpelling_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/spelling/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/spelling/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("unusedImport/inspectionData/inspections.test")
         public void testUnusedImport_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedImport/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedImport/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("unusedReceiverParameter/inspectionData/inspections.test")
         public void testUnusedReceiverParameter_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedReceiverParameter/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedReceiverParameter/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("unusedSymbol/class/inspectionData/inspections.test")
         public void testUnusedSymbol_class_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/class/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/class/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("unusedSymbol/function/inspectionData/inspections.test")
         public void testUnusedSymbol_function_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/function/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/function/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("unusedSymbol/js/inspectionData/inspections.test")
         public void testUnusedSymbol_js_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/js/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/js/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("unusedSymbol/object/inspectionData/inspections.test")
         public void testUnusedSymbol_object_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/object/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/object/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("unusedSymbol/parameter/inspectionData/inspections.test")
         public void testUnusedSymbol_parameter_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/parameter/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/parameter/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("unusedSymbol/property/inspectionData/inspections.test")
         public void testUnusedSymbol_property_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/property/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/property/inspectionData/inspections.test");
             doTest(fileName);
         }
 
         @TestMetadata("unusedSymbol/typeParameter/inspectionData/inspections.test")
         public void testUnusedSymbol_typeParameter_inspectionData_Inspections_test() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/typeParameter/inspectionData/inspections.test");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/typeParameter/inspectionData/inspections.test");
             doTest(fileName);
         }
     }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,7 +32,7 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class LineMarkersTestGenerated extends AbstractLineMarkersTest {
     public void testAllFilesPresentInLineMarker() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("idea/testData/codeInsight/lineMarker/overrideImplement")
@@ -40,144 +40,144 @@ public class LineMarkersTestGenerated extends AbstractLineMarkersTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class OverrideImplement extends AbstractLineMarkersTest {
         public void testAllFilesPresentInOverrideImplement() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/overrideImplement"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/overrideImplement"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("BadCodeNoExceptions.kt")
         public void testBadCodeNoExceptions() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Class.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Class.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ClassObjectInStaticNestedClass.kt")
         public void testClassObjectInStaticNestedClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt");
             doTest(fileName);
         }
 
         @TestMetadata("DelegatedFun.kt")
         public void testDelegatedFun() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt");
             doTest(fileName);
         }
 
         @TestMetadata("DelegatedProperty.kt")
         public void testDelegatedProperty() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt");
             doTest(fileName);
         }
 
         @TestMetadata("EnumEntry.kt")
         public void testEnumEntry() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/EnumEntry.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/EnumEntry.kt");
             doTest(fileName);
         }
 
         @TestMetadata("FakeOverrideForClasses.kt")
         public void testFakeOverrideForClasses() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt");
             doTest(fileName);
         }
 
         @TestMetadata("FakeOverrideFun.kt")
         public void testFakeOverrideFun() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt");
             doTest(fileName);
         }
 
         @TestMetadata("FakeOverrideFunWithMostRelevantImplementation.kt")
         public void testFakeOverrideFunWithMostRelevantImplementation() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt");
             doTest(fileName);
         }
 
         @TestMetadata("FakeOverrideProperty.kt")
         public void testFakeOverrideProperty() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt");
             doTest(fileName);
         }
 
         @TestMetadata("FakeOverrideToStringInTrait.kt")
         public void testFakeOverrideToStringInTrait() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt");
             doTest(fileName);
         }
 
         @TestMetadata("FakeOverridesForTraitFunWithImpl.kt")
         public void testFakeOverridesForTraitFunWithImpl() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt");
             doTest(fileName);
         }
 
         @TestMetadata("NavigateToSeveralSuperElements.kt")
         public void testNavigateToSeveralSuperElements() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt");
             doTest(fileName);
         }
 
         @TestMetadata("NoOverridingMarkerOnDefaultTraitImpl.kt")
         public void testNoOverridingMarkerOnDefaultTraitImpl() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Overloads.kt")
         public void testOverloads() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt");
             doTest(fileName);
         }
 
         @TestMetadata("OverrideFunction.kt")
         public void testOverrideFunction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideFunction.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideFunction.kt");
             doTest(fileName);
         }
 
         @TestMetadata("OverrideIconForOverloadMethodBug.kt")
         public void testOverrideIconForOverloadMethodBug() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt");
             doTest(fileName);
         }
 
         @TestMetadata("OverrideMemberOfAbstractClass.kt")
         public void testOverrideMemberOfAbstractClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt");
             doTest(fileName);
         }
 
         @TestMetadata("OverridenTraitDeclarations.kt")
         public void testOverridenTraitDeclarations() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt");
             doTest(fileName);
         }
 
         @TestMetadata("OverridingTooltipOnDefaultTraitImpl.kt")
         public void testOverridingTooltipOnDefaultTraitImpl() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt");
             doTest(fileName);
         }
 
         @TestMetadata("PropertyOverride.kt")
         public void testPropertyOverride() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/PropertyOverride.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/PropertyOverride.kt");
             doTest(fileName);
         }
 
         @TestMetadata("ToStringInTrait.kt")
         public void testToStringInTrait() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt");
             doTest(fileName);
         }
 
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt");
             doTest(fileName);
         }
     }
@@ -187,102 +187,102 @@ public class LineMarkersTestGenerated extends AbstractLineMarkersTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RecursiveCall extends AbstractLineMarkersTest {
         public void testAllFilesPresentInRecursiveCall() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/recursiveCall"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/recursiveCall"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("conventionCall.kt")
         public void testConventionCall() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/conventionCall.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/conventionCall.kt");
             doTest(fileName);
         }
 
         @TestMetadata("differentImplicitReceiver.kt")
         public void testDifferentImplicitReceiver() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/differentImplicitReceiver.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/differentImplicitReceiver.kt");
             doTest(fileName);
         }
 
         @TestMetadata("extension.kt")
         public void testExtension() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/extension.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/extension.kt");
             doTest(fileName);
         }
 
         @TestMetadata("generic.kt")
         public void testGeneric() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/generic.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/generic.kt");
             doTest(fileName);
         }
 
         @TestMetadata("inInlinedFunctionExpression.kt")
         public void testInInlinedFunctionExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inInlinedFunctionExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inInlinedFunctionExpression.kt");
             doTest(fileName);
         }
 
         @TestMetadata("inInlinedLambda.kt")
         public void testInInlinedLambda() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inInlinedLambda.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inInlinedLambda.kt");
             doTest(fileName);
         }
 
         @TestMetadata("inLambda.kt")
         public void testInLambda() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inLambda.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inLambda.kt");
             doTest(fileName);
         }
 
         @TestMetadata("localClass.kt")
         public void testLocalClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/localClass.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/localClass.kt");
             doTest(fileName);
         }
 
         @TestMetadata("localFun.kt")
         public void testLocalFun() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/localFun.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/localFun.kt");
             doTest(fileName);
         }
 
         @TestMetadata("methodReference.kt")
         public void testMethodReference() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/methodReference.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/methodReference.kt");
             doTest(fileName);
         }
 
         @TestMetadata("nested.kt")
         public void testNested() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/nested.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/nested.kt");
             doTest(fileName);
         }
 
         @TestMetadata("otherQualifier.kt")
         public void testOtherQualifier() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/otherQualifier.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/otherQualifier.kt");
             doTest(fileName);
         }
 
         @TestMetadata("severalCallsInOneLine.kt")
         public void testSeveralCallsInOneLine() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/severalCallsInOneLine.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/severalCallsInOneLine.kt");
             doTest(fileName);
         }
 
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/simple.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/simple.kt");
             doTest(fileName);
         }
 
         @TestMetadata("superQualifier.kt")
         public void testSuperQualifier() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/superQualifier.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/superQualifier.kt");
             doTest(fileName);
         }
 
         @TestMetadata("thisQualifier.kt")
         public void testThisQualifier() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/thisQualifier.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/thisQualifier.kt");
             doTest(fileName);
         }
     }
@@ -292,18 +292,18 @@ public class LineMarkersTestGenerated extends AbstractLineMarkersTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RunMarkers extends AbstractLineMarkersTest {
         public void testAllFilesPresentInRunMarkers() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/runMarkers"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/runMarkers"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("jUnitTestClassWithSubclasses.kt")
         public void testJUnitTestClassWithSubclasses() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt");
             doTest(fileName);
         }
 
         @TestMetadata("testNGTestClassWithSubclasses.kt")
         public void testTestNGTestClassWithSubclasses() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt");
             doTest(fileName);
         }
     }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt

@@ -19,11 +19,11 @@ package org.jetbrains.kotlin.idea.codeInsight
 import com.intellij.codeInsight.template.TemplateContextType
 import com.intellij.testFramework.UsefulTestCase
 import org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import java.io.File
 
-public class LiveTemplatesContextTest : JetLightCodeInsightFixtureTestCase() {
+public class LiveTemplatesContextTest : KotlinLightCodeInsightFixtureTestCase() {
     override fun getTestDataPath(): String =
             File(PluginTestCaseBase.getTestDataPathBase(), "/templates/context").getPath() + File.separator
 

idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java

@@ -32,15 +32,15 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase;
-import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor;
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor;
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-public class LiveTemplatesTest extends JetLightCodeInsightFixtureTestCase {
+public class LiveTemplatesTest extends KotlinLightCodeInsightFixtureTestCase {
     @Override
     protected void setUp() {
         super.setUp();
@@ -305,7 +305,7 @@ public class LiveTemplatesTest extends JetLightCodeInsightFixtureTestCase {
     @NotNull
     @Override
     protected LightProjectDescriptor getProjectDescriptor() {
-        return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
+        return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
     }
 
     private void doAction(@NotNull String actionId) {

idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -30,20 +30,20 @@ import java.util.regex.Pattern;
 @TestMetadata("idea/testData/multiFileInspections")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
-public class JetMultiFileInspectionTestGenerated extends AbstractJetMultiFileInspectionTest {
+public class MultiFileInspectionTestGenerated extends AbstractMultiFileInspectionTest {
     public void testAllFilesPresentInMultiFileInspections() throws Exception {
-        JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/multiFileInspections"), Pattern.compile("^(.+)\\.test$"));
+        KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/multiFileInspections"), Pattern.compile("^(.+)\\.test$"));
     }
 
     @TestMetadata("invalidBundleOrProperty/invalidBundleOrProperty.test")
     public void testInvalidBundleOrProperty_InvalidBundleOrProperty() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileInspections/invalidBundleOrProperty/invalidBundleOrProperty.test");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileInspections/invalidBundleOrProperty/invalidBundleOrProperty.test");
         doTest(fileName);
     }
 
     @TestMetadata("mismatchedProjectAndDirectory/mismatchedProjectAndDirectory.test")
     public void testMismatchedProjectAndDirectory_MismatchedProjectAndDirectory() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileInspections/mismatchedProjectAndDirectory/mismatchedProjectAndDirectory.test");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileInspections/mismatchedProjectAndDirectory/mismatchedProjectAndDirectory.test");
         doTest(fileName);
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/OutOfBlockModificationTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,198 +32,198 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class OutOfBlockModificationTestGenerated extends AbstractOutOfBlockModificationTest {
     public void testAllFilesPresentInOutOfBlock() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/outOfBlock"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/outOfBlock"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("Class_Class_FunNoType_Block.kt")
     public void testClass_Class_FunNoType_Block() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Class_Class_FunNoType_Block.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Class_Class_FunNoType_Block.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Class_Class_FunNoType_Block_Expression.kt")
     public void testClass_Class_FunNoType_Block_Expression() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Class_Class_FunNoType_Block_Expression.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Class_Class_FunNoType_Block_Expression.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FunInFun.kt")
     public void testFunInFun() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunInFun.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunInFun.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FunNoBody.kt")
     public void testFunNoBody() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoBody.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoBody.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FunNoType_Block.kt")
     public void testFunNoType_Block() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoType_Block.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoType_Block.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FunNoType_Block_Class.kt")
     public void testFunNoType_Block_Class() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoType_Block_Class.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoType_Block_Class.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FunWithType_Initializer.kt")
     public void testFunWithType_Initializer() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunWithType_Initializer.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunWithType_Initializer.kt");
         doTest(fileName);
     }
 
     @TestMetadata("FunWithType_Initializer_Expression.kt")
     public void testFunWithType_Initializer_Expression() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunWithType_Initializer_Expression.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunWithType_Initializer_Expression.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InAntonymsObjectDeclaration.kt")
     public void testInAntonymsObjectDeclaration() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InAntonymsObjectDeclaration.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InAntonymsObjectDeclaration.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InClass.kt")
     public void testInClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InClassInClass.kt")
     public void testInClassInClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClassInClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClassInClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InClassPropertyAccessor.kt")
     public void testInClassPropertyAccessor() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClassPropertyAccessor.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClassPropertyAccessor.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InFunInFunWithBody.kt")
     public void testInFunInFunWithBody() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInFunWithBody.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInFunWithBody.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InFunInFunctionInitializerInFun.kt")
     public void testInFunInFunctionInitializerInFun() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInFunctionInitializerInFun.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInFunctionInitializerInFun.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InFunInMultiDeclaration.kt")
     public void testInFunInMultiDeclaration() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInMultiDeclaration.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInMultiDeclaration.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InFunInProperty.kt")
     public void testInFunInProperty() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInProperty.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInProperty.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InFunInPropertyInObjectLiteral.kt")
     public void testInFunInPropertyInObjectLiteral() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInPropertyInObjectLiteral.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInPropertyInObjectLiteral.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InFunObjectLiteral.kt")
     public void testInFunObjectLiteral() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunObjectLiteral.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunObjectLiteral.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InFunWithInference.kt")
     public void testInFunWithInference() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunWithInference.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunWithInference.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InFunctionLiteral.kt")
     public void testInFunctionLiteral() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunctionLiteral.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunctionLiteral.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InGlobalPropertyWithGetter.kt")
     public void testInGlobalPropertyWithGetter() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InGlobalPropertyWithGetter.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InGlobalPropertyWithGetter.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InMethod.kt")
     public void testInMethod() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InMethod.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InMethod.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InPropertyAccessorWithInference.kt")
     public void testInPropertyAccessorWithInference() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyAccessorWithInference.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyAccessorWithInference.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InPropertyWithFunctionLiteral.kt")
     public void testInPropertyWithFunctionLiteral() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyWithFunctionLiteral.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyWithFunctionLiteral.kt");
         doTest(fileName);
     }
 
     @TestMetadata("InPropertyWithInference.kt")
     public void testInPropertyWithInference() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyWithInference.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyWithInference.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Object_FunNoType_Block.kt")
     public void testObject_FunNoType_Block() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Object_FunNoType_Block.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Object_FunNoType_Block.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Object_FunNoType_Block_Expression.kt")
     public void testObject_FunNoType_Block_Expression() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Object_FunNoType_Block_Expression.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Object_FunNoType_Block_Expression.kt");
         doTest(fileName);
     }
 
     @TestMetadata("PropNotNullType_Initializer_ObjectLiteral_Fun.kt")
     public void testPropNotNullType_Initializer_ObjectLiteral_Fun() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNotNullType_Initializer_ObjectLiteral_Fun.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNotNullType_Initializer_ObjectLiteral_Fun.kt");
         doTest(fileName);
     }
 
     @TestMetadata("PropNullType_Initializer_If_Fun.kt")
     public void testPropNullType_Initializer_If_Fun() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNullType_Initializer_If_Fun.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNullType_Initializer_If_Fun.kt");
         doTest(fileName);
     }
 
     @TestMetadata("PropNullType_Initializer_ObjectLiteral_Fun.kt")
     public void testPropNullType_Initializer_ObjectLiteral_Fun() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNullType_Initializer_ObjectLiteral_Fun.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNullType_Initializer_ObjectLiteral_Fun.kt");
         doTest(fileName);
     }
 
     @TestMetadata("PropertyNoType_Initializer_String.kt")
     public void testPropertyNoType_Initializer_String() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropertyNoType_Initializer_String.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropertyNoType_Initializer_String.kt");
         doTest(fileName);
     }
 
     @TestMetadata("PropertyWithType_Initializer_String.kt")
     public void testPropertyWithType_Initializer_String() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropertyWithType_Initializer_String.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropertyWithType_Initializer_String.kt");
         doTest(fileName);
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt

@@ -25,13 +25,13 @@ import com.intellij.testFramework.PlatformTestUtil
 import com.intellij.testFramework.TestActionEvent
 import junit.framework.TestCase
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
-import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import java.io.File
 
-abstract class AbstractCodeInsightActionTest : JetLightCodeInsightFixtureTestCase() {
+abstract class AbstractCodeInsightActionTest : KotlinLightCodeInsightFixtureTestCase() {
     protected open fun createAction(fileText: String): CodeInsightAction {
         val actionClassName = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// ACTION_CLASS: ")
         return Class.forName(actionClassName).newInstance() as CodeInsightAction
@@ -86,12 +86,12 @@ abstract class AbstractCodeInsightActionTest : JetLightCodeInsightFixtureTestCas
             }
         }
         catch (e: CommonRefactoringUtil.RefactoringErrorHintException) {
-            JetTestUtils.assertEqualsToFile(conflictFile, e.getMessage()!!)
+            KotlinTestUtils.assertEqualsToFile(conflictFile, e.getMessage()!!)
         }
         finally {
             ConfigLibraryUtil.unconfigureLibrariesByDirective(myModule, fileText)
         }
     }
 
-    override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
+    override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/CodeInsightActionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight.generate;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,78 +32,78 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class CodeInsightActionTestGenerated extends AbstractCodeInsightActionTest {
     public void testAllFilesPresentInSecondaryConstructors() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("empty.kt")
     public void testEmpty() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/empty.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/empty.kt");
         doTest(fileName);
     }
 
     @TestMetadata("emptyExists.kt")
     public void testEmptyExists() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/emptyExists.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/emptyExists.kt");
         doTest(fileName);
     }
 
     @TestMetadata("javaSupers.kt")
     public void testJavaSupers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.kt");
         doTest(fileName);
     }
 
     @TestMetadata("javaSupersWithGenerics.kt")
     public void testJavaSupersWithGenerics() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt");
         doTest(fileName);
     }
 
     @TestMetadata("primaryExists.kt")
     public void testPrimaryExists() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/primaryExists.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/primaryExists.kt");
         doTest(fileName);
     }
 
     @TestMetadata("properties.kt")
     public void testProperties() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/properties.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/properties.kt");
         doTest(fileName);
     }
 
     @TestMetadata("propertiesWithSupers.kt")
     public void testPropertiesWithSupers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/propertiesWithSupers.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/propertiesWithSupers.kt");
         doTest(fileName);
     }
 
     @TestMetadata("supers.kt")
     public void testSupers() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supers.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supers.kt");
         doTest(fileName);
     }
 
     @TestMetadata("supersAllExist.kt")
     public void testSupersAllExist() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersAllExist.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersAllExist.kt");
         doTest(fileName);
     }
 
     @TestMetadata("supersSomeExist.kt")
     public void testSupersSomeExist() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersSomeExist.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersSomeExist.kt");
         doTest(fileName);
     }
 
     @TestMetadata("supersWithGenerics.kt")
     public void testSupersWithGenerics() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersWithGenerics.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersWithGenerics.kt");
         doTest(fileName);
     }
 
     @TestMetadata("supersWithVarargs.kt")
     public void testSupersWithVarargs() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersWithVarargs.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersWithVarargs.kt");
         doTest(fileName);
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/GenerateHashCodeAndEqualsActionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight.generate;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,120 +32,120 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class GenerateHashCodeAndEqualsActionTestGenerated extends AbstractGenerateHashCodeAndEqualsActionTest {
     public void testAllFilesPresentInEqualsWithHashCode() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/equalsWithHashCode"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/equalsWithHashCode"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("annotation.kt")
     public void testAnnotation() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/annotation.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/annotation.kt");
         doTest(fileName);
     }
 
     @TestMetadata("dataClass.kt")
     public void testDataClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/dataClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/dataClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("enum.kt")
     public void testEnum() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/enum.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/enum.kt");
         doTest(fileName);
     }
 
     @TestMetadata("genericClass.kt")
     public void testGenericClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("genericClassWithIsCheck.kt")
     public void testGenericClassWithIsCheck() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/genericClassWithIsCheck.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/genericClassWithIsCheck.kt");
         doTest(fileName);
     }
 
     @TestMetadata("interface.kt")
     public void testInterface() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/interface.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/interface.kt");
         doTest(fileName);
     }
 
     @TestMetadata("multipleVars.kt")
     public void testMultipleVars() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt");
         doTest(fileName);
     }
 
     @TestMetadata("multipleVarsNullable.kt")
     public void testMultipleVarsNullable() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt");
         doTest(fileName);
     }
 
     @TestMetadata("multipleVarsWithSuperClass.kt")
     public void testMultipleVarsWithSuperClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("nameClash.kt")
     public void testNameClash() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt");
         doTest(fileName);
     }
 
     @TestMetadata("noVars.kt")
     public void testNoVars() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVars.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVars.kt");
         doTest(fileName);
     }
 
     @TestMetadata("noVarsForced.kt")
     public void testNoVarsForced() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVarsForced.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVarsForced.kt");
         doTest(fileName);
     }
 
     @TestMetadata("noVarsForcedWithSuperClass.kt")
     public void testNoVarsForcedWithSuperClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVarsForcedWithSuperClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVarsForcedWithSuperClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("object.kt")
     public void testObject() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/object.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/object.kt");
         doTest(fileName);
     }
 
     @TestMetadata("singleVar.kt")
     public void testSingleVar() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt");
         doTest(fileName);
     }
 
     @TestMetadata("singleVarNullable.kt")
     public void testSingleVarNullable() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt");
         doTest(fileName);
     }
 
     @TestMetadata("singleVarWithIsCheck.kt")
     public void testSingleVarWithIsCheck() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithIsCheck.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithIsCheck.kt");
         doTest(fileName);
     }
 
     @TestMetadata("singleVarWithJavaSuperClass.kt")
     public void testSingleVarWithJavaSuperClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("singleVarWithSuperClass.kt")
     public void testSingleVarWithSuperClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt");
         doTest(fileName);
     }
 }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/GenerateTestSupportMethodActionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight.generate;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,7 +32,7 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class GenerateTestSupportMethodActionTestGenerated extends AbstractGenerateTestSupportMethodActionTest {
     public void testAllFilesPresentInTestFrameworkSupport() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4")
@@ -40,48 +40,48 @@ public class GenerateTestSupportMethodActionTestGenerated extends AbstractGenera
     @RunWith(JUnit3RunnerWithInners.class)
     public static class JUnit4 extends AbstractGenerateTestSupportMethodActionTest {
         public void testAllFilesPresentInJUnit4() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("dataMethod.kt")
         public void testDataMethod() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt");
             doTest(fileName);
         }
 
         @TestMetadata("setUp.kt")
         public void testSetUp() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt");
             doTest(fileName);
         }
 
         @TestMetadata("setUpExists.kt")
         public void testSetUpExists() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt");
             doTest(fileName);
         }
 
         @TestMetadata("setUpOverrides.kt")
         public void testSetUpOverrides() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpOverrides.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpOverrides.kt");
             doTest(fileName);
         }
 
         @TestMetadata("tearDown.kt")
         public void testTearDown() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt");
             doTest(fileName);
         }
 
         @TestMetadata("tearDownExists.kt")
         public void testTearDownExists() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt");
             doTest(fileName);
         }
 
         @TestMetadata("testMethod.kt")
         public void testTestMethod() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt");
             doTest(fileName);
         }
     }
@@ -91,36 +91,36 @@ public class GenerateTestSupportMethodActionTestGenerated extends AbstractGenera
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Junit3 extends AbstractGenerateTestSupportMethodActionTest {
         public void testAllFilesPresentInJunit3() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/junit3"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/junit3"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("setUp.kt")
         public void testSetUp() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/setUp.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/setUp.kt");
             doTest(fileName);
         }
 
         @TestMetadata("setUpExists.kt")
         public void testSetUpExists() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/setUpExists.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/setUpExists.kt");
             doTest(fileName);
         }
 
         @TestMetadata("tearDown.kt")
         public void testTearDown() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/tearDown.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/tearDown.kt");
             doTest(fileName);
         }
 
         @TestMetadata("tearDownExists.kt")
         public void testTearDownExists() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/tearDownExists.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/tearDownExists.kt");
             doTest(fileName);
         }
 
         @TestMetadata("testMethod.kt")
         public void testTestMethod() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt");
             doTest(fileName);
         }
     }
@@ -130,48 +130,48 @@ public class GenerateTestSupportMethodActionTestGenerated extends AbstractGenera
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TestNG extends AbstractGenerateTestSupportMethodActionTest {
         public void testAllFilesPresentInTestNG() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/testNG"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/testNG"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("dataMethod.kt")
         public void testDataMethod() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt");
             doTest(fileName);
         }
 
         @TestMetadata("setUp.kt")
         public void testSetUp() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt");
             doTest(fileName);
         }
 
         @TestMetadata("setUpExists.kt")
         public void testSetUpExists() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpExists.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpExists.kt");
             doTest(fileName);
         }
 
         @TestMetadata("setUpOverrides.kt")
         public void testSetUpOverrides() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt");
             doTest(fileName);
         }
 
         @TestMetadata("tearDown.kt")
         public void testTearDown() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt");
             doTest(fileName);
         }
 
         @TestMetadata("tearDownExists.kt")
         public void testTearDownExists() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDownExists.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDownExists.kt");
             doTest(fileName);
         }
 
         @TestMetadata("testMethod.kt")
         public void testTestMethod() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt");
             doTest(fileName);
         }
     }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt

@@ -20,9 +20,9 @@ import com.intellij.openapi.actionSystem.IdeActions
 import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.KotlinFileType
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 
-class SmartEnterTest : JetLightCodeInsightFixtureTestCase() {
+class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() {
     fun testIfCondition() = doFunTest(
             """
             if <caret>

idea/tests/org/jetbrains/kotlin/idea/codeInsight/surroundWith/SurroundWithTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight.surroundWith;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -34,42 +34,42 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class If extends AbstractSurroundWithTest {
         public void testAllFilesPresentInIf() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("block.kt")
         public void testBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/block.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/block.kt");
             doTestWithIfSurrounder(fileName);
         }
 
         @TestMetadata("emptyLine.kt")
         public void testEmptyLine() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/emptyLine.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/emptyLine.kt");
             doTestWithIfSurrounder(fileName);
         }
 
         @TestMetadata("severalStatements.kt")
         public void testSeveralStatements() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/severalStatements.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/severalStatements.kt");
             doTestWithIfSurrounder(fileName);
         }
 
         @TestMetadata("singleStatement.kt")
         public void testSingleStatement() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/singleStatement.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/singleStatement.kt");
             doTestWithIfSurrounder(fileName);
         }
 
         @TestMetadata("singleStatementAtCaret.kt")
         public void testSingleStatementAtCaret() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/singleStatementAtCaret.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/singleStatementAtCaret.kt");
             doTestWithIfSurrounder(fileName);
         }
 
         @TestMetadata("variable.kt")
         public void testVariable() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/variable.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/variable.kt");
             doTestWithIfSurrounder(fileName);
         }
 
@@ -78,7 +78,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class MoveDeclarationsOut extends AbstractSurroundWithTest {
             public void testAllFilesPresentInMoveDeclarationsOut() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut"), Pattern.compile("^(.+)\\.kt$"), true);
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
             @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class")
@@ -86,18 +86,18 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Class extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInClass() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class"), Pattern.compile("^(.+)\\.kt$"), true);
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class"), Pattern.compile("^(.+)\\.kt$"), true);
                 }
 
                 @TestMetadata("classInType.kt")
                 public void testClassInType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/classInType.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/classInType.kt");
                     doTestWithIfSurrounder(fileName);
                 }
 
                 @TestMetadata("localClass.kt")
                 public void testLocalClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/localClass.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/localClass.kt");
                     doTestWithIfSurrounder(fileName);
                 }
             }
@@ -107,24 +107,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Function extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInFunction() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function"), Pattern.compile("^(.+)\\.kt$"), true);
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function"), Pattern.compile("^(.+)\\.kt$"), true);
                 }
 
                 @TestMetadata("firstChildLocalFun.kt")
                 public void testFirstChildLocalFun() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/firstChildLocalFun.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/firstChildLocalFun.kt");
                     doTestWithIfSurrounder(fileName);
                 }
 
                 @TestMetadata("localFun.kt")
                 public void testLocalFun() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/localFun.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/localFun.kt");
                     doTestWithIfSurrounder(fileName);
                 }
 
                 @TestMetadata("unusedLocalFun.kt")
                 public void testUnusedLocalFun() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/unusedLocalFun.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/unusedLocalFun.kt");
                     doTestWithIfSurrounder(fileName);
                 }
             }
@@ -134,12 +134,12 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Object extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInObject() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object"), Pattern.compile("^(.+)\\.kt$"), true);
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object"), Pattern.compile("^(.+)\\.kt$"), true);
                 }
 
                 @TestMetadata("localObject.kt")
                 public void testLocalObject() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object/localObject.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object/localObject.kt");
                     doTestWithIfSurrounder(fileName);
                 }
             }
@@ -149,24 +149,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Order extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInOrder() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order"), Pattern.compile("^(.+)\\.kt$"), true);
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order"), Pattern.compile("^(.+)\\.kt$"), true);
                 }
 
                 @TestMetadata("twoClasses.kt")
                 public void testTwoClasses() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/twoClasses.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/twoClasses.kt");
                     doTestWithIfSurrounder(fileName);
                 }
 
                 @TestMetadata("valAndClass.kt")
                 public void testValAndClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valAndClass.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valAndClass.kt");
                     doTestWithIfSurrounder(fileName);
                 }
 
                 @TestMetadata("valOrder.kt")
                 public void testValOrder() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valOrder.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valOrder.kt");
                     doTestWithIfSurrounder(fileName);
                 }
             }
@@ -176,36 +176,36 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Val extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInVal() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val"), Pattern.compile("^(.+)\\.kt$"), true);
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val"), Pattern.compile("^(.+)\\.kt$"), true);
                 }
 
                 @TestMetadata("fullQualifiedType.kt")
                 public void testFullQualifiedType() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedType.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedType.kt");
                     doTestWithIfSurrounder(fileName);
                 }
 
                 @TestMetadata("fullQualifiedTypeWithoutTypeRef.kt")
                 public void testFullQualifiedTypeWithoutTypeRef() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedTypeWithoutTypeRef.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedTypeWithoutTypeRef.kt");
                     doTestWithIfSurrounder(fileName);
                 }
 
                 @TestMetadata("valWithTypeWithInitializer.kt")
                 public void testValWithTypeWithInitializer() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWithInitializer.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWithInitializer.kt");
                     doTestWithIfSurrounder(fileName);
                 }
 
                 @TestMetadata("valWithTypeWoInitializer.kt")
                 public void testValWithTypeWoInitializer() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWoInitializer.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWoInitializer.kt");
                     doTestWithIfSurrounder(fileName);
                 }
 
                 @TestMetadata("valWoTypeWithInitializer.kt")
                 public void testValWoTypeWithInitializer() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWoTypeWithInitializer.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWoTypeWithInitializer.kt");
                     doTestWithIfSurrounder(fileName);
                 }
             }
@@ -215,24 +215,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Var extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInVar() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var"), Pattern.compile("^(.+)\\.kt$"), true);
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var"), Pattern.compile("^(.+)\\.kt$"), true);
                 }
 
                 @TestMetadata("varWithNotNullableTypeWithInitializer.kt")
                 public void testVarWithNotNullableTypeWithInitializer() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithNotNullableTypeWithInitializer.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithNotNullableTypeWithInitializer.kt");
                     doTestWithIfSurrounder(fileName);
                 }
 
                 @TestMetadata("varWithTypeWoInitializer.kt")
                 public void testVarWithTypeWoInitializer() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithTypeWoInitializer.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithTypeWoInitializer.kt");
                     doTestWithIfSurrounder(fileName);
                 }
 
                 @TestMetadata("varWoTypeWithInitializer.kt")
                 public void testVarWoTypeWithInitializer() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWoTypeWithInitializer.kt");
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWoTypeWithInitializer.kt");
                     doTestWithIfSurrounder(fileName);
                 }
 
@@ -241,24 +241,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
                 @RunWith(JUnit3RunnerWithInners.class)
                 public static class DefaultValue extends AbstractSurroundWithTest {
                     public void testAllFilesPresentInDefaultValue() throws Exception {
-                        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue"), Pattern.compile("^(.+)\\.kt$"), true);
+                        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue"), Pattern.compile("^(.+)\\.kt$"), true);
                     }
 
                     @TestMetadata("boolean.kt")
                     public void testBoolean() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/boolean.kt");
+                        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/boolean.kt");
                         doTestWithIfSurrounder(fileName);
                     }
 
                     @TestMetadata("nullable.kt")
                     public void testNullable() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/nullable.kt");
+                        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/nullable.kt");
                         doTestWithIfSurrounder(fileName);
                     }
 
                     @TestMetadata("primitiveNumbers.kt")
                     public void testPrimitiveNumbers() throws Exception {
-                        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/primitiveNumbers.kt");
+                        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/primitiveNumbers.kt");
                         doTestWithIfSurrounder(fileName);
                     }
                 }
@@ -271,48 +271,48 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class IfElse extends AbstractSurroundWithTest {
         public void testAllFilesPresentInIfElse() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/ifElse"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/ifElse"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("block.kt")
         public void testBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/block.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/block.kt");
             doTestWithIfElseSurrounder(fileName);
         }
 
         @TestMetadata("moveDeclarationsOutVal.kt")
         public void testMoveDeclarationsOutVal() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVal.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVal.kt");
             doTestWithIfElseSurrounder(fileName);
         }
 
         @TestMetadata("moveDeclarationsOutVar.kt")
         public void testMoveDeclarationsOutVar() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVar.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVar.kt");
             doTestWithIfElseSurrounder(fileName);
         }
 
         @TestMetadata("severalStatements.kt")
         public void testSeveralStatements() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/severalStatements.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/severalStatements.kt");
             doTestWithIfElseSurrounder(fileName);
         }
 
         @TestMetadata("singleStatement.kt")
         public void testSingleStatement() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/singleStatement.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/singleStatement.kt");
             doTestWithIfElseSurrounder(fileName);
         }
 
         @TestMetadata("singleStatementAtCaret.kt")
         public void testSingleStatementAtCaret() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/singleStatementAtCaret.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/singleStatementAtCaret.kt");
             doTestWithIfElseSurrounder(fileName);
         }
 
         @TestMetadata("variable.kt")
         public void testVariable() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/variable.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/variable.kt");
             doTestWithIfElseSurrounder(fileName);
         }
     }
@@ -322,48 +322,48 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Not extends AbstractSurroundWithTest {
         public void testAllFilesPresentInNot() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/not"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/not"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("booleanExpr.kt")
         public void testBooleanExpr() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/booleanExpr.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/booleanExpr.kt");
             doTestWithNotSurrounder(fileName);
         }
 
         @TestMetadata("booleanExprAtCaret.kt")
         public void testBooleanExprAtCaret() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/booleanExprAtCaret.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/booleanExprAtCaret.kt");
             doTestWithNotSurrounder(fileName);
         }
 
         @TestMetadata("expressionInIf.kt")
         public void testExpressionInIf() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/expressionInIf.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/expressionInIf.kt");
             doTestWithNotSurrounder(fileName);
         }
 
         @TestMetadata("notExpression.kt")
         public void testNotExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/notExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/notExpression.kt");
             doTestWithNotSurrounder(fileName);
         }
 
         @TestMetadata("severalExpr.kt")
         public void testSeveralExpr() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/severalExpr.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/severalExpr.kt");
             doTestWithNotSurrounder(fileName);
         }
 
         @TestMetadata("severalExprAtCaret.kt")
         public void testSeveralExprAtCaret() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/severalExprAtCaret.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/severalExprAtCaret.kt");
             doTestWithNotSurrounder(fileName);
         }
 
         @TestMetadata("variable.kt")
         public void testVariable() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/variable.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/variable.kt");
             doTestWithNotSurrounder(fileName);
         }
     }
@@ -373,24 +373,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Parentheses extends AbstractSurroundWithTest {
         public void testAllFilesPresentInParentheses() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("expr.kt")
         public void testExpr() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/expr.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/expr.kt");
             doTestWithParenthesesSurrounder(fileName);
         }
 
         @TestMetadata("inIf.kt")
         public void testInIf() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/inIf.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/inIf.kt");
             doTestWithParenthesesSurrounder(fileName);
         }
 
         @TestMetadata("partOfExpr.kt")
         public void testPartOfExpr() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/partOfExpr.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/partOfExpr.kt");
             doTestWithParenthesesSurrounder(fileName);
         }
 
@@ -399,60 +399,60 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         @RunWith(JUnit3RunnerWithInners.class)
         public static class NotApplicable extends AbstractSurroundWithTest {
             public void testAllFilesPresentInNotApplicable() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses/notApplicable"), Pattern.compile("^(.+)\\.kt$"), true);
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses/notApplicable"), Pattern.compile("^(.+)\\.kt$"), true);
             }
 
             @TestMetadata("if.kt")
             public void testIf() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/if.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/if.kt");
                 doTestWithParenthesesSurrounder(fileName);
             }
 
             @TestMetadata("import.kt")
             public void testImport() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/import.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/import.kt");
                 doTestWithParenthesesSurrounder(fileName);
             }
 
             @TestMetadata("importQualifiedFirst.kt")
             public void testImportQualifiedFirst() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedFirst.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedFirst.kt");
                 doTestWithParenthesesSurrounder(fileName);
             }
 
             @TestMetadata("importQualifiedSecond.kt")
             public void testImportQualifiedSecond() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedSecond.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedSecond.kt");
                 doTestWithParenthesesSurrounder(fileName);
             }
 
             @TestMetadata("packageName.kt")
             public void testPackageName() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/packageName.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/packageName.kt");
                 doTestWithParenthesesSurrounder(fileName);
             }
 
             @TestMetadata("parameterName.kt")
             public void testParameterName() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterName.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterName.kt");
                 doTestWithParenthesesSurrounder(fileName);
             }
 
             @TestMetadata("parameterWithType.kt")
             public void testParameterWithType() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterWithType.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterWithType.kt");
                 doTestWithParenthesesSurrounder(fileName);
             }
 
             @TestMetadata("qualifiedExpressionSecond.kt")
             public void testQualifiedExpressionSecond() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecond.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecond.kt");
                 doTestWithParenthesesSurrounder(fileName);
             }
 
             @TestMetadata("qualifiedExpressionSecondWithBracket.kt")
             public void testQualifiedExpressionSecondWithBracket() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecondWithBracket.kt");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecondWithBracket.kt");
                 doTestWithParenthesesSurrounder(fileName);
             }
         }
@@ -463,30 +463,30 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class StringTemplate extends AbstractSurroundWithTest {
         public void testAllFilesPresentInStringTemplate() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpression.kt");
             doTestWithStringTemplateSurrounder(fileName);
         }
 
         @TestMetadata("multiExpressionConstant.kt")
         public void testMultiExpressionConstant() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpressionConstant.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpressionConstant.kt");
             doTestWithStringTemplateSurrounder(fileName);
         }
 
         @TestMetadata("singleConstant.kt")
         public void testSingleConstant() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/singleConstant.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/singleConstant.kt");
             doTestWithStringTemplateSurrounder(fileName);
         }
 
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/singleExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/singleExpression.kt");
             doTestWithStringTemplateSurrounder(fileName);
         }
     }
@@ -496,24 +496,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class When extends AbstractSurroundWithTest {
         public void testAllFilesPresentInWhen() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/when"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/when"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("enum.kt")
         public void testEnum() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/enum.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/enum.kt");
             doTestWithWhenSurrounder(fileName);
         }
 
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/multiExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/multiExpression.kt");
             doTestWithWhenSurrounder(fileName);
         }
 
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/singleExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/singleExpression.kt");
             doTestWithWhenSurrounder(fileName);
         }
     }
@@ -523,24 +523,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TryCatch extends AbstractSurroundWithTest {
         public void testAllFilesPresentInTryCatch() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatch"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatch"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("moveDeclarationsOut.kt")
         public void testMoveDeclarationsOut() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOut.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOut.kt");
             doTestWithTryCatchSurrounder(fileName);
         }
 
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/multiExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/multiExpression.kt");
             doTestWithTryCatchSurrounder(fileName);
         }
 
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/singleExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/singleExpression.kt");
             doTestWithTryCatchSurrounder(fileName);
         }
     }
@@ -550,18 +550,18 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TryCatchFinally extends AbstractSurroundWithTest {
         public void testAllFilesPresentInTryCatchFinally() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatchFinally"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatchFinally"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally/multiExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally/multiExpression.kt");
             doTestWithTryCatchFinallySurrounder(fileName);
         }
 
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally/singleExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally/singleExpression.kt");
             doTestWithTryCatchFinallySurrounder(fileName);
         }
     }
@@ -571,18 +571,18 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class TryFinally extends AbstractSurroundWithTest {
         public void testAllFilesPresentInTryFinally() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryFinally"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryFinally"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryFinally/multiExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryFinally/multiExpression.kt");
             doTestWithTryFinallySurrounder(fileName);
         }
 
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryFinally/singleExpression.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryFinally/singleExpression.kt");
             doTestWithTryFinallySurrounder(fileName);
         }
     }
@@ -592,24 +592,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class FunctionLiteral extends AbstractSurroundWithTest {
         public void testAllFilesPresentInFunctionLiteral() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/functionLiteral"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/functionLiteral"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("moveDeclarationsOut.kt")
         public void testMoveDeclarationsOut() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/moveDeclarationsOut.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/moveDeclarationsOut.kt");
             doTestWithFunctionLiteralSurrounder(fileName);
         }
 
         @TestMetadata("multiStatement.kt")
         public void testMultiStatement() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/multiStatement.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/multiStatement.kt");
             doTestWithFunctionLiteralSurrounder(fileName);
         }
 
         @TestMetadata("singleStatement.kt")
         public void testSingleStatement() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/singleStatement.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/singleStatement.kt");
             doTestWithFunctionLiteralSurrounder(fileName);
         }
     }

idea/tests/org/jetbrains/kotlin/idea/codeInsight/unwrap/UnwrapRemoveTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight.unwrap;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -34,36 +34,36 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RemoveExpression extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInRemoveExpression() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeExpression"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeExpression"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("ifInBlock.kt")
         public void testIfInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInBlock.kt");
             doTestExpressionRemover(fileName);
         }
 
         @TestMetadata("ifInExpressionInReturn.kt")
         public void testIfInExpressionInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInExpressionInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInExpressionInReturn.kt");
             doTestExpressionRemover(fileName);
         }
 
         @TestMetadata("ifInReturn.kt")
         public void testIfInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInReturn.kt");
             doTestExpressionRemover(fileName);
         }
 
         @TestMetadata("tryInBlock.kt")
         public void testTryInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInBlock.kt");
             doTestExpressionRemover(fileName);
         }
 
         @TestMetadata("tryInReturn.kt")
         public void testTryInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInReturn.kt");
             doTestExpressionRemover(fileName);
         }
     }
@@ -73,24 +73,24 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapThen extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapThen() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapThen"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapThen"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("thenCompoundInBlock.kt")
         public void testThenCompoundInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInBlock.kt");
             doTestThenUnwrapper(fileName);
         }
 
         @TestMetadata("thenCompoundInReturn.kt")
         public void testThenCompoundInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInReturn.kt");
             doTestThenUnwrapper(fileName);
         }
 
         @TestMetadata("thenSimpleInReturn.kt")
         public void testThenSimpleInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenSimpleInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenSimpleInReturn.kt");
             doTestThenUnwrapper(fileName);
         }
     }
@@ -100,24 +100,24 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapElse extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapElse() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapElse"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapElse"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("elseCompoundInBlock.kt")
         public void testElseCompoundInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInBlock.kt");
             doTestElseUnwrapper(fileName);
         }
 
         @TestMetadata("elseCompoundInReturn.kt")
         public void testElseCompoundInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInReturn.kt");
             doTestElseUnwrapper(fileName);
         }
 
         @TestMetadata("elseSimpleInReturn.kt")
         public void testElseSimpleInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseSimpleInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseSimpleInReturn.kt");
             doTestElseUnwrapper(fileName);
         }
     }
@@ -127,12 +127,12 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RemoveElse extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInRemoveElse() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeElse"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeElse"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("else.kt")
         public void testElse() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeElse/else.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeElse/else.kt");
             doTestElseRemover(fileName);
         }
     }
@@ -142,24 +142,24 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapLoop extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapLoop() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("doWhile.kt")
         public void testDoWhile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/doWhile.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/doWhile.kt");
             doTestLoopUnwrapper(fileName);
         }
 
         @TestMetadata("for.kt")
         public void testFor() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/for.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/for.kt");
             doTestLoopUnwrapper(fileName);
         }
 
         @TestMetadata("while.kt")
         public void testWhile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/while.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/while.kt");
             doTestLoopUnwrapper(fileName);
         }
     }
@@ -169,24 +169,24 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapTry extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapTry() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapTry"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapTry"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("tryCompoundInBlock.kt")
         public void testTryCompoundInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInBlock.kt");
             doTestTryUnwrapper(fileName);
         }
 
         @TestMetadata("tryCompoundInReturn.kt")
         public void testTryCompoundInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInReturn.kt");
             doTestTryUnwrapper(fileName);
         }
 
         @TestMetadata("trySimpleInReturn.kt")
         public void testTrySimpleInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/trySimpleInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/trySimpleInReturn.kt");
             doTestTryUnwrapper(fileName);
         }
     }
@@ -196,24 +196,24 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapCatch extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapCatch() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("catchCompoundInBlock.kt")
         public void testCatchCompoundInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInBlock.kt");
             doTestCatchUnwrapper(fileName);
         }
 
         @TestMetadata("catchCompoundInReturn.kt")
         public void testCatchCompoundInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInReturn.kt");
             doTestCatchUnwrapper(fileName);
         }
 
         @TestMetadata("catchSimpleInReturn.kt")
         public void testCatchSimpleInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchSimpleInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchSimpleInReturn.kt");
             doTestCatchUnwrapper(fileName);
         }
     }
@@ -223,12 +223,12 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RemoveCatch extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInRemoveCatch() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeCatch"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeCatch"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("catch.kt")
         public void testCatch() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeCatch/catch.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeCatch/catch.kt");
             doTestCatchRemover(fileName);
         }
     }
@@ -238,24 +238,24 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapFinally extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapFinally() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("finallyCompoundInBlock.kt")
         public void testFinallyCompoundInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInBlock.kt");
             doTestFinallyUnwrapper(fileName);
         }
 
         @TestMetadata("finallyCompoundInReturn.kt")
         public void testFinallyCompoundInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInReturn.kt");
             doTestFinallyUnwrapper(fileName);
         }
 
         @TestMetadata("finallySimpleInReturn.kt")
         public void testFinallySimpleInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallySimpleInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallySimpleInReturn.kt");
             doTestFinallyUnwrapper(fileName);
         }
     }
@@ -265,18 +265,18 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class RemoveFinally extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInRemoveFinally() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeFinally"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeFinally"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("finallyInBlock.kt")
         public void testFinallyInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInBlock.kt");
             doTestFinallyRemover(fileName);
         }
 
         @TestMetadata("finallyInReturn.kt")
         public void testFinallyInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInReturn.kt");
             doTestFinallyRemover(fileName);
         }
     }
@@ -286,66 +286,66 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @RunWith(JUnit3RunnerWithInners.class)
     public static class UnwrapLambda extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapLambda() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda"), Pattern.compile("^(.+)\\.kt$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("lambdaCallCompoundInBlock.kt")
         public void testLambdaCallCompoundInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInBlock.kt");
             doTestLambdaUnwrapper(fileName);
         }
 
         @TestMetadata("lambdaCallCompoundInReturn.kt")
         public void testLambdaCallCompoundInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInReturn.kt");
             doTestLambdaUnwrapper(fileName);
         }
 
         @TestMetadata("lambdaCallInBlock.kt")
         public void testLambdaCallInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock.kt");
             doTestLambdaUnwrapper(fileName);
         }
 
         @TestMetadata("lambdaCallInBlock2.kt")
         public void testLambdaCallInBlock2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock2.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock2.kt");
             doTestLambdaUnwrapper(fileName);
         }
 
         @TestMetadata("lambdaCallSimpleInReturn.kt")
         public void testLambdaCallSimpleInReturn() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallSimpleInReturn.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallSimpleInReturn.kt");
             doTestLambdaUnwrapper(fileName);
         }
 
         @TestMetadata("lambdaInBlock.kt")
         public void testLambdaInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaInBlock.kt");
             doTestLambdaUnwrapper(fileName);
         }
 
         @TestMetadata("lambdaNonLocalPropertyCompoundInBlock.kt")
         public void testLambdaNonLocalPropertyCompoundInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyCompoundInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyCompoundInBlock.kt");
             doTestLambdaUnwrapper(fileName);
         }
 
         @TestMetadata("lambdaNonLocalPropertyInBlock.kt")
         public void testLambdaNonLocalPropertyInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyInBlock.kt");
             doTestLambdaUnwrapper(fileName);
         }
 
         @TestMetadata("lambdaPropertyCompoundInBlock.kt")
         public void testLambdaPropertyCompoundInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyCompoundInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyCompoundInBlock.kt");
             doTestLambdaUnwrapper(fileName);
         }
 
         @TestMetadata("lambdaPropertyInBlock.kt")
         public void testLambdaPropertyInBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyInBlock.kt");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyInBlock.kt");
             doTestLambdaUnwrapper(fileName);
         }
     }

idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java

@@ -20,7 +20,7 @@ import com.intellij.testFramework.LightCodeInsightTestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.maven.model.MavenConstants;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
 
 import java.io.File;
@@ -59,7 +59,7 @@ public abstract class AbstractConfigureProjectByChangingFileTest extends LightCo
             ((KotlinMavenConfigurator) configurator).changePomFile(getModule(), getFile(), version);
         }
 
-        JetTestUtils.assertEqualsToFile(new File(afterFile), getFile().getText().replace(version, "$VERSION$"));
+        KotlinTestUtils.assertEqualsToFile(new File(afterFile), getFile().getText().replace(version, "$VERSION$"));
     }
 
     @NotNull

idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureProjectByChangingFileTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.configuration;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -34,72 +34,72 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Android_gradle extends AbstractConfigureProjectByChangingFileTest {
         public void testAllFilesPresentInAndroid_gradle() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), true);
         }
 
         @TestMetadata("androidStudioDefault_before.gradle")
         public void testAndroidStudioDefault() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/androidStudioDefault_before.gradle");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/androidStudioDefault_before.gradle");
             doTestAndroidGradle(fileName);
         }
 
         @TestMetadata("androidStudioDefaultShapshot_before.gradle")
         public void testAndroidStudioDefaultShapshot() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_before.gradle");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_before.gradle");
             doTestAndroidGradle(fileName);
         }
 
         @TestMetadata("buildConfigs_before.gradle")
         public void testBuildConfigs() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/buildConfigs_before.gradle");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/buildConfigs_before.gradle");
             doTestAndroidGradle(fileName);
         }
 
         @TestMetadata("emptyDependencyList_before.gradle")
         public void testEmptyDependencyList() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/emptyDependencyList_before.gradle");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/emptyDependencyList_before.gradle");
             doTestAndroidGradle(fileName);
         }
 
         @TestMetadata("emptyFile_before.gradle")
         public void testEmptyFile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/emptyFile_before.gradle");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/emptyFile_before.gradle");
             doTestAndroidGradle(fileName);
         }
 
         @TestMetadata("helloWorld_before.gradle")
         public void testHelloWorld() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/helloWorld_before.gradle");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/helloWorld_before.gradle");
             doTestAndroidGradle(fileName);
         }
 
         @TestMetadata("libraryFile_before.gradle")
         public void testLibraryFile() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/libraryFile_before.gradle");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/libraryFile_before.gradle");
             doTestAndroidGradle(fileName);
         }
 
         @TestMetadata("missedApplyAndroidStatement_before.gradle")
         public void testMissedApplyAndroidStatement() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedApplyAndroidStatement_before.gradle");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedApplyAndroidStatement_before.gradle");
             doTestAndroidGradle(fileName);
         }
 
         @TestMetadata("missedBuildscriptBlock_before.gradle")
         public void testMissedBuildscriptBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedBuildscriptBlock_before.gradle");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedBuildscriptBlock_before.gradle");
             doTestAndroidGradle(fileName);
         }
 
         @TestMetadata("missedRepositoriesInBuildscriptBlock_before.gradle")
         public void testMissedRepositoriesInBuildscriptBlock() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_before.gradle");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_before.gradle");
             doTestAndroidGradle(fileName);
         }
 
         @TestMetadata("productFlavor_before.gradle")
         public void testProductFlavor() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/productFlavor_before.gradle");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/productFlavor_before.gradle");
             doTestAndroidGradle(fileName);
         }
 
@@ -108,60 +108,60 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
         @RunWith(JUnit3RunnerWithInners.class)
         public static class GradleExamples extends AbstractConfigureProjectByChangingFileTest {
             public void testAllFilesPresentInGradleExamples() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle/gradleExamples"), Pattern.compile("(\\w+)_before\\.gradle$"), true);
+                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle/gradleExamples"), Pattern.compile("(\\w+)_before\\.gradle$"), true);
             }
 
             @TestMetadata("gradleExample0_before.gradle")
             public void testGradleExample0() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_before.gradle");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_before.gradle");
                 doTestAndroidGradle(fileName);
             }
 
             @TestMetadata("gradleExample18_before.gradle")
             public void testGradleExample18() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_before.gradle");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_before.gradle");
                 doTestAndroidGradle(fileName);
             }
 
             @TestMetadata("gradleExample22_before.gradle")
             public void testGradleExample22() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_before.gradle");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_before.gradle");
                 doTestAndroidGradle(fileName);
             }
 
             @TestMetadata("gradleExample44_before.gradle")
             public void testGradleExample44() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_before.gradle");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_before.gradle");
                 doTestAndroidGradle(fileName);
             }
 
             @TestMetadata("gradleExample5_before.gradle")
             public void testGradleExample5() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_before.gradle");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_before.gradle");
                 doTestAndroidGradle(fileName);
             }
 
             @TestMetadata("gradleExample50_before.gradle")
             public void testGradleExample50() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_before.gradle");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_before.gradle");
                 doTestAndroidGradle(fileName);
             }
 
             @TestMetadata("gradleExample58_before.gradle")
             public void testGradleExample58() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_before.gradle");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_before.gradle");
                 doTestAndroidGradle(fileName);
             }
 
             @TestMetadata("gradleExample65_before.gradle")
             public void testGradleExample65() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_before.gradle");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_before.gradle");
                 doTestAndroidGradle(fileName);
             }
 
             @TestMetadata("gradleExample8_before.gradle")
             public void testGradleExample8() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_before.gradle");
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_before.gradle");
                 doTestAndroidGradle(fileName);
             }
         }
@@ -172,18 +172,18 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Gradle extends AbstractConfigureProjectByChangingFileTest {
         public void testAllFilesPresentInGradle() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), true);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), true);
         }
 
         @TestMetadata("default_before.gradle")
         public void testDefault() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/gradle/default_before.gradle");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/default_before.gradle");
             doTestGradle(fileName);
         }
 
         @TestMetadata("missedLibrary_before.gradle")
         public void testMissedLibrary() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/gradle/missedLibrary_before.gradle");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/missedLibrary_before.gradle");
             doTestGradle(fileName);
         }
     }
@@ -193,30 +193,30 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Maven extends AbstractConfigureProjectByChangingFileTest {
         public void testAllFilesPresentInMaven() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/maven"), Pattern.compile("^([^\\.]+)$"), false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/maven"), Pattern.compile("^([^\\.]+)$"), false);
         }
 
         @TestMetadata("libraryMissed")
         public void testLibraryMissed() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/maven/libraryMissed/");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/libraryMissed/");
             doTestWithMaven(fileName);
         }
 
         @TestMetadata("pluginMissed")
         public void testPluginMissed() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/maven/pluginMissed/");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/pluginMissed/");
             doTestWithMaven(fileName);
         }
 
         @TestMetadata("simpleProject")
         public void testSimpleProject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/maven/simpleProject/");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/simpleProject/");
             doTestWithMaven(fileName);
         }
 
         @TestMetadata("simpleProjectSnapshot")
         public void testSimpleProjectSnapshot() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/maven/simpleProjectSnapshot/");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/simpleProjectSnapshot/");
             doTestWithMaven(fileName);
         }
     }
@@ -226,30 +226,30 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Js_maven extends AbstractConfigureProjectByChangingFileTest {
         public void testAllFilesPresentInJs_maven() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/js-maven"), Pattern.compile("^([^\\.]+)$"), false);
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/js-maven"), Pattern.compile("^([^\\.]+)$"), false);
         }
 
         @TestMetadata("libraryMissed")
         public void testLibraryMissed() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/js-maven/libraryMissed/");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/js-maven/libraryMissed/");
             doTestWithJSMaven(fileName);
         }
 
         @TestMetadata("pluginMissed")
         public void testPluginMissed() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/js-maven/pluginMissed/");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/js-maven/pluginMissed/");
             doTestWithJSMaven(fileName);
         }
 
         @TestMetadata("simpleProject")
         public void testSimpleProject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/js-maven/simpleProject/");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/js-maven/simpleProject/");
             doTestWithJSMaven(fileName);
         }
 
         @TestMetadata("simpleProjectSnapshot")
         public void testSimpleProjectSnapshot() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/js-maven/simpleProjectSnapshot/");
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/js-maven/simpleProjectSnapshot/");
             doTestWithJSMaven(fileName);
         }
     }

idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt

@@ -18,11 +18,11 @@ package org.jetbrains.kotlin.idea.conversion.copy
 
 import com.intellij.openapi.actionSystem.IdeActions
 import org.jetbrains.kotlin.idea.AbstractCopyPasteTest
-import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.idea.editor.KotlinEditorOptions
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
-import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import java.io.File
 import kotlin.test.assertEquals
 
@@ -33,7 +33,7 @@ public abstract class AbstractJavaToKotlinCopyPasteConversionTest : AbstractCopy
 
     override fun getTestDataPath() = BASE_PATH
 
-    override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
+    override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 
     override fun setUp() {
         super.setUp()
@@ -69,6 +69,6 @@ public abstract class AbstractJavaToKotlinCopyPasteConversionTest : AbstractCopy
         assertEquals(noConversionExpected, !ConvertJavaCopyPastePostProcessor.conversionPerformed,
         if (noConversionExpected) "Conversion to Kotlin should not be suggested" else "No conversion to Kotlin suggested")
 
-        JetTestUtils.assertEqualsToFile(File(path.replace(".java", ".expected.kt")), myFixture.getFile().getText())
+        KotlinTestUtils.assertEqualsToFile(File(path.replace(".java", ".expected.kt")), myFixture.getFile().getText())
     }
 }

idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.conversion.copy;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -33,221 +33,221 @@ import java.util.regex.Pattern;
 public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaToKotlinCopyPasteConversionTest {
     @TestMetadata("AddImports.java")
     public void testAddImports() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImports.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImports.java");
         doTest(fileName);
     }
 
     @TestMetadata("AddImportsButNoConversion.java")
     public void testAddImportsButNoConversion() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsButNoConversion.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsButNoConversion.java");
         doTest(fileName);
     }
 
     @TestMetadata("AddImportsButNoConversion2.java")
     public void testAddImportsButNoConversion2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsButNoConversion2.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsButNoConversion2.java");
         doTest(fileName);
     }
 
     @TestMetadata("AddImportsClassInSamePackage.java")
     public void testAddImportsClassInSamePackage() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsClassInSamePackage.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsClassInSamePackage.java");
         doTest(fileName);
     }
 
     @TestMetadata("AddImportsDummyConflict.java")
     public void testAddImportsDummyConflict() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsDummyConflict.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsDummyConflict.java");
         doTest(fileName);
     }
 
     @TestMetadata("AddImportsWithExplicitImports.java")
     public void testAddImportsWithExplicitImports() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.java");
         doTest(fileName);
     }
 
     @TestMetadata("AddKClassImport.java")
     public void testAddKClassImport() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddKClassImport.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddKClassImport.java");
         doTest(fileName);
     }
 
     public void testAllFilesPresentInConversion() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/conversion"), Pattern.compile("^([^\\.]+)\\.java$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/conversion"), Pattern.compile("^([^\\.]+)\\.java$"), true);
     }
 
     @TestMetadata("Arithmetic.java")
     public void testArithmetic() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Arithmetic.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Arithmetic.java");
         doTest(fileName);
     }
 
     @TestMetadata("ClassWithNoDocComment.java")
     public void testClassWithNoDocComment() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ClassWithNoDocComment.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ClassWithNoDocComment.java");
         doTest(fileName);
     }
 
     @TestMetadata("ClassWithOverrides.java")
     public void testClassWithOverrides() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ClassWithOverrides.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ClassWithOverrides.java");
         doTest(fileName);
     }
 
     @TestMetadata("Constructor.java")
     public void testConstructor() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Constructor.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Constructor.java");
         doTest(fileName);
     }
 
     @TestMetadata("ConversionInCorrectContext.java")
     public void testConversionInCorrectContext() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ConversionInCorrectContext.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ConversionInCorrectContext.java");
         doTest(fileName);
     }
 
     @TestMetadata("CopyAnnotation.java")
     public void testCopyAnnotation() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/CopyAnnotation.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/CopyAnnotation.java");
         doTest(fileName);
     }
 
     @TestMetadata("ExtendsTypeRef.java")
     public void testExtendsTypeRef() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ExtendsTypeRef.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ExtendsTypeRef.java");
         doTest(fileName);
     }
 
     @TestMetadata("FieldWithNoEndComment.java")
     public void testFieldWithNoEndComment() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FieldWithNoEndComment.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FieldWithNoEndComment.java");
         doTest(fileName);
     }
 
     @TestMetadata("FieldWithNoModifierAndNoSemicolon.java")
     public void testFieldWithNoModifierAndNoSemicolon() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.java");
         doTest(fileName);
     }
 
     @TestMetadata("FileWithNoPackageStatement.java")
     public void testFileWithNoPackageStatement() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FileWithNoPackageStatement.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FileWithNoPackageStatement.java");
         doTest(fileName);
     }
 
     @TestMetadata("HalfTheWhiteSpace.java")
     public void testHalfTheWhiteSpace() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/HalfTheWhiteSpace.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/HalfTheWhiteSpace.java");
         doTest(fileName);
     }
 
     @TestMetadata("ImplementsTypeRef.java")
     public void testImplementsTypeRef() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ImplementsTypeRef.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ImplementsTypeRef.java");
         doTest(fileName);
     }
 
     @TestMetadata("Imports1.java")
     public void testImports1() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports1.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports1.java");
         doTest(fileName);
     }
 
     @TestMetadata("Imports2.java")
     public void testImports2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports2.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports2.java");
         doTest(fileName);
     }
 
     @TestMetadata("Imports3.java")
     public void testImports3() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports3.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports3.java");
         doTest(fileName);
     }
 
     @TestMetadata("Indentation.java")
     public void testIndentation() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Indentation.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Indentation.java");
         doTest(fileName);
     }
 
     @TestMetadata("MethodDeclarationWithNoBody.java")
     public void testMethodDeclarationWithNoBody() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodDeclarationWithNoBody.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodDeclarationWithNoBody.java");
         doTest(fileName);
     }
 
     @TestMetadata("MethodReferenceWithoutQualifier.java")
     public void testMethodReferenceWithoutQualifier() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodReferenceWithoutQualifier.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodReferenceWithoutQualifier.java");
         doTest(fileName);
     }
 
     @TestMetadata("MethodWithNoAnnotation.java")
     public void testMethodWithNoAnnotation() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodWithNoAnnotation.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodWithNoAnnotation.java");
         doTest(fileName);
     }
 
     @TestMetadata("MethodWithOnlyOneAnnotation.java")
     public void testMethodWithOnlyOneAnnotation() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodWithOnlyOneAnnotation.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodWithOnlyOneAnnotation.java");
         doTest(fileName);
     }
 
     @TestMetadata("OnlyClosingBrace.java")
     public void testOnlyClosingBrace() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyClosingBrace.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyClosingBrace.java");
         doTest(fileName);
     }
 
     @TestMetadata("OnlyOneBraceFromBlock.java")
     public void testOnlyOneBraceFromBlock() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.java");
         doTest(fileName);
     }
 
     @TestMetadata("OnlyQualifier.java")
     public void testOnlyQualifier() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyQualifier.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyQualifier.java");
         doTest(fileName);
     }
 
     @TestMetadata("RawTypeRef.java")
     public void testRawTypeRef() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RawTypeRef.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RawTypeRef.java");
         doTest(fileName);
     }
 
     @TestMetadata("RedundantTypeCast.java")
     public void testRedundantTypeCast() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RedundantTypeCast.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RedundantTypeCast.java");
         doTest(fileName);
     }
 
     @TestMetadata("RedundantTypeCast2.java")
     public void testRedundantTypeCast2() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RedundantTypeCast2.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RedundantTypeCast2.java");
         doTest(fileName);
     }
 
     @TestMetadata("SampleBlock.java")
     public void testSampleBlock() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SampleBlock.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SampleBlock.java");
         doTest(fileName);
     }
 
     @TestMetadata("SeveralMethodsSample.java")
     public void testSeveralMethodsSample() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SeveralMethodsSample.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SeveralMethodsSample.java");
         doTest(fileName);
     }
 
     @TestMetadata("SingleWordFromIdentifier.java")
     public void testSingleWordFromIdentifier() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SingleWordFromIdentifier.java");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SingleWordFromIdentifier.java");
         doTest(fileName);
     }
 }

idea/tests/org/jetbrains/kotlin/idea/coverage/AbstractKotlinCoverageOutputFilesTest.kt

@@ -16,16 +16,16 @@
 
 package org.jetbrains.kotlin.idea.coverage
 
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.test.JetTestUtils
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import java.io.File
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 
-public abstract class AbstractKotlinCoverageOutputFilesTest(): JetLightCodeInsightFixtureTestCase() {
+public abstract class AbstractKotlinCoverageOutputFilesTest(): KotlinLightCodeInsightFixtureTestCase() {
     private val TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/coverage/outputFiles"
 
     override fun getTestDataPath(): String? = TEST_DATA_PATH
@@ -41,7 +41,7 @@ public abstract class AbstractKotlinCoverageOutputFilesTest(): JetLightCodeInsig
             }
 
             val actualClasses = KotlinCoverageExtension.collectGeneratedClassQualifiedNames(outDir, kotlinFile)
-            JetTestUtils.assertEqualsToFile(File(path.replace(".kt", ".expected.txt")), actualClasses!!.join("\n"))
+            KotlinTestUtils.assertEqualsToFile(File(path.replace(".kt", ".expected.txt")), actualClasses!!.join("\n"))
         }
         finally {
             runWriteAction {

idea/tests/org/jetbrains/kotlin/idea/coverage/KotlinCoverageOutputFilesTestGenerated.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.coverage;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.JetTestUtils;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;
 
@@ -32,12 +32,12 @@ import java.util.regex.Pattern;
 @RunWith(JUnit3RunnerWithInners.class)
 public class KotlinCoverageOutputFilesTestGenerated extends AbstractKotlinCoverageOutputFilesTest {
     public void testAllFilesPresentInOutputFiles() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/coverage/outputFiles"), Pattern.compile("^(.+)\\.kt$"), true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/coverage/outputFiles"), Pattern.compile("^(.+)\\.kt$"), true);
     }
 
     @TestMetadata("NotInlinedLambda.kt")
     public void testNotInlinedLambda() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("idea/testData/coverage/outputFiles/NotInlinedLambda.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/coverage/outputFiles/NotInlinedLambda.kt");
         doTest(fileName);
     }
 }

idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractPositionManagerTest.java

@@ -42,8 +42,8 @@ import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 import org.jetbrains.kotlin.codegen.GenerationUtils;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.idea.project.PluginJetFilesProvider;
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase;
-import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor;
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor;
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
 import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.utils.CollectionsKt;
@@ -57,7 +57,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public abstract class AbstractPositionManagerTest extends JetLightCodeInsightFixtureTestCase {
+public abstract class AbstractPositionManagerTest extends KotlinLightCodeInsightFixtureTestCase {
     // Breakpoint is given as a line comment on a specific line, containing the regexp to match the name of the class where that line
     // can be found. This pattern matches against these line comments and saves the class name in the first group
     private static final Pattern BREAKPOINT_PATTERN = Pattern.compile("^.*//\\s*(.+)\\s*$");
@@ -79,7 +79,7 @@ public abstract class AbstractPositionManagerTest extends JetLightCodeInsightFix
     @NotNull
     @Override
     protected LightProjectDescriptor getProjectDescriptor() {
-        return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
+        return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE;
     }
 
     @NotNull

idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt

@@ -25,12 +25,12 @@ import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.debugger.stepping.KotlinLambdaSmartStepTarget
 import org.jetbrains.kotlin.idea.debugger.stepping.KotlinSmartStepIntoHandler
-import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
-import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 
-public abstract class AbstractSmartStepIntoTest : JetLightCodeInsightFixtureTestCase() {
+public abstract class AbstractSmartStepIntoTest : KotlinLightCodeInsightFixtureTestCase() {
     private val fixture: JavaCodeInsightTestFixture
         get() = myFixture
 
@@ -81,5 +81,5 @@ public abstract class AbstractSmartStepIntoTest : JetLightCodeInsightFixtureTest
         return PluginTestCaseBase.getTestDataPathBase() + "/debugger/smartStepInto"
     }
 
-    override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
+    override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 }

idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt

@@ -50,7 +50,7 @@ import org.jetbrains.kotlin.idea.debugger.breakpoints.KotlinFieldBreakpoint
 import org.jetbrains.kotlin.idea.debugger.breakpoints.KotlinFieldBreakpointType
 import org.jetbrains.kotlin.idea.debugger.breakpoints.KotlinLineBreakpointType
 import org.jetbrains.kotlin.idea.debugger.stepping.*
-import org.jetbrains.kotlin.idea.test.JetJdkAndLibraryProjectDescriptor
+import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
@@ -251,7 +251,7 @@ abstract class KotlinDebuggerTestBase : KotlinDebuggerTestCase() {
 
         val libraryEntry = LibraryUtil.findLibraryEntry(virtualFile, getProject())
         if (libraryEntry != null && (libraryEntry is JdkOrderEntry ||
-                                     libraryEntry.getPresentableName() == JetJdkAndLibraryProjectDescriptor.LIBRARY_NAME)) {
+                                     libraryEntry.getPresentableName() == KotlinJdkAndLibraryProjectDescriptor.LIBRARY_NAME)) {
             return FileUtil.getNameWithoutExtension(virtualFile.getName()) + ".!EXT!"
         }