From 75beaa861f8f63d38a30f366145a01b157620169 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 13 Dec 2019 20:56:15 +0300
Subject: [PATCH] Use abstract class to prevent GradleDaemonAnalyzerTestCase
 running as test

---
 .../gradle/GradleMultiplatformHighlightingTest.kt   | 13 ++++++++++---
 .../kotlin/gradle/ImportAndCheckHighlighting.kt     | 12 ++++++++++--
 .../idea/debugger/test/AbstractCoroutineDumpTest.kt |  3 ---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt
index ab652b55d9b..3589ed3190c 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt
@@ -40,7 +40,11 @@ class GradleMultiplatformHighlightingTest : GradleImportingTestCase() {
         val files = importProjectFromTestData()
         val project = myTestFixture.project
 
-        checkFiles(files, project, GradleDaemonAnalyzerTestCase(testLineMarkers = true, checkWarnings = true, checkInfos = false)) { file ->
+        checkFiles(
+            files,
+            project,
+            object : GradleDaemonAnalyzerTestCase(testLineMarkers = true, checkWarnings = true, checkInfos = false) {}
+        ) { file ->
             file.extension == "kt"
         }
     }
@@ -50,8 +54,11 @@ class GradleMultiplatformHighlightingTest : GradleImportingTestCase() {
     }
 }
 
-class GradleDaemonAnalyzerTestCase(val testLineMarkers: Boolean, val checkWarnings: Boolean, val checkInfos: Boolean) :
-    DaemonAnalyzerTestCase() {
+abstract class GradleDaemonAnalyzerTestCase(
+    val testLineMarkers: Boolean,
+    val checkWarnings: Boolean,
+    val checkInfos: Boolean
+) : DaemonAnalyzerTestCase() {
     override fun doTestLineMarkers() = testLineMarkers
 
     fun checkHighlighting(project: Project, editor: Editor) {
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
index fdcfdf2c94f..6003cfe467b 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
@@ -6,8 +6,8 @@
 package org.jetbrains.kotlin.gradle
 
 import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
-import org.junit.Test
 import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
+import org.junit.Test
 
 
 class ImportAndCheckHighlighting : MultiplePluginVersionGradleImportingTestCase() {
@@ -28,7 +28,15 @@ class ImportAndCheckHighlighting : MultiplePluginVersionGradleImportingTestCase(
         val files = configureByFiles()
         importProject()
         val project = myTestFixture.project
-        checkFiles(files, project, GradleDaemonAnalyzerTestCase(testLineMarkers = testLineMarkers, checkWarnings = checkWarnings, checkInfos = false)) { file ->
+        checkFiles(
+            files,
+            project,
+            object : GradleDaemonAnalyzerTestCase(
+                testLineMarkers = testLineMarkers,
+                checkWarnings = checkWarnings,
+                checkInfos = false
+            ) {}
+        ) { file ->
             file.extension == "kt" || file.extension == "java"
         }
     }
diff --git a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractCoroutineDumpTest.kt b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractCoroutineDumpTest.kt
index 0c74eccbd28..91927b824a7 100644
--- a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractCoroutineDumpTest.kt
+++ b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractCoroutineDumpTest.kt
@@ -18,10 +18,7 @@ import org.jetbrains.kotlin.idea.debugger.evaluate.ExecutionContext
 import org.jetbrains.kotlin.idea.debugger.test.preference.DebuggerPreferences
 
 abstract class AbstractCoroutineDumpTest : KotlinDescriptorTestCaseWithStepping() {
-
-
     override fun doMultiFileTest(files: TestFiles, preferences: DebuggerPreferences) {
-
         doOnBreakpoint {
             val evalContext = EvaluationContextImpl(this, frameProxy)
             val execContext = ExecutionContext(evalContext, frameProxy ?: return@doOnBreakpoint)