azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[VISUALIZER] Rewrite black box runner using callback to TestRunner

Browse Source
This commit is contained in:
Ivan Kylchik
2021-03-17 17:05:43 +03:00
committed by TeamCityServer
parent dbf1f54c3f
commit 097b5a74fb
2 changed files with 22 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/AbstractVisualizerBlackBoxTest.kt
+22 -3
View File
@@ -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)
}
}
compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/VisualizerBlackBoxHandler.kt
-35
View File
@@ -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)
}
}