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

Support rerun of MPP tests for jvm target

Browse Source
This commit is contained in:
Kirill Shmakov
2020-09-18 16:59:57 +03:00
parent 23642d2f86
commit ec8465859c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestMethodGradleConfigurationProducer.kt
+6 -1
View File
@@ -11,6 +11,7 @@ import com.intellij.execution.actions.ConfigurationFromContext
import com.intellij.execution.actions.ConfigurationFromContextImpl import com.intellij.execution.actions.ConfigurationFromContextImpl
import com.intellij.execution.junit.InheritorChooser import com.intellij.execution.junit.InheritorChooser
import com.intellij.execution.junit2.PsiMemberParameterizedLocation import com.intellij.execution.junit2.PsiMemberParameterizedLocation
import com.intellij.execution.junit2.info.MethodLocation
import com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunConfiguration import com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunConfiguration
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
@@ -83,7 +84,11 @@ abstract class AbstractKotlinMultiplatformTestMethodGradleConfigurationProducer
) { ) {
val dataContext = MultiplatformTestTasksChooser.createContext(context.dataContext, psiMethod.name) val dataContext = MultiplatformTestTasksChooser.createContext(context.dataContext, psiMethod.name)
val contextualSuffix = (context.location as? PsiMemberParameterizedLocation)?.paramSetName?.trim('[', ']') val contextualSuffix = when (context.location) {
is PsiMemberParameterizedLocation -> (context.location as? PsiMemberParameterizedLocation)?.paramSetName?.trim('[', ']')
is MethodLocation -> "jvm" // jvm, being default target, is treated differently
else -> null // from gutters
}
mppTestTasksChooser.multiplatformChooseTasks(context.project, dataContext, classes.asList(), contextualSuffix) { tasks -> mppTestTasksChooser.multiplatformChooseTasks(context.project, dataContext, classes.asList(), contextualSuffix) { tasks ->
val configuration = fromContext.configuration as ExternalSystemRunConfiguration val configuration = fromContext.configuration as ExternalSystemRunConfiguration