diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestClassGradleConfigurationProducer.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestClassGradleConfigurationProducer.kt index 4f9d20a66b6..09500e28ea7 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestClassGradleConfigurationProducer.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestClassGradleConfigurationProducer.kt @@ -11,6 +11,7 @@ import com.intellij.execution.actions.ConfigurationFromContext import com.intellij.execution.configurations.ConfigurationFactory import com.intellij.execution.junit.InheritorChooser import com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunConfiguration +import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.module.Module import com.intellij.openapi.util.Ref import com.intellij.psi.PsiClass @@ -87,6 +88,7 @@ abstract class AbstractKotlinMultiplatformTestClassGradleConfigurationProducer : LOG.warn("Cannot apply class test configuration, uses raw run configuration") performRunnable.run() } + settings.externalProjectPath = ExternalSystemApiUtil.getExternalProjectPath(context.module) configuration.name = classes.joinToString("|") { it.name ?: "" } performRunnable.run() } diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestMethodGradleConfigurationProducer.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestMethodGradleConfigurationProducer.kt index 195346411cc..b4374702bf0 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestMethodGradleConfigurationProducer.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestMethodGradleConfigurationProducer.kt @@ -11,6 +11,7 @@ import com.intellij.execution.actions.ConfigurationFromContext import com.intellij.execution.configurations.ConfigurationFactory import com.intellij.execution.junit.InheritorChooser import com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunConfiguration +import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.module.Module import com.intellij.openapi.util.Ref import com.intellij.psi.PsiClass @@ -84,6 +85,8 @@ abstract class AbstractKotlinMultiplatformTestMethodGradleConfigurationProducer createTestFilterFrom(context.location, it, psiMethod, true) } + settings.externalProjectPath = ExternalSystemApiUtil.getExternalProjectPath(context.module) + if (result) { configuration.name = (if (classes.size == 1) classes[0].name!! + "." else "") + psiMethod.name performRunnable.run() diff --git a/idea/testData/gradle/testRunConfigurations/multiprojectBuild/subproject/src/jvmTest/kotlin/foo/SubprojectTest.kt b/idea/testData/gradle/testRunConfigurations/multiprojectBuild/subproject/src/jvmTest/kotlin/foo/SubprojectTest.kt index 951287236a1..01fd3f50347 100644 --- a/idea/testData/gradle/testRunConfigurations/multiprojectBuild/subproject/src/jvmTest/kotlin/foo/SubprojectTest.kt +++ b/idea/testData/gradle/testRunConfigurations/multiprojectBuild/subproject/src/jvmTest/kotlin/foo/SubprojectTest.kt @@ -4,9 +4,9 @@ package foo import org.junit.Test -class SubprojectTest { +class SubprojectTest { @Test - fun otherTest() { + fun otherTest() { } } \ No newline at end of file