From 097b5a74fb17fe1e9525352ba9ff1c4d01a3b85f Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Wed, 17 Mar 2021 17:05:43 +0300
Subject: [PATCH] [VISUALIZER] Rewrite black box runner using callback to
 TestRunner

---
 .../AbstractVisualizerBlackBoxTest.kt         | 25 +++++++++++--
 .../visualizer/VisualizerBlackBoxHandler.kt   | 35 -------------------
 2 files changed, 22 insertions(+), 38 deletions(-)
 delete mode 100644 compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/VisualizerBlackBoxHandler.kt

diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/AbstractVisualizerBlackBoxTest.kt b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/AbstractVisualizerBlackBoxTest.kt
index 28ec22dceb3..c570b5636e9 100644
--- a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/AbstractVisualizerBlackBoxTest.kt
+++ b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/AbstractVisualizerBlackBoxTest.kt
@@ -5,6 +5,8 @@
 
 package org.jetbrains.kotlin.visualizer
 
+import org.jetbrains.kotlin.compiler.visualizer.FirVisualizer
+import org.jetbrains.kotlin.compiler.visualizer.PsiVisualizer
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.test.TestRunner
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
@@ -61,19 +63,36 @@ abstract class AbstractVisualizerBlackBoxTest {
     }
 
     fun runTest(filePath: String) {
+        lateinit var psiRenderResult: String
+        lateinit var firRenderResult: String
+
         val psiConfiguration = testConfiguration(filePath) {
             commonConfiguration()
             globalDefaults { frontend = FrontendKinds.ClassicFrontend }
         }
-        TestRunner(psiConfiguration).runTest(filePath)
+        TestRunner(psiConfiguration).runTest(filePath) { testConfiguration ->
+            val psiDependencyProvider = testConfiguration.testServices.dependencyProvider
+            val psiModule = psiDependencyProvider.getTestModule("main")
+            val psiArtifact = psiDependencyProvider.getArtifact(psiModule, FrontendKinds.ClassicFrontend)
+
+            val psiRenderer = psiArtifact.ktFiles.values.firstOrNull()?.let { PsiVisualizer(it, psiArtifact.analysisResult) }
+            psiRenderResult = psiRenderer?.render()?.trim() ?: ""
+        }
 
         val firConfiguration = testConfiguration(filePath) {
             commonConfiguration()
             globalDefaults { frontend = FrontendKinds.FIR }
         }
-        TestRunner(firConfiguration).runTest(filePath)
+        TestRunner(firConfiguration).runTest(filePath) { testConfiguration ->
+            val firDependencyProvider = testConfiguration.testServices.dependencyProvider
+            val firModule = firDependencyProvider.getTestModule("main")
+            val firArtifact = firDependencyProvider.getArtifact(firModule, FrontendKinds.FIR)
 
-        VisualizerBlackBoxHandler(psiConfiguration.testServices, firConfiguration.testServices).process()
+            val firRenderer = firArtifact.firFiles.values.firstOrNull()?.let { FirVisualizer(it) }
+            firRenderResult = firRenderer?.render()?.trim() ?: ""
+        }
+
+        psiConfiguration.testServices.assertions.assertEquals(psiRenderResult, firRenderResult)
     }
 }
 
diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/VisualizerBlackBoxHandler.kt b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/VisualizerBlackBoxHandler.kt
deleted file mode 100644
index 8ce73b7ee73..00000000000
--- a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/VisualizerBlackBoxHandler.kt
+++ /dev/null
@@ -1,35 +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.visualizer
-
-import org.jetbrains.kotlin.compiler.visualizer.FirVisualizer
-import org.jetbrains.kotlin.compiler.visualizer.PsiVisualizer
-import org.jetbrains.kotlin.test.model.FrontendKinds
-import org.jetbrains.kotlin.test.services.TestServices
-import org.jetbrains.kotlin.test.services.assertions
-import org.jetbrains.kotlin.test.services.dependencyProvider
-
-class VisualizerBlackBoxHandler(private val psiTestServices: TestServices, private val firTestServices: TestServices) {
-    private val assertions = psiTestServices.assertions
-
-    fun process() {
-        val psiDependencyProvider = psiTestServices.dependencyProvider
-        val psiModule = psiDependencyProvider.getTestModule("main")
-        val psiArtifact = psiDependencyProvider.getArtifact(psiModule, FrontendKinds.ClassicFrontend)
-
-        val firDependencyProvider = firTestServices.dependencyProvider
-        val firModule = firDependencyProvider.getTestModule("main")
-        val firArtifact = firDependencyProvider.getArtifact(firModule, FrontendKinds.FIR)
-
-        val psiRenderer = psiArtifact.ktFiles.values.firstOrNull()?.let { PsiVisualizer(it, psiArtifact.analysisResult) } ?: return
-        val psiRenderResult = psiRenderer.render()
-
-        val firRenderer = firArtifact.firFiles.values.firstOrNull()?.let { FirVisualizer(it) } ?: return
-        val firRenderResult = firRenderer.render()
-
-        assertions.assertEquals(psiRenderResult, firRenderResult)
-    }
-}
\ No newline at end of file