From aae6319c3953a8f7668d220a2765af6d7e639526 Mon Sep 17 00:00:00 2001
From: Mikhail Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Mon, 23 Mar 2020 08:13:21 +0100
Subject: [PATCH] Minor. Specify test runner to support parallel test execution

---
 .../idea/scripting/gradle/GradleScriptInputsWatcherTest.kt    | 3 +++
 .../idea/scripting/gradle/GradleScriptOutOfProjectTest.kt     | 3 +++
 .../jetbrains/kotlin/findUsages/CustomUsageSearcherTest.kt    | 4 +++-
 .../caches/resolve/HighlightingWithDependentLibrariesTest.kt  | 3 +++
 .../decompiler/navigation/LightNavigateToStdlibSourceTest.kt  | 3 +++
 .../idea/decompiler/stubBuilder/BuiltInDecompilerTest.kt      | 4 ++++
 .../kotlin/idea/script/ScriptConfigurationLoadingTest.kt      | 3 +++
 .../org/jetbrains/kotlin/search/KotlinReferencesSearchTest.kt | 3 +++
 idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt      | 3 +++
 9 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptInputsWatcherTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptInputsWatcherTest.kt
index 5a62fe03543..73e69d9efb3 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptInputsWatcherTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptInputsWatcherTest.kt
@@ -11,9 +11,12 @@ import com.intellij.psi.PsiFile
 import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
 import org.jetbrains.kotlin.idea.script.AbstractScriptConfigurationLoadingTest
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
 import org.jetbrains.plugins.gradle.util.GradleConstants
+import org.junit.runner.RunWith
 import java.io.File
 
+@RunWith(JUnit3WithIdeaConfigurationRunner::class)
 open class GradleScriptInputsWatcherTest : AbstractScriptConfigurationLoadingTest() {
     companion object {
         internal const val outsidePlaceholder = "// OUTSIDE_SECTIONS"
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptOutOfProjectTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptOutOfProjectTest.kt
index a2f6fd25f57..6f31466cd00 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptOutOfProjectTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptOutOfProjectTest.kt
@@ -8,9 +8,12 @@ package org.jetbrains.kotlin.idea.scripting.gradle
 import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
 import org.jetbrains.kotlin.idea.script.AbstractScriptConfigurationLoadingTest
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
 import org.jetbrains.plugins.gradle.util.GradleConstants
+import org.junit.runner.RunWith
 import java.io.File
 
+@RunWith(JUnit3WithIdeaConfigurationRunner::class)
 class GradleScriptOutOfProjectTest : AbstractScriptConfigurationLoadingTest() {
 
     override fun setUpTestProject() {
diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/CustomUsageSearcherTest.kt b/idea/tests/org/jetbrains/kotlin/findUsages/CustomUsageSearcherTest.kt
index 8aaa76c7212..6c8974ceb03 100644
--- a/idea/tests/org/jetbrains/kotlin/findUsages/CustomUsageSearcherTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/findUsages/CustomUsageSearcherTest.kt
@@ -15,8 +15,10 @@ import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.maskExtensions
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCaseBase
 import org.jetbrains.kotlin.idea.util.application.runReadAction
+import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
+import org.junit.runner.RunWith
 
-
+@RunWith(JUnit3WithIdeaConfigurationRunner::class)
 class CustomUsageSearcherTest : KotlinLightCodeInsightFixtureTestCaseBase() {
 
     fun testAddCustomUsagesForKotlin() {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt
index 6625ab09624..3bb8f84abcf 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt
@@ -15,9 +15,12 @@ import com.intellij.openapi.vfs.VfsUtil
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
+import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
 import org.jetbrains.kotlin.test.MockLibraryUtil
+import org.junit.runner.RunWith
 import java.io.File
 
+@RunWith(JUnit3WithIdeaConfigurationRunner::class)
 class HighlightingWithDependentLibrariesTest : KotlinLightCodeInsightFixtureTestCase() {
     private val TEST_DATA_PATH = PluginTestCaseBase.TEST_DATA_DIR + "/highlightingWithDependentLibraries"
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/LightNavigateToStdlibSourceTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/LightNavigateToStdlibSourceTest.kt
index ba26d2c663a..350846b24de 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/LightNavigateToStdlibSourceTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/LightNavigateToStdlibSourceTest.kt
@@ -13,7 +13,10 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtModifierListOwner
 import org.jetbrains.kotlin.psi.KtTypeAlias
 import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier
+import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
+import org.junit.runner.RunWith
 
+@RunWith(JUnit3WithIdeaConfigurationRunner::class)
 class LightNavigateToStdlibSourceTest : KotlinLightCodeInsightFixtureTestCase() {
     @ProjectDescriptorKind(JDK_AND_MULTIPLATFORM_STDLIB_WITH_SOURCES)
     fun testNavigateToCommonDeclarationWhenPlatformSpecificOverloadAvailable() {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerTest.kt
index 8aa9055593b..7b581fe9740 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerTest.kt
@@ -15,8 +15,10 @@ import org.jetbrains.kotlin.metadata.builtins.BuiltInsBinaryVersion
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.stubs.elements.KtFileStubBuilder
 import org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInSerializerProtocol
+import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.junit.Assert
+import org.junit.runner.RunWith
 import java.io.File
 
 abstract class AbstractBuiltInDecompilerTest : KotlinLightCodeInsightFixtureTestCase() {
@@ -33,6 +35,7 @@ abstract class AbstractBuiltInDecompilerTest : KotlinLightCodeInsightFixtureTest
     override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
 }
 
+@RunWith(JUnit3WithIdeaConfigurationRunner::class)
 class BuiltInDecompilerTest : AbstractBuiltInDecompilerTest() {
     override fun configureAndBuildFileStub(packageFqName: String): PsiFileStub<*> {
         val dirInRuntime = findDir(packageFqName, project)
@@ -47,6 +50,7 @@ class BuiltInDecompilerTest : AbstractBuiltInDecompilerTest() {
     }
 }
 
+@RunWith(JUnit3WithIdeaConfigurationRunner::class)
 class BuiltInDecompilerForWrongAbiVersionTest : AbstractBuiltInDecompilerTest() {
     override fun getTestDataPath() = PluginTestCaseBase.TEST_DATA_DIR + "/decompiler/builtins/"
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/ScriptConfigurationLoadingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/script/ScriptConfigurationLoadingTest.kt
index ec8934da78f..6aa62a30550 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/script/ScriptConfigurationLoadingTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/script/ScriptConfigurationLoadingTest.kt
@@ -6,7 +6,10 @@
 package org.jetbrains.kotlin.idea.script
 
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
+import org.junit.runner.RunWith
 
+@RunWith(JUnit3WithIdeaConfigurationRunner::class)
 class ScriptConfigurationLoadingTest : AbstractScriptConfigurationLoadingTest() {
     fun testSimple() {
         assertAndLoadInitialConfiguration()
diff --git a/idea/tests/org/jetbrains/kotlin/search/KotlinReferencesSearchTest.kt b/idea/tests/org/jetbrains/kotlin/search/KotlinReferencesSearchTest.kt
index a31f70ffb59..dfa208e307a 100644
--- a/idea/tests/org/jetbrains/kotlin/search/KotlinReferencesSearchTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/search/KotlinReferencesSearchTest.kt
@@ -17,9 +17,12 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.kotlin.psi.KtParameter
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
+import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
 import org.junit.Assert
+import org.junit.runner.RunWith
 import java.io.File
 
+@RunWith(JUnit3WithIdeaConfigurationRunner::class)
 class KotlinReferencesSearchTest() : AbstractSearcherTest() {
     override fun getTestDataPath(): String {
         return File(PluginTestCaseBase.getTestDataPathBase(), "/search/references").path + File.separator
diff --git a/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt b/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt
index 993f14fb6b0..19a7aac1eb9 100644
--- a/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt
@@ -9,8 +9,11 @@ import com.intellij.psi.search.PsiTodoSearchHelper
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
+import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
+import org.junit.runner.RunWith
 import java.io.File
 
+@RunWith(JUnit3WithIdeaConfigurationRunner::class)
 class TodoSearchTest : KotlinLightCodeInsightFixtureTestCase() {
     override fun getProjectDescriptor(): KotlinLightProjectDescriptor = KotlinLightProjectDescriptor.INSTANCE