diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitConfigurationType.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitConfigurationType.kt deleted file mode 100644 index 8a67c300c7d..00000000000 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitConfigurationType.kt +++ /dev/null @@ -1,41 +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.ExecutionBundle -import com.intellij.execution.configurations.ConfigurationFactory -import com.intellij.execution.configurations.ConfigurationType -import com.intellij.execution.configurations.ConfigurationTypeUtil -import com.intellij.execution.configurations.RunConfiguration -import com.intellij.execution.junit.JUnitConfiguration -import com.intellij.icons.AllIcons -import com.intellij.openapi.project.Project -import javax.swing.Icon - -class KotlinJUnitConfigurationType : ConfigurationType { - val factory = object : ConfigurationFactory(this) { - override fun createTemplateConfiguration(project: Project): RunConfiguration { - return KotlinJUnitConfiguration("", project, this) - } - } - - companion object { - val instance: KotlinJUnitConfigurationType - get() = ConfigurationTypeUtil.findConfigurationType(KotlinJUnitConfigurationType::class.java) - } - - override fun getConfigurationFactories(): Array = arrayOf(factory) - - override fun getDisplayName() = "Kotlin JUnit" - override fun getConfigurationTypeDescription() = "Kotlin JUnit test configuration" - override fun getIcon(): Icon = AllIcons.RunConfigurations.Junit - override fun getId() = "KotlinJUnit" - override fun getTag() = "junit" - override fun isDumbAware() = false -} - -class KotlinJUnitConfiguration(name: String, project: Project, configurationFactory: ConfigurationFactory) : - JUnitConfiguration(name, project, configurationFactory) \ No newline at end of file diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt index db0e3bce401..b136d97d931 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt @@ -9,7 +9,6 @@ import com.intellij.execution.* import com.intellij.execution.actions.ConfigurationContext import com.intellij.execution.actions.ConfigurationFromContext import com.intellij.execution.actions.RunConfigurationProducer -import com.intellij.execution.configurations.ConfigurationFactory import com.intellij.execution.configurations.ModuleBasedConfiguration import com.intellij.execution.junit.* import com.intellij.execution.testframework.AbstractPatternBasedConfigurationProducer @@ -30,10 +29,6 @@ import org.jetbrains.kotlin.psi.KtNamedFunction import org.jetbrains.kotlin.psi.psiUtil.getParentOfType class KotlinJUnitRunConfigurationProducer : RunConfigurationProducer(JUnitConfigurationType.getInstance()) { - override fun getConfigurationFactory(): ConfigurationFactory { - return KotlinJUnitConfigurationType.instance.factory - } - override fun shouldReplace(self: ConfigurationFromContext, other: ConfigurationFromContext): Boolean { return other.isProducedBy(JUnitConfigurationProducer::class.java) || other.isProducedBy(AbstractPatternBasedConfigurationProducer::class.java) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinPatternConfigurationProducer.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinPatternConfigurationProducer.kt index e69a00a0fa7..b647ec720d6 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinPatternConfigurationProducer.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinPatternConfigurationProducer.kt @@ -5,31 +5,15 @@ package org.jetbrains.kotlin.idea.run -import com.intellij.execution.actions.ConfigurationContext import com.intellij.execution.actions.ConfigurationFromContext -import com.intellij.execution.configurations.ConfigurationFactory -import com.intellij.execution.junit.JUnitConfiguration import com.intellij.execution.junit.PatternConfigurationProducer import com.intellij.execution.testframework.AbstractInClassConfigurationProducer -import com.intellij.openapi.util.Ref import com.intellij.psi.PsiElement import com.intellij.psi.search.PsiElementProcessor import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.psi.KtClassOrObject class KotlinPatternConfigurationProducer : PatternConfigurationProducer() { - override fun getConfigurationFactory(): ConfigurationFactory { - return KotlinJUnitConfigurationType.instance.factory - } - - override fun setupConfigurationFromContext( - configuration: JUnitConfiguration, - context: ConfigurationContext, - sourceElement: Ref - ): Boolean { - return super.setupConfigurationFromContext(configuration, context, sourceElement) - } - override fun collectTestMembers( psiElements: Array, checkAbstract: Boolean, diff --git a/idea/resources/META-INF/jvm.xml b/idea/resources/META-INF/jvm.xml index d7009cafe14..2095194e196 100644 --- a/idea/resources/META-INF/jvm.xml +++ b/idea/resources/META-INF/jvm.xml @@ -119,7 +119,6 @@ -