Revert "Import Kotlin JUnit run configuration settings from Gradle"

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationAndHighlightingTest.kt

@@ -27,11 +27,6 @@ class GradleTestRunConfigurationAndHighlightingTest : GradleImportingTestCase()
         doTest()
     }
 
-    @Test
-    fun testKotlinJUnitSettings() {
-        doTest()
-    }
-
     @Test
     fun preferredConfigurations() {
         doTest()

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationCustomTest.kt

@@ -5,18 +5,14 @@
 
 package org.jetbrains.kotlin.idea.codeInsight.gradle
 
-import com.intellij.execution.RunManagerEx
-import com.intellij.execution.configurations.ConfigurationType
-import com.intellij.execution.configurations.ConfigurationTypeUtil
-import com.intellij.execution.junit.JUnitConfiguration
-import com.intellij.execution.junit.JUnitConfigurationType
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.testFramework.runInEdtAndWait
 import com.intellij.util.PlatformUtils
 import org.jetbrains.kotlin.gradle.textWithoutTags
-import org.jetbrains.kotlin.idea.run.*
+import org.jetbrains.kotlin.idea.run.KotlinJvmTestClassGradleConfigurationProducer
+import org.jetbrains.kotlin.idea.run.KotlinJvmTestMethodGradleConfigurationProducer
+import org.jetbrains.kotlin.idea.run.getConfiguration
 import org.jetbrains.kotlin.idea.util.application.runReadAction
-import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer
 import org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer
 import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions
@@ -56,37 +52,6 @@ class GradleTestRunConfigurationCustomTest : GradleImportingTestCase() {
         }
     }
 
-    @Test
-    @TargetVersions("4.7+")
-    fun testKotlinJUnitSettings() {
-        if (!PlatformUtils.isIntelliJ()) {
-            return
-        }
-
-        importProjectFromTestData()
-
-        runInEdtAndWait {
-            runReadAction {
-                fun getConfiguration(cls: Class<out ConfigurationType>): JUnitConfiguration {
-                    val configurationFactory = ConfigurationTypeUtil
-                        .findConfigurationType(cls).configurationFactories[0]
-                    val runManager = RunManagerEx.getInstanceEx(myProject)
-                    val kotlinRunnerAndConfigurationSettings = runManager.getConfigurationTemplate(configurationFactory)
-                    return kotlinRunnerAndConfigurationSettings.configuration as JUnitConfiguration
-                }
-
-                val javaConfiguration = getConfiguration(JUnitConfigurationType::class.java)
-                val kotlinConfiguration = getConfiguration(KotlinJUnitConfigurationType::class.java)
-
-                assert(javaConfiguration !== kotlinConfiguration)
-                assert(javaConfiguration.javaClass != kotlinConfiguration.javaClass)
-
-                assertEquals("-Dfoo=bar", javaConfiguration.persistentData.vmParameters)
-                assertEquals("-Dfoo=bar", kotlinConfiguration.persistentData.vmParameters)
-            }
-        }
-    }
-
     override fun testDataDirName(): String {
         return "testRunConfigurations"
     }

idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationImporter.kt

@@ -1,50 +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.run
-
-import com.intellij.execution.RunManagerEx
-import com.intellij.execution.configurations.ConfigurationTypeUtil
-import com.intellij.execution.configurations.RunConfiguration
-import com.intellij.execution.junit.JUnitRunConfigurationImporter
-import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProvider
-import com.intellij.openapi.externalSystem.service.project.settings.RunConfigurationImporter
-import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance
-
-@Suppress("UnstableApiUsage")
-class KotlinJUnitRunConfigurationImporter : RunConfigurationImporter {
-    private fun Any?.isTrue(): Boolean = this != null && this is Boolean && this
-
-    override fun canImport(typeName: String) = "junit" == typeName
-
-    private fun getOriginalImporter(): JUnitRunConfigurationImporter {
-        return RunConfigurationImporter.EP_NAME.extensions.firstIsInstance()
-    }
-
-    override fun getConfigurationFactory() = getOriginalImporter().configurationFactory
-
-    override fun process(
-        project: Project,
-        runConfiguration: RunConfiguration,
-        cfg: MutableMap<String, Any>,
-        modelsProvider: IdeModifiableModelsProvider
-    ) {
-        getOriginalImporter().process(project, runConfiguration, cfg, modelsProvider)
-
-        if (runConfiguration !is KotlinJUnitConfiguration && cfg["defaults"].isTrue()) {
-            val runManager = RunManagerEx.getInstanceEx(project)
-            val configurationFactory = ConfigurationTypeUtil
-                .findConfigurationType(KotlinJUnitConfigurationType::class.java).configurationFactories[0]
-            val kotlinRunnerAndConfigurationSettings = runManager.getConfigurationTemplate(configurationFactory)
-            process(project, kotlinRunnerAndConfigurationSettings.configuration, cfg, modelsProvider)
-
-            (cfg["beforeRun"] as? List<*>)?.let {
-                val beforeRunTasks = runManager.getBeforeRunTasks(runConfiguration)
-                runManager.setBeforeRunTasks(kotlinRunnerAndConfigurationSettings.configuration, beforeRunTasks)
-            }
-        }
-    }
-}

idea/resources/META-INF/junit.xml

@@ -1,7 +1,6 @@
 <idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
     <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinJUnitRunConfigurationProducer"/>
-    <externalSystem.runConfigurationImporter implementation="org.jetbrains.kotlin.idea.run.KotlinJUnitRunConfigurationImporter" order="first"/>
     <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinPatternConfigurationProducer"/>
     <junitRecognizer implementation="org.jetbrains.kotlin.idea.run.KotlinMultiplatformJUnitRecognizer"/>
   </extensions>