From 0b4216c09691830485ae0eac3336be8704c6f2e2 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Fri, 25 Nov 2022 14:15:32 +0200
Subject: [PATCH] [FIR] Fix test configuration of FIR plugin prototype

---
 .../AbstractFirPluginBlackBoxCodegenTest.kt   | 37 -------------------
 .../AbstractFirPluginDiagnosticTest.kt        | 15 --------
 ...nfiguration.kt => PluginPrototypeTests.kt} | 19 ++++++++--
 3 files changed, 16 insertions(+), 55 deletions(-)
 delete mode 100644 plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirPluginBlackBoxCodegenTest.kt
 delete mode 100644 plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirPluginDiagnosticTest.kt
 rename plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/{commonPluginTestConfiguration.kt => PluginPrototypeTests.kt} (58%)

diff --git a/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirPluginBlackBoxCodegenTest.kt b/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirPluginBlackBoxCodegenTest.kt
deleted file mode 100644
index 8f690746144..00000000000
--- a/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirPluginBlackBoxCodegenTest.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.plugin.runners
-
-import org.jetbrains.kotlin.test.TargetBackend
-import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor
-import org.jetbrains.kotlin.test.backend.handlers.IrTextDumpHandler
-import org.jetbrains.kotlin.test.backend.handlers.IrTreeVerifierHandler
-import org.jetbrains.kotlin.test.backend.handlers.JvmBoxRunner
-import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade
-import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
-import org.jetbrains.kotlin.test.builders.fir2IrStep
-import org.jetbrains.kotlin.test.builders.irHandlersStep
-import org.jetbrains.kotlin.test.builders.jvmArtifactsHandlersStep
-import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerWithTargetBackendTest
-
-open class AbstractFirPluginBlackBoxCodegenTest : AbstractKotlinCompilerWithTargetBackendTest(TargetBackend.JVM_IR) {
-    override fun TestConfigurationBuilder.configuration() {
-        commonFirWithPluginFrontendConfiguration()
-        fir2IrStep()
-        irHandlersStep {
-            useHandlers(
-                ::IrTextDumpHandler,
-                ::IrTreeVerifierHandler,
-            )
-        }
-        facadeStep(::JvmIrBackendFacade)
-        jvmArtifactsHandlersStep {
-            useHandlers(::JvmBoxRunner)
-        }
-
-        useAfterAnalysisCheckers(::BlackBoxCodegenSuppressor)
-    }
-}
diff --git a/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirPluginDiagnosticTest.kt b/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirPluginDiagnosticTest.kt
deleted file mode 100644
index f2a37baf7ef..00000000000
--- a/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/AbstractFirPluginDiagnosticTest.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.fir.plugin.runners
-
-import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
-import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest
-
-abstract class AbstractFirPluginDiagnosticTest : AbstractKotlinCompilerTest() {
-    override fun TestConfigurationBuilder.configuration() {
-        commonFirWithPluginFrontendConfiguration()
-    }
-}
diff --git a/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/commonPluginTestConfiguration.kt b/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt
similarity index 58%
rename from plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/commonPluginTestConfiguration.kt
rename to plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt
index dd2837e44a9..5f3a7062634 100644
--- a/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/commonPluginTestConfiguration.kt
+++ b/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt
@@ -10,11 +10,24 @@ import org.jetbrains.kotlin.fir.plugin.services.PluginAnnotationsProvider
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_DUMP
-import org.jetbrains.kotlin.test.runners.baseFirDiagnosticTestConfiguration
+import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTest
+import org.jetbrains.kotlin.test.runners.codegen.AbstractFirBlackBoxCodegenTest
+
+open class AbstractFirPluginBlackBoxCodegenTest : AbstractFirBlackBoxCodegenTest() {
+    override fun configure(builder: TestConfigurationBuilder) {
+        super.configure(builder)
+        builder.commonFirWithPluginFrontendConfiguration()
+    }
+}
+
+abstract class AbstractFirPluginDiagnosticTest : AbstractFirDiagnosticTest() {
+    override fun configure(builder: TestConfigurationBuilder) {
+        super.configure(builder)
+        builder.commonFirWithPluginFrontendConfiguration()
+    }
+}
 
 fun TestConfigurationBuilder.commonFirWithPluginFrontendConfiguration() {
-    baseFirDiagnosticTestConfiguration()
-
     defaultDirectives {
         +ENABLE_PLUGIN_PHASES
         +FIR_DUMP