From 7c3706dd3f5f3c8a0495d56f1260222eb427da95 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 20 Oct 2021 00:53:16 +0900 Subject: [PATCH] [FIR IDE] Disable dependent analysis session tests for FE10 implementation --- .../test/KtFe10FrontendApiTestConfiguratorService.kt | 3 +++ .../api/impl/barebone/test/AbstractFrontendApiTest.kt | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10FrontendApiTestConfiguratorService.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10FrontendApiTestConfiguratorService.kt index 738315a0e7a..1f575725368 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10FrontendApiTestConfiguratorService.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10FrontendApiTestConfiguratorService.kt @@ -32,6 +32,9 @@ object KtFe10FrontendApiTestConfiguratorService : FrontendApiTestConfiguratorSer override val testPrefix: String get() = "descriptors" + override val allowDependedAnalysisSession: Boolean + get() = false + override fun TestConfigurationBuilder.configureTest(disposable: Disposable) { usePreAnalysisHandlers(::KtFe10ModuleRegistrarPreAnalysisHandler.bind(disposable)) } diff --git a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractFrontendApiTest.kt b/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractFrontendApiTest.kt index 963705e390b..e3b1a6c207c 100644 --- a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractFrontendApiTest.kt +++ b/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractFrontendApiTest.kt @@ -40,6 +40,9 @@ interface FrontendApiTestConfiguratorService { val testPrefix: String? get() = null + val allowDependedAnalysisSession: Boolean + get() = true + fun TestConfigurationBuilder.configureTest(disposable: Disposable) fun processTestFiles(files: List): List = files @@ -54,7 +57,8 @@ interface FrontendApiTestConfiguratorService { } abstract class AbstractFrontendApiTest(val configurator: FrontendApiTestConfiguratorService) : TestWithDisposable() { - protected open val enableTestInDependedMode: Boolean = true + protected open val enableTestInDependedMode: Boolean + get() = configurator.allowDependedAnalysisSession protected lateinit var testInfo: KotlinTestInfo private set