Execute gutters calculation in read action in tests

This commit is contained in:
Andrey Uskov
2020-11-03 01:39:03 +03:00
parent e5be9601e6
commit a0d5af8dd1
2 changed files with 10 additions and 4 deletions
@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.idea.util.rootManager
import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
import org.junit.Test import org.junit.Test
import org.jetbrains.kotlin.idea.util.application.runReadAction
class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() { class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
@@ -51,7 +52,9 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
} }
private fun assertFileInModuleScope(file: VirtualFile, moduleName: String) { private fun assertFileInModuleScope(file: VirtualFile, moduleName: String) {
assert(getModule(moduleName).getModuleWithDependenciesAndLibrariesScope(true).contains(file)) runReadAction {
assert(getModule(moduleName).getModuleWithDependenciesAndLibrariesScope(true).contains(file))
}
} }
@Test @Test
@@ -7,10 +7,13 @@ package org.jetbrains.kotlin.gradle
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase 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 import org.jetbrains.plugins.gradle.execution.test.runner.GradleTestRunConfigurationProducer
fun MultiplePluginVersionGradleImportingTestCase.findTasksToRun(file: VirtualFile): List<String>? { fun MultiplePluginVersionGradleImportingTestCase.findTasksToRun(file: VirtualFile): List<String>? {
return GradleTestRunConfigurationProducer.findAllTestsTaskToRun(file, project) return runReadAction {
.flatMap { it.tasks } GradleTestRunConfigurationProducer.findAllTestsTaskToRun(file, project)
.sorted() .flatMap { it.tasks }
.sorted()
}
} }