[VISUALIZER] Remove unnecessary abstract property frontendFacade
Right frontend facade will be chosen by frontendKind
This commit is contained in:
committed by
TeamCityServer
parent
e19514f1dc
commit
29920d729f
@@ -9,8 +9,9 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
|
|||||||
import org.jetbrains.kotlin.test.Constructor
|
import org.jetbrains.kotlin.test.Constructor
|
||||||
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
|
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
|
||||||
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
|
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
|
||||||
|
import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade
|
||||||
|
import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade
|
||||||
import org.jetbrains.kotlin.test.model.DependencyKind
|
import org.jetbrains.kotlin.test.model.DependencyKind
|
||||||
import org.jetbrains.kotlin.test.model.FrontendFacade
|
|
||||||
import org.jetbrains.kotlin.test.model.FrontendKind
|
import org.jetbrains.kotlin.test.model.FrontendKind
|
||||||
import org.jetbrains.kotlin.test.model.FrontendOutputHandler
|
import org.jetbrains.kotlin.test.model.FrontendOutputHandler
|
||||||
import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest
|
import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest
|
||||||
@@ -20,7 +21,6 @@ import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurat
|
|||||||
abstract class AbstractVisualizerTest : AbstractKotlinCompilerTest() {
|
abstract class AbstractVisualizerTest : AbstractKotlinCompilerTest() {
|
||||||
abstract val handler: Constructor<FrontendOutputHandler<*>>
|
abstract val handler: Constructor<FrontendOutputHandler<*>>
|
||||||
abstract val frontendKind: FrontendKind<*>
|
abstract val frontendKind: FrontendKind<*>
|
||||||
abstract val frontendFacade: Constructor<FrontendFacade<*>>
|
|
||||||
|
|
||||||
override fun TestConfigurationBuilder.configuration() {
|
override fun TestConfigurationBuilder.configuration() {
|
||||||
globalDefaults {
|
globalDefaults {
|
||||||
@@ -33,7 +33,10 @@ abstract class AbstractVisualizerTest : AbstractKotlinCompilerTest() {
|
|||||||
::CommonEnvironmentConfigurator,
|
::CommonEnvironmentConfigurator,
|
||||||
::JvmEnvironmentConfigurator,
|
::JvmEnvironmentConfigurator,
|
||||||
)
|
)
|
||||||
useFrontendFacades(frontendFacade)
|
useFrontendFacades(
|
||||||
|
::FirFrontendFacade,
|
||||||
|
::ClassicFrontendFacade
|
||||||
|
)
|
||||||
useFrontendHandlers(handler)
|
useFrontendHandlers(handler)
|
||||||
|
|
||||||
defaultDirectives {
|
defaultDirectives {
|
||||||
|
|||||||
-2
@@ -12,7 +12,5 @@ import org.jetbrains.kotlin.visualizer.AbstractVisualizerTest
|
|||||||
|
|
||||||
abstract class AbstractFirVisualizerTest : AbstractVisualizerTest() {
|
abstract class AbstractFirVisualizerTest : AbstractVisualizerTest() {
|
||||||
override val frontendKind: FrontendKind<*> = FrontendKinds.FIR
|
override val frontendKind: FrontendKind<*> = FrontendKinds.FIR
|
||||||
override val frontendFacade: Constructor<FrontendFacade<*>> = ::FirFrontendFacade
|
|
||||||
override val handler: Constructor<FrontendOutputHandler<*>> = ::FirOutputHandler
|
override val handler: Constructor<FrontendOutputHandler<*>> = ::FirOutputHandler
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ import java.io.File
|
|||||||
|
|
||||||
internal class FirOutputHandler(testServices: TestServices) : FirAnalysisHandler(testServices) {
|
internal class FirOutputHandler(testServices: TestServices) : FirAnalysisHandler(testServices) {
|
||||||
override fun processModule(module: TestModule, info: FirOutputArtifact) {
|
override fun processModule(module: TestModule, info: FirOutputArtifact) {
|
||||||
val renderer = FirVisualizer(info.firFiles.values.first())
|
val renderer = info.firFiles.values.firstOrNull()?.let { FirVisualizer(it) } ?: return
|
||||||
val firRenderResult = renderer.render()
|
val firRenderResult = renderer.render().trim()
|
||||||
|
|
||||||
val replaceFrom = module.directives[VisualizerDirectives.TEST_FILE_PATH].first()
|
val replaceFrom = module.directives[VisualizerDirectives.TEST_FILE_PATH].first()
|
||||||
val replaceTo = module.directives[VisualizerDirectives.EXPECTED_FILE_PATH].first()
|
val replaceTo = module.directives[VisualizerDirectives.EXPECTED_FILE_PATH].first()
|
||||||
|
|||||||
-1
@@ -12,6 +12,5 @@ import org.jetbrains.kotlin.visualizer.AbstractVisualizerTest
|
|||||||
|
|
||||||
abstract class AbstractPsiVisualizerTest : AbstractVisualizerTest() {
|
abstract class AbstractPsiVisualizerTest : AbstractVisualizerTest() {
|
||||||
override val frontendKind: FrontendKind<*> = FrontendKinds.ClassicFrontend
|
override val frontendKind: FrontendKind<*> = FrontendKinds.ClassicFrontend
|
||||||
override val frontendFacade: Constructor<FrontendFacade<*>> = ::ClassicFrontendFacade
|
|
||||||
override val handler: Constructor<FrontendOutputHandler<*>> = ::PsiOutputHandler
|
override val handler: Constructor<FrontendOutputHandler<*>> = ::PsiOutputHandler
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import java.io.File
|
|||||||
|
|
||||||
internal class PsiOutputHandler(testServices: TestServices) : ClassicFrontendAnalysisHandler(testServices) {
|
internal class PsiOutputHandler(testServices: TestServices) : ClassicFrontendAnalysisHandler(testServices) {
|
||||||
override fun processModule(module: TestModule, info: ClassicFrontendOutputArtifact) {
|
override fun processModule(module: TestModule, info: ClassicFrontendOutputArtifact) {
|
||||||
val renderer = PsiVisualizer(info.ktFiles.values.first(), info.analysisResult)
|
val renderer = info.ktFiles.values.firstOrNull()?.let { PsiVisualizer(it, info.analysisResult) } ?: return
|
||||||
val psiRenderResult = renderer.render()
|
val psiRenderResult = renderer.render()
|
||||||
|
|
||||||
val replaceFrom = module.directives[VisualizerDirectives.TEST_FILE_PATH].first()
|
val replaceFrom = module.directives[VisualizerDirectives.TEST_FILE_PATH].first()
|
||||||
|
|||||||
Reference in New Issue
Block a user