azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test Support: Check availability of test plugins in Gradle run configs

Browse Source 
#KT-26228 Fixed
This commit is contained in:
Alexey Sedunov
2018-08-20 14:44:49 +03:00
parent 3442c7385f
commit 80102fc2bc
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/KotlinGradleTestRunConfigurationProducer.kt
+23 -11
View File
@@ -33,21 +33,33 @@ import org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigu
import org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer import org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer
import org.jetbrains.plugins.gradle.util.GradleConstants import org.jetbrains.plugins.gradle.util.GradleConstants
private val IS_TEST_FRAMEWORK_PLUGIN_INSTALLED by lazy { private val IS_JUNIT_ENABLED by lazy { isPluginEnabled("JUnit") }
PluginManager.isPluginInstalled(getId("JUnit")) || PluginManager.isPluginInstalled(getId("TestNG-J")) private val IS_TESTNG_ENABLED by lazy { isPluginEnabled("TestNG-J") }
private val IS_TEST_FRAMEWORK_PLUGIN_ENABLED by lazy { IS_JUNIT_ENABLED || IS_TESTNG_ENABLED }
private fun isPluginEnabled(id: String): Boolean {
return PluginManager.isPluginInstalled(getId(id)) && id !in PluginManager.getDisabledPlugins()
} }
private fun getTestClass(leaf: PsiElement): PsiClass? { private fun getTestClass(leaf: PsiElement): PsiClass? {
KotlinJUnitRunConfigurationProducer.getTestClass(leaf)?.let { return it } if (IS_JUNIT_ENABLED) {
KotlinTestNgConfigurationProducer.getTestClassAndMethod(leaf)?.let { (testClass, testMethod) -> KotlinJUnitRunConfigurationProducer.getTestClass(leaf)?.let { return it }
return if (testMethod == null) testClass else null }
if (IS_TESTNG_ENABLED) {
KotlinTestNgConfigurationProducer.getTestClassAndMethod(leaf)?.let { (testClass, testMethod) ->
return if (testMethod == null) testClass else null
}
} }
return null return null
} }
private fun getTestMethod(leaf: PsiElement): PsiMethod? { private fun getTestMethod(leaf: PsiElement): PsiMethod? {
KotlinJUnitRunConfigurationProducer.getTestMethodLocation(leaf)?.psiElement?.let { return it } if (IS_JUNIT_ENABLED) {
KotlinTestNgConfigurationProducer.getTestClassAndMethod(leaf)?.second?.let { return it } KotlinJUnitRunConfigurationProducer.getTestMethodLocation(leaf)?.psiElement?.let { return it }
}
if (IS_TESTNG_ENABLED) {
KotlinTestNgConfigurationProducer.getTestClassAndMethod(leaf)?.second?.let { return it }
}
return null return null
} }
@@ -57,7 +69,7 @@ class KotlinTestClassGradleConfigurationProducer : TestClassGradleConfigurationP
context: ConfigurationContext, context: ConfigurationContext,
sourceElement: Ref<PsiElement> sourceElement: Ref<PsiElement>
): Boolean { ): Boolean {
if (!IS_TEST_FRAMEWORK_PLUGIN_INSTALLED) return false if (!IS_TEST_FRAMEWORK_PLUGIN_ENABLED) return false
val contextLocation = context.location ?: return false val contextLocation = context.location ?: return false
val module = context.module ?: return false val module = context.module ?: return false
@@ -86,7 +98,7 @@ class KotlinTestClassGradleConfigurationProducer : TestClassGradleConfigurationP
} }
override fun doIsConfigurationFromContext(configuration: ExternalSystemRunConfiguration, context: ConfigurationContext): Boolean { override fun doIsConfigurationFromContext(configuration: ExternalSystemRunConfiguration, context: ConfigurationContext): Boolean {
if (!IS_TEST_FRAMEWORK_PLUGIN_INSTALLED) return false if (!IS_TEST_FRAMEWORK_PLUGIN_ENABLED) return false
val leaf = context.location?.psiElement ?: return false val leaf = context.location?.psiElement ?: return false
if (context.module == null) return false if (context.module == null) return false
@@ -122,7 +134,7 @@ class KotlinTestMethodGradleConfigurationProducer : TestMethodGradleConfiguratio
context: ConfigurationContext, context: ConfigurationContext,
sourceElement: Ref<PsiElement> sourceElement: Ref<PsiElement>
): Boolean { ): Boolean {
if (!IS_TEST_FRAMEWORK_PLUGIN_INSTALLED) return false if (!IS_TEST_FRAMEWORK_PLUGIN_ENABLED) return false
val contextLocation = context.location ?: return false val contextLocation = context.location ?: return false
if (context.module == null) return false if (context.module == null) return false
@@ -144,7 +156,7 @@ class KotlinTestMethodGradleConfigurationProducer : TestMethodGradleConfiguratio
} }
override fun doIsConfigurationFromContext(configuration: ExternalSystemRunConfiguration, context: ConfigurationContext): Boolean { override fun doIsConfigurationFromContext(configuration: ExternalSystemRunConfiguration, context: ConfigurationContext): Boolean {
if (!IS_TEST_FRAMEWORK_PLUGIN_INSTALLED) return false if (!IS_TEST_FRAMEWORK_PLUGIN_ENABLED) return false
if (RunConfigurationProducer.getInstance(PatternConfigurationProducer::class.java).isMultipleElementsSelected(context)) { if (RunConfigurationProducer.getInstance(PatternConfigurationProducer::class.java).isMultipleElementsSelected(context)) {
return false return false