diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt index 60fc3a13fe0..b732bb557af 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt @@ -31,6 +31,7 @@ import org.jetbrains.kotlin.idea.util.rootManager import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions import org.junit.Test +import org.jetbrains.kotlin.idea.util.application.runReadAction class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() { @@ -51,7 +52,9 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe } private fun assertFileInModuleScope(file: VirtualFile, moduleName: String) { - assert(getModule(moduleName).getModuleWithDependenciesAndLibrariesScope(true).contains(file)) + runReadAction { + assert(getModule(moduleName).getModuleWithDependenciesAndLibrariesScope(true).contains(file)) + } } @Test diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt index 56a4649562a..74af4e4d036 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/TaskUtils.kt @@ -7,10 +7,13 @@ package org.jetbrains.kotlin.gradle import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase +import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.plugins.gradle.execution.test.runner.GradleTestRunConfigurationProducer fun MultiplePluginVersionGradleImportingTestCase.findTasksToRun(file: VirtualFile): List? { - return GradleTestRunConfigurationProducer.findAllTestsTaskToRun(file, project) - .flatMap { it.tasks } - .sorted() + return runReadAction { + GradleTestRunConfigurationProducer.findAllTestsTaskToRun(file, project) + .flatMap { it.tasks } + .sorted() + } } \ No newline at end of file