From 2fb6815d7fa263a71d826260a2eba440bc9bcad0 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Mon, 19 Feb 2024 09:02:52 +0200
Subject: [PATCH] [Test] Cleanup AbstractFirScriptCodegenTest

---
 .../codegen/AbstractFirScriptCodegenTest.kt   | 44 +++++++------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractFirScriptCodegenTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractFirScriptCodegenTest.kt
index 0864771366f..0880653517a 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractFirScriptCodegenTest.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractFirScriptCodegenTest.kt
@@ -17,15 +17,16 @@ import org.jetbrains.kotlin.test.FirParser
 import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor
 import org.jetbrains.kotlin.test.backend.handlers.*
-import org.jetbrains.kotlin.test.backend.handlers.generatedTestClassLoader
 import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade
-import org.jetbrains.kotlin.test.builders.*
+import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
+import org.jetbrains.kotlin.test.builders.firHandlersStep
+import org.jetbrains.kotlin.test.builders.irHandlersStep
+import org.jetbrains.kotlin.test.builders.jvmArtifactsHandlersStep
 import org.jetbrains.kotlin.test.directives.configureFirParser
 import org.jetbrains.kotlin.test.frontend.fir.Fir2IrResultsConverter
 import org.jetbrains.kotlin.test.frontend.fir.FirFailingTestSuppressor
 import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade
 import org.jetbrains.kotlin.test.frontend.fir.handlers.FirDiagnosticsHandler
-import org.jetbrains.kotlin.test.frontend.fir.handlers.FirIdenticalChecker
 import org.jetbrains.kotlin.test.model.BinaryArtifacts
 import org.jetbrains.kotlin.test.model.DependencyKind
 import org.jetbrains.kotlin.test.model.FrontendKinds
@@ -35,7 +36,6 @@ import org.jetbrains.kotlin.test.services.EnvironmentConfigurator
 import org.jetbrains.kotlin.test.services.TestServices
 import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator
 import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurator
-import org.jetbrains.kotlin.test.services.fir.FirOldFrontendMetaConfigurator
 import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
 import java.net.URLClassLoader
@@ -43,6 +43,8 @@ import java.net.URLClassLoader
 open class AbstractFirScriptCodegenTest : AbstractKotlinCompilerWithTargetBackendTest(TargetBackend.JVM_IR) {
 
     override fun TestConfigurationBuilder.configuration() {
+        configureFirParser(FirParser.Psi)
+
         globalDefaults {
             frontend = FrontendKinds.FIR
             targetPlatform = JvmPlatforms.defaultJvmPlatform
@@ -56,34 +58,29 @@ open class AbstractFirScriptCodegenTest : AbstractKotlinCompilerWithTargetBacken
         )
 
         facadeStep(::FirFrontendFacade)
-        firHandlersStep()
-        facadeStep(::Fir2IrResultsConverter)
-        irHandlersStep {
-            useHandlers(
-                ::IrTextDumpHandler,
-                ::IrPrettyKotlinDumpHandler,
-            )
-            useAfterAnalysisCheckers(
-                ::FirIrDumpIdenticalChecker,
-            )
-        }
-        facadeStep(::JvmIrBackendFacade)
-        jvmArtifactsHandlersStep(init = {})
-
-        configureFirHandlersStep {
+        firHandlersStep {
             useHandlers(
                 ::FirDiagnosticsHandler
             )
             commonFirHandlersForCodegenTest()
         }
 
-        configureJvmArtifactsHandlersStep {
+        facadeStep(::Fir2IrResultsConverter)
+        irHandlersStep {
+            useHandlers(
+                ::IrTextDumpHandler,
+                ::IrPrettyKotlinDumpHandler,
+            )
+        }
+        facadeStep(::JvmIrBackendFacade)
+        jvmArtifactsHandlersStep {
             commonBackendHandlersForCodegenTest()
             useHandlers(
                 ::BytecodeListingHandler,
                 ::FirJvmScriptRunChecker
             )
         }
+
         enableMetaInfoHandler()
 
         useAfterAnalysisCheckers(
@@ -91,13 +88,6 @@ open class AbstractFirScriptCodegenTest : AbstractKotlinCompilerWithTargetBacken
             ::BlackBoxCodegenSuppressor
         )
     }
-
-    override fun configure(builder: TestConfigurationBuilder) {
-        super.configure(builder)
-        with(builder) {
-            configureFirParser(FirParser.Psi)
-        }
-    }
 }
 
 class FirJvmScriptRunChecker(testServices: TestServices) : JvmBinaryArtifactHandler(testServices) {