201: Fix loading project in configuration tests

De-bunch AbstractConfigureKotlinTest.kt, just don't use field in 193.

idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt

@@ -113,7 +113,7 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() {
     }
 
     override fun doCreateProject(projectFile: Path): Project {
-        return myProjectManager.loadProject(projectFile.toFile().path)!!
+        return loadProjectCompat(projectFile)
     }
 
     private val projectName: String

idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.201

@@ -1,253 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.configuration
-
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.application.PathMacros
-import com.intellij.openapi.module.Module
-import com.intellij.openapi.module.ModuleManager
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.projectRoots.Sdk
-import com.intellij.openapi.roots.ProjectRootManager
-import com.intellij.openapi.util.io.FileUtil
-import com.intellij.openapi.util.io.FileUtilRt
-import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
-import com.intellij.testFramework.PlatformTestCase
-import com.intellij.testFramework.UsefulTestCase
-import junit.framework.TestCase
-import org.jetbrains.kotlin.idea.configuration.KotlinWithLibraryConfigurator.FileState
-import org.jetbrains.kotlin.idea.framework.KotlinSdkType
-import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
-import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe
-import org.jetbrains.kotlin.test.KotlinTestUtils
-import org.jetbrains.kotlin.test.isIgnoredInDatabaseWithLog
-import org.jetbrains.kotlin.utils.PathUtil
-import java.io.File
-import java.nio.file.Path
-
-abstract class AbstractConfigureKotlinTest : PlatformTestCase() {
-    override fun setUp() {
-        super.setUp()
-
-        VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory())
-    }
-
-    @Throws(Exception::class)
-    override fun tearDown() {
-        VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory())
-        PathMacros.getInstance().removeMacro(TEMP_DIR_MACRO_KEY)
-
-        super.tearDown()
-    }
-
-    @Throws(Exception::class)
-    override fun initApplication() {
-        super.initApplication()
-
-        KotlinSdkType.setUpIfNeeded()
-
-        ApplicationManager.getApplication().runWriteAction {
-            val jdkTable = getProjectJdkTableSafe()
-
-            jdkTable.addJdk(PluginTestCaseBase.mockJdk6())
-            jdkTable.addJdk(PluginTestCaseBase.mockJdk8())
-            jdkTable.addJdk(PluginTestCaseBase.mockJdk9())
-        }
-
-        PluginTestCaseBase.clearSdkTable(testRootDisposable)
-
-        val tempLibDir = FileUtil.createTempDirectory("temp", null)
-        PathMacros.getInstance().setMacro(TEMP_DIR_MACRO_KEY, FileUtilRt.toSystemDependentName(tempLibDir.absolutePath))
-    }
-
-    protected fun doTestConfigureModulesWithNonDefaultSetup(configurator: KotlinWithLibraryConfigurator) {
-        assertNoFilesInDefaultPaths()
-
-        val modules = modules
-        for (module in modules) {
-            assertNotConfigured(module, configurator)
-        }
-
-        configurator.configure(myProject, emptyList())
-
-        assertNoFilesInDefaultPaths()
-
-        for (module in modules) {
-            assertProperlyConfigured(module, configurator)
-        }
-    }
-
-    protected fun doTestOneJavaModule(jarState: FileState) {
-        doTestOneModule(jarState, JAVA_CONFIGURATOR)
-    }
-
-    protected fun doTestOneJsModule(jarState: FileState) {
-        doTestOneModule(jarState, JS_CONFIGURATOR)
-    }
-
-    private fun doTestOneModule(jarState: FileState, configurator: KotlinWithLibraryConfigurator) {
-        val module = module
-
-        assertNotConfigured(module, configurator)
-        configure(module, jarState, configurator)
-        assertProperlyConfigured(module, configurator)
-    }
-
-    override fun getModule(): Module {
-        val modules = ModuleManager.getInstance(myProject).modules
-        assert(modules.size == 1) { "One module should be loaded " + modules.size }
-        myModule = modules[0]
-        return super.getModule()
-    }
-
-    val modules: Array<Module>
-        get() = ModuleManager.getInstance(myProject).modules
-
-    override fun getProjectDirOrFile(): Path {
-        val projectFilePath = projectRoot + "/projectFile.ipr"
-        TestCase.assertTrue("Project file should exists " + projectFilePath, File(projectFilePath).exists())
-        return File(projectFilePath).toPath()
-    }
-
-    private val projectName: String
-        get() {
-            val testName = getTestName(true)
-            return if (testName.contains("_")) {
-                testName.substring(0, testName.indexOf("_"))
-            } else
-                testName
-        }
-
-    protected val projectRoot: String
-        get() = BASE_PATH + projectName
-
-    override fun setUpModule() {}
-
-    private fun assertNoFilesInDefaultPaths() {
-        UsefulTestCase.assertDoesntExist(File(JAVA_CONFIGURATOR.getDefaultPathToJarFile(project)))
-        UsefulTestCase.assertDoesntExist(File(JS_CONFIGURATOR.getDefaultPathToJarFile(project)))
-    }
-
-    override fun shouldRunTest(): Boolean {
-        return super.shouldRunTest() && !isIgnoredInDatabaseWithLog(this)
-    }
-
-    companion object {
-        private val BASE_PATH = "idea/testData/configuration/"
-        private val TEMP_DIR_MACRO_KEY = "TEMP_TEST_DIR"
-        protected val JAVA_CONFIGURATOR: KotlinJavaModuleConfigurator by lazy {
-            object : KotlinJavaModuleConfigurator() {
-                override fun getDefaultPathToJarFile(project: Project) = getPathRelativeToTemp("default_jvm_lib")
-            }
-        }
-
-        protected val JS_CONFIGURATOR: KotlinJsModuleConfigurator by lazy {
-            object : KotlinJsModuleConfigurator() {
-                override fun getDefaultPathToJarFile(project: Project) = getPathRelativeToTemp("default_js_lib")
-            }
-        }
-
-        private fun configure(
-            modules: List<Module>,
-            runtimeState: FileState,
-            configurator: KotlinWithLibraryConfigurator,
-            jarFromDist: String,
-            jarFromTemp: String
-        ) {
-            val project = modules.first().project
-            val collector = createConfigureKotlinNotificationCollector(project)
-
-            val pathToJar = getPathToJar(runtimeState, jarFromDist, jarFromTemp)
-            for (module in modules) {
-                configurator.configureModule(module, pathToJar, pathToJar, collector, runtimeState)
-            }
-            collector.showNotification()
-        }
-
-        private fun getPathToJar(runtimeState: FileState, jarFromDist: String, jarFromTemp: String) = when (runtimeState) {
-            FileState.EXISTS -> jarFromDist
-            FileState.COPY -> jarFromTemp
-            FileState.DO_NOT_COPY -> jarFromDist
-        }
-
-
-        private val pathToExistentRuntimeJar: String
-            get() = PathUtil.kotlinPathsForDistDirectory.stdlibPath.parent
-
-        private val pathToExistentJsJar: String
-            get() = PathUtil.kotlinPathsForDistDirectory.jsStdLibJarPath.parent
-
-        protected fun assertNotConfigured(module: Module, configurator: KotlinWithLibraryConfigurator) {
-            TestCase.assertFalse(
-                String.format("Module %s should not be configured as %s Module", module.name, configurator.presentableText),
-                configurator.isConfigured(module)
-            )
-        }
-
-        protected fun assertConfigured(module: Module, configurator: KotlinWithLibraryConfigurator) {
-            TestCase.assertTrue(
-                String.format(
-                    "Module %s should be configured with configurator '%s'", module.name,
-                    configurator.presentableText
-                ),
-                configurator.isConfigured(module)
-            )
-        }
-
-        protected fun assertProperlyConfigured(module: Module, configurator: KotlinWithLibraryConfigurator) {
-            assertConfigured(module, configurator)
-            assertNotConfigured(module, getOppositeConfigurator(configurator))
-        }
-
-        private fun getOppositeConfigurator(configurator: KotlinWithLibraryConfigurator): KotlinWithLibraryConfigurator {
-            if (configurator === JAVA_CONFIGURATOR) return JS_CONFIGURATOR
-            if (configurator === JS_CONFIGURATOR) return JAVA_CONFIGURATOR
-
-            throw IllegalArgumentException("Only JS_CONFIGURATOR and JAVA_CONFIGURATOR are supported")
-        }
-
-        private fun getPathRelativeToTemp(relativePath: String): String {
-            val tempPath = PathMacros.getInstance().getValue(TEMP_DIR_MACRO_KEY)
-            return tempPath + '/' + relativePath
-        }
-    }
-
-    protected fun configure(module: Module, jarState: FileState, configurator: KotlinProjectConfigurator) {
-        if (configurator is KotlinJavaModuleConfigurator) {
-            configure(
-                listOf(module), jarState,
-                configurator as KotlinWithLibraryConfigurator,
-                pathToExistentRuntimeJar, pathToNonexistentRuntimeJar
-            )
-        }
-        if (configurator is KotlinJsModuleConfigurator) {
-            configure(
-                listOf(module), jarState,
-                configurator as KotlinWithLibraryConfigurator,
-                pathToExistentJsJar, pathToNonexistentJsJar
-            )
-        }
-    }
-
-    private val pathToNonexistentRuntimeJar: String
-        get() {
-            val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/" + PathUtil.KOTLIN_JAVA_STDLIB_JAR
-            myFilesToDelete.add(File(pathToTempKotlinRuntimeJar))
-            return pathToTempKotlinRuntimeJar
-        }
-
-    private val pathToNonexistentJsJar: String
-        get() {
-            val pathToTempKotlinRuntimeJar = FileUtil.getTempDirectory() + "/" + PathUtil.JS_LIB_JAR_NAME
-            myFilesToDelete.add(File(pathToTempKotlinRuntimeJar))
-            return pathToTempKotlinRuntimeJar
-        }
-
-    override fun getTestProjectJdk(): Sdk {
-        val projectRootManager = ProjectRootManager.getInstance(project)
-        return projectRootManager.projectSdk ?: throw IllegalStateException("SDK ${projectRootManager.projectSdkName} was not found")
-    }
-}

idea/tests/org/jetbrains/kotlin/idea/configuration/compat.kt

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.configuration
+
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.ex.ProjectManagerEx
+import java.nio.file.Path
+
+// BUNCH: 192
+internal fun loadProjectCompat(projectFile: Path): Project {
+    return (ProjectManagerEx.getInstanceEx()).loadProject(projectFile)
+}

idea/tests/org/jetbrains/kotlin/idea/configuration/compat.kt.192

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.configuration
+
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.ex.ProjectManagerEx
+import java.nio.file.Path
+
+// BUNCH: 192
+internal fun loadProjectCompat(projectFile: Path): Project {
+    return (ProjectManagerEx.getInstanceEx()).loadProject(projectFile.toFile().path)!!
+}