From 2894f87541fb806c18463a4ee231d1048a0891b8 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 19 Oct 2021 23:02:21 +0900 Subject: [PATCH] [FIR IDE] Move test configurators as constructor parameters --- .../test/AbstractKtFe10ReferenceResolveTest.kt | 6 +----- .../descriptors/test/AbstractKtFe10ResolveCallTest.kt | 6 +----- .../AbstractKtFe10ExpectedExpressionTypeTest.kt | 6 +----- .../components/AbstractKtFe10HLExpressionTypeTest.kt | 6 +----- .../components/AbstractKtFe10HasCommonSubtypeTest.kt | 6 +----- .../AbstractKtFe10OverriddenDeclarationProviderTest.kt | 7 ++----- .../test/components/AbstractKtFe10RendererTest.kt | 6 +----- .../test/scopes/AbstractKtFe10FileScopeTest.kt | 6 +----- .../scopes/AbstractKtFe10MemberScopeByFqNameTest.kt | 6 +----- .../AbstractKtFe10CompileTimeConstantEvaluatorTest.kt | 10 ++-------- .../test/symbols/AbstractKtFe10SymbolByFqNameTest.kt | 6 +----- .../test/symbols/AbstractKtFe10SymbolByPsiTest.kt | 6 +----- .../symbols/AbstractKtFe10SymbolByReferenceTest.kt | 6 +----- .../api/fir/AbstractFirReferenceResolveTest.kt | 6 +----- .../AbstractFirCompileTimeConstantEvaluatorTest.kt | 7 ++----- .../AbstractFirExpectedExpressionTypeTest.kt | 6 +----- .../api/fir/components/AbstractFirGetSuperTypesTest.kt | 6 +----- .../fir/components/AbstractFirHLExpressionTypeTest.kt | 6 +----- .../fir/components/AbstractFirHasCommonSubtypeTest.kt | 6 +----- .../AbstractFirOverriddenDeclarationProviderTest.kt | 7 ++----- .../api/fir/components/AbstractFirRendererTest.kt | 6 +----- .../api/fir/components/AbstractFirResolveCallTest.kt | 6 +----- .../fir/components/AbstractHLImportOptimizerTest.kt | 6 +----- .../api/fir/scopes/AbstractFirFileScopeTest.kt | 6 +----- .../fir/scopes/AbstractFirMemberScopeByFqNameTest.kt | 6 +----- .../api/fir/symbols/AbstractFirSymbolByFqNameTest.kt | 6 +----- .../api/fir/symbols/AbstractFirSymbolByPsiTest.kt | 6 +----- .../fir/symbols/AbstractFirSymbolByReferenceTest.kt | 6 +----- .../api/impl/barebone/test/AbstractFrontendApiTest.kt | 4 +--- .../api/impl/base/test/AbstractReferenceResolveTest.kt | 3 ++- .../AbstractCompileTimeConstantEvaluatorTest.kt | 5 ++++- .../components/AbstractExpectedExpressionTypeTest.kt | 5 ++++- .../test/components/AbstractHLExpressionTypeTest.kt | 3 ++- .../test/components/AbstractHasCommonSubtypeTest.kt | 3 ++- .../AbstractOverriddenDeclarationProviderTest.kt | 5 ++++- .../impl/base/test/components/AbstractRendererTest.kt | 3 ++- .../api/impl/base/test/fir/AbstractResolveCallTest.kt | 3 ++- .../api/impl/base/test/scopes/AbstractFileScopeTest.kt | 3 ++- .../impl/base/test/scopes/AbstractMemberScopeTest.kt | 3 ++- .../base/test/symbols/AbstractSymbolByFqNameTest.kt | 3 ++- .../impl/base/test/symbols/AbstractSymbolByPsiTest.kt | 3 ++- .../base/test/symbols/AbstractSymbolByReferenceTest.kt | 3 ++- .../api/impl/base/test/symbols/AbstractSymbolTest.kt | 3 ++- .../test/test/framework/AbstractHLApiSingleFileTest.kt | 3 ++- .../test/framework/AbstractHLApiSingleModuleTest.kt | 3 ++- .../test/base/AbstractLowLevelApiSingleModuleTest.kt | 6 +----- 46 files changed, 72 insertions(+), 167 deletions(-) diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ReferenceResolveTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ReferenceResolveTest.kt index bf319d3c901..32ce529edf0 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ReferenceResolveTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ReferenceResolveTest.kt @@ -5,10 +5,6 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.AbstractReferenceResolveTest -abstract class AbstractKtFe10ReferenceResolveTest : AbstractReferenceResolveTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = KtFe10FrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractKtFe10ReferenceResolveTest : AbstractReferenceResolveTest(KtFe10FrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ResolveCallTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ResolveCallTest.kt index 0160cd0b3ed..9010eae1939 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ResolveCallTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/AbstractKtFe10ResolveCallTest.kt @@ -5,10 +5,6 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.fir.AbstractResolveCallTest -abstract class AbstractKtFe10ResolveCallTest : AbstractResolveCallTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = KtFe10FrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractKtFe10ResolveCallTest : AbstractResolveCallTest(KtFe10FrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10ExpectedExpressionTypeTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10ExpectedExpressionTypeTest.kt index 64a4047cff7..69bfa4b7303 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10ExpectedExpressionTypeTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10ExpectedExpressionTypeTest.kt @@ -6,10 +6,6 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.components import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractExpectedExpressionTypeTest -abstract class AbstractKtFe10ExpectedExpressionTypeTest : AbstractExpectedExpressionTypeTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = KtFe10FrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractKtFe10ExpectedExpressionTypeTest : AbstractExpectedExpressionTypeTest(KtFe10FrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HLExpressionTypeTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HLExpressionTypeTest.kt index 623d00e5855..5afdc97dec7 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HLExpressionTypeTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HLExpressionTypeTest.kt @@ -6,10 +6,6 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.components import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractHLExpressionTypeTest -abstract class AbstractKtFe10HLExpressionTypeTest : AbstractHLExpressionTypeTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = KtFe10FrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractKtFe10HLExpressionTypeTest : AbstractHLExpressionTypeTest(KtFe10FrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HasCommonSubtypeTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HasCommonSubtypeTest.kt index b35664d4fc9..16b1ae38ffb 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HasCommonSubtypeTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10HasCommonSubtypeTest.kt @@ -6,10 +6,6 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.components import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractHasCommonSubtypeTest -abstract class AbstractKtFe10HasCommonSubtypeTest : AbstractHasCommonSubtypeTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = KtFe10FrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractKtFe10HasCommonSubtypeTest : AbstractHasCommonSubtypeTest(KtFe10FrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10OverriddenDeclarationProviderTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10OverriddenDeclarationProviderTest.kt index 7ef0f3f4b08..65b82ee4777 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10OverriddenDeclarationProviderTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10OverriddenDeclarationProviderTest.kt @@ -6,10 +6,7 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.components import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractOverriddenDeclarationProviderTest -abstract class AbstractKtFe10OverriddenDeclarationProviderTest : AbstractOverriddenDeclarationProviderTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = KtFe10FrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractKtFe10OverriddenDeclarationProviderTest : + AbstractOverriddenDeclarationProviderTest(KtFe10FrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10RendererTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10RendererTest.kt index 9bc5b2714de..aee118befb5 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10RendererTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/components/AbstractKtFe10RendererTest.kt @@ -6,10 +6,6 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.components import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractRendererTest -abstract class AbstractKtFe10RendererTest : AbstractRendererTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = KtFe10FrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractKtFe10RendererTest : AbstractRendererTest(KtFe10FrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10FileScopeTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10FileScopeTest.kt index 8578fcfab5a..7d97f935e1c 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10FileScopeTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10FileScopeTest.kt @@ -6,10 +6,6 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.scopes import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractFileScopeTest -abstract class AbstractKtFe10FileScopeTest : AbstractFileScopeTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = KtFe10FrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractKtFe10FileScopeTest : AbstractFileScopeTest(KtFe10FrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10MemberScopeByFqNameTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10MemberScopeByFqNameTest.kt index 94083f58c0d..c34dd6b3690 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10MemberScopeByFqNameTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/scopes/AbstractKtFe10MemberScopeByFqNameTest.kt @@ -7,14 +7,10 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.scopes import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10TestWithOutOfBlockModification -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractMemberScopeByFqNameTest import org.jetbrains.kotlin.psi.KtFile -abstract class AbstractKtFe10MemberScopeByFqNameTest : AbstractMemberScopeByFqNameTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = KtFe10FrontendApiTestConfiguratorService - +abstract class AbstractKtFe10MemberScopeByFqNameTest : AbstractMemberScopeByFqNameTest(KtFe10FrontendApiTestConfiguratorService) { override fun doOutOfBlockModification(ktFile: KtFile) { KtFe10TestWithOutOfBlockModification.doOutOfBlockModification(ktFile) } diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10CompileTimeConstantEvaluatorTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10CompileTimeConstantEvaluatorTest.kt index 49294804077..aa00ea4dbdd 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10CompileTimeConstantEvaluatorTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10CompileTimeConstantEvaluatorTest.kt @@ -6,13 +6,7 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.symbols import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractCompileTimeConstantEvaluatorTest -import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.TestServices -abstract class AbstractKtFe10CompileTimeConstantEvaluatorTest : AbstractCompileTimeConstantEvaluatorTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = KtFe10FrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractKtFe10CompileTimeConstantEvaluatorTest : + AbstractCompileTimeConstantEvaluatorTest(KtFe10FrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByFqNameTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByFqNameTest.kt index 3042af87474..492f54579cf 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByFqNameTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByFqNameTest.kt @@ -7,14 +7,10 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.symbols import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10TestWithOutOfBlockModification -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest import org.jetbrains.kotlin.psi.KtFile -abstract class AbstractKtFe10SymbolByFqNameTest : AbstractSymbolByFqNameTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = KtFe10FrontendApiTestConfiguratorService - +abstract class AbstractKtFe10SymbolByFqNameTest : AbstractSymbolByFqNameTest(KtFe10FrontendApiTestConfiguratorService) { override fun doOutOfBlockModification(ktFile: KtFile) { KtFe10TestWithOutOfBlockModification.doOutOfBlockModification(ktFile) } diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByPsiTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByPsiTest.kt index 8b3e6863b9d..ab57e39754c 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByPsiTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByPsiTest.kt @@ -7,14 +7,10 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.symbols import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10TestWithOutOfBlockModification -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest import org.jetbrains.kotlin.psi.KtFile -abstract class AbstractKtFe10SymbolByPsiTest : AbstractSymbolByPsiTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = KtFe10FrontendApiTestConfiguratorService - +abstract class AbstractKtFe10SymbolByPsiTest : AbstractSymbolByPsiTest(KtFe10FrontendApiTestConfiguratorService) { override fun doOutOfBlockModification(ktFile: KtFile) { KtFe10TestWithOutOfBlockModification.doOutOfBlockModification(ktFile) } diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByReferenceTest.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByReferenceTest.kt index dd0bf9b5035..4bbd8a50614 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByReferenceTest.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/symbols/AbstractKtFe10SymbolByReferenceTest.kt @@ -7,14 +7,10 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test.symbols import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10TestWithOutOfBlockModification -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest import org.jetbrains.kotlin.psi.KtFile -abstract class AbstractKtFe10SymbolByReferenceTest : AbstractSymbolByReferenceTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = KtFe10FrontendApiTestConfiguratorService - +abstract class AbstractKtFe10SymbolByReferenceTest : AbstractSymbolByReferenceTest(KtFe10FrontendApiTestConfiguratorService) { override fun doOutOfBlockModification(ktFile: KtFile) { KtFe10TestWithOutOfBlockModification.doOutOfBlockModification(ktFile) } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/AbstractFirReferenceResolveTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/AbstractFirReferenceResolveTest.kt index fa578b3ca1d..1cbba1275a9 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/AbstractFirReferenceResolveTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/AbstractFirReferenceResolveTest.kt @@ -5,10 +5,6 @@ package org.jetbrains.kotlin.analysis.api.fir -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.AbstractReferenceResolveTest -abstract class AbstractFirReferenceResolveTest : AbstractReferenceResolveTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractFirReferenceResolveTest : AbstractReferenceResolveTest(FirFrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirCompileTimeConstantEvaluatorTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirCompileTimeConstantEvaluatorTest.kt index e430c9f194a..0959dec4396 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirCompileTimeConstantEvaluatorTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirCompileTimeConstantEvaluatorTest.kt @@ -6,10 +6,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractCompileTimeConstantEvaluatorTest -abstract class AbstractFirCompileTimeConstantEvaluatorTest : AbstractCompileTimeConstantEvaluatorTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractFirCompileTimeConstantEvaluatorTest : + AbstractCompileTimeConstantEvaluatorTest(FirFrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirExpectedExpressionTypeTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirExpectedExpressionTypeTest.kt index dc55be028b6..267ab13d98d 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirExpectedExpressionTypeTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirExpectedExpressionTypeTest.kt @@ -6,10 +6,6 @@ package org.jetbrains.kotlin.analysis.api.fir.components import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractExpectedExpressionTypeTest -abstract class AbstractFirExpectedExpressionTypeTest : AbstractExpectedExpressionTypeTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractFirExpectedExpressionTypeTest : AbstractExpectedExpressionTypeTest(FirFrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirGetSuperTypesTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirGetSuperTypesTest.kt index 93daadc8b35..5b2bb06c799 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirGetSuperTypesTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirGetSuperTypesTest.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.analysis.api.fir.components import org.jetbrains.kotlin.analysis.api.analyse import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.api.types.KtType @@ -17,10 +16,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractFirGetSuperTypesTest : AbstractHLApiSingleFileTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService - +abstract class AbstractFirGetSuperTypesTest : AbstractHLApiSingleFileTest(FirFrontendApiTestConfiguratorService) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { val expression = testServices.expressionMarkerProvider.getSelectedElement(ktFile) diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirHLExpressionTypeTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirHLExpressionTypeTest.kt index 3a179fccfd1..fdf102cbb88 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirHLExpressionTypeTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirHLExpressionTypeTest.kt @@ -6,10 +6,6 @@ package org.jetbrains.kotlin.analysis.api.fir.components import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractHLExpressionTypeTest -abstract class AbstractFirHLExpressionTypeTest : AbstractHLExpressionTypeTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractFirHLExpressionTypeTest : AbstractHLExpressionTypeTest(FirFrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirHasCommonSubtypeTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirHasCommonSubtypeTest.kt index 587be3ac1ec..6569863380d 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirHasCommonSubtypeTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirHasCommonSubtypeTest.kt @@ -6,10 +6,6 @@ package org.jetbrains.kotlin.analysis.api.fir.components import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractHasCommonSubtypeTest -abstract class AbstractFirHasCommonSubtypeTest : AbstractHasCommonSubtypeTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractFirHasCommonSubtypeTest : AbstractHasCommonSubtypeTest(FirFrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirOverriddenDeclarationProviderTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirOverriddenDeclarationProviderTest.kt index a3217b9775d..6edbbe67cbd 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirOverriddenDeclarationProviderTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirOverriddenDeclarationProviderTest.kt @@ -6,10 +6,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractOverriddenDeclarationProviderTest -abstract class AbstractFirOverriddenDeclarationProviderTest : AbstractOverriddenDeclarationProviderTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractFirOverriddenDeclarationProviderTest : + AbstractOverriddenDeclarationProviderTest(FirFrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirRendererTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirRendererTest.kt index aa2fa99eefa..e0a05df85aa 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirRendererTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirRendererTest.kt @@ -6,10 +6,6 @@ package org.jetbrains.kotlin.analysis.api.fir.components import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractRendererTest -abstract class AbstractFirRendererTest : AbstractRendererTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractFirRendererTest : AbstractRendererTest(FirFrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirResolveCallTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirResolveCallTest.kt index d88a8e94643..1355f4e288e 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirResolveCallTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractFirResolveCallTest.kt @@ -6,10 +6,6 @@ package org.jetbrains.kotlin.analysis.api.fir.components import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.fir.AbstractResolveCallTest -abstract class AbstractFirResolveCallTest : AbstractResolveCallTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractFirResolveCallTest : AbstractResolveCallTest(FirFrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractHLImportOptimizerTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractHLImportOptimizerTest.kt index 57dbfd49282..4977b942480 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractHLImportOptimizerTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/AbstractHLImportOptimizerTest.kt @@ -6,17 +6,13 @@ package org.jetbrains.kotlin.analysis.api.fir.components import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractHLImportOptimizerTest : AbstractHLApiSingleModuleTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService - +abstract class AbstractHLImportOptimizerTest : AbstractHLApiSingleModuleTest(FirFrontendApiTestConfiguratorService) { override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { val mainKtFile = ktFiles.singleOrNull() ?: ktFiles.first { it.name == "main.kt" } val unusedImports = analyseForTest(mainKtFile) { analyseImports(mainKtFile).unusedImports } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/AbstractFirFileScopeTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/AbstractFirFileScopeTest.kt index 808898e75c3..0411370155e 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/AbstractFirFileScopeTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/AbstractFirFileScopeTest.kt @@ -6,10 +6,6 @@ package org.jetbrains.kotlin.analysis.api.fir.scopes import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractFileScopeTest -abstract class AbstractFirFileScopeTest : AbstractFileScopeTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractFirFileScopeTest : AbstractFileScopeTest(FirFrontendApiTestConfiguratorService) \ No newline at end of file diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/AbstractFirMemberScopeByFqNameTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/AbstractFirMemberScopeByFqNameTest.kt index 923ff340d7c..74cc457c2e0 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/AbstractFirMemberScopeByFqNameTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/AbstractFirMemberScopeByFqNameTest.kt @@ -7,14 +7,10 @@ package org.jetbrains.kotlin.analysis.api.fir.scopes import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.fir.FirTestWithOutOfBlockModification -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractMemberScopeByFqNameTest import org.jetbrains.kotlin.psi.KtFile -abstract class AbstractFirMemberScopeByFqNameTest : AbstractMemberScopeByFqNameTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService - +abstract class AbstractFirMemberScopeByFqNameTest : AbstractMemberScopeByFqNameTest(FirFrontendApiTestConfiguratorService) { override fun doOutOfBlockModification(ktFile: KtFile) { FirTestWithOutOfBlockModification.doOutOfBlockModification(ktFile) } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/AbstractFirSymbolByFqNameTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/AbstractFirSymbolByFqNameTest.kt index bafeb89bedc..716050b91da 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/AbstractFirSymbolByFqNameTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/AbstractFirSymbolByFqNameTest.kt @@ -7,14 +7,10 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.fir.FirTestWithOutOfBlockModification -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest import org.jetbrains.kotlin.psi.KtFile -abstract class AbstractFirSymbolByFqNameTest : AbstractSymbolByFqNameTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService - +abstract class AbstractFirSymbolByFqNameTest : AbstractSymbolByFqNameTest(FirFrontendApiTestConfiguratorService) { override fun doOutOfBlockModification(ktFile: KtFile) { FirTestWithOutOfBlockModification.doOutOfBlockModification(ktFile) } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/AbstractFirSymbolByPsiTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/AbstractFirSymbolByPsiTest.kt index 516ad182ba4..4b2e71f3714 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/AbstractFirSymbolByPsiTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/AbstractFirSymbolByPsiTest.kt @@ -7,14 +7,10 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.fir.FirTestWithOutOfBlockModification -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest import org.jetbrains.kotlin.psi.KtFile -abstract class AbstractFirSymbolByPsiTest : AbstractSymbolByPsiTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService - +abstract class AbstractFirSymbolByPsiTest : AbstractSymbolByPsiTest(FirFrontendApiTestConfiguratorService) { override fun doOutOfBlockModification(ktFile: KtFile) { FirTestWithOutOfBlockModification.doOutOfBlockModification(ktFile) } diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/AbstractFirSymbolByReferenceTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/AbstractFirSymbolByReferenceTest.kt index c86b30d080b..49cfbd1fcaf 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/AbstractFirSymbolByReferenceTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/AbstractFirSymbolByReferenceTest.kt @@ -7,14 +7,10 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.fir.FirTestWithOutOfBlockModification -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest import org.jetbrains.kotlin.psi.KtFile -abstract class AbstractFirSymbolByReferenceTest : AbstractSymbolByReferenceTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirFrontendApiTestConfiguratorService - +abstract class AbstractFirSymbolByReferenceTest : AbstractSymbolByReferenceTest(FirFrontendApiTestConfiguratorService) { override fun doOutOfBlockModification(ktFile: KtFile) { FirTestWithOutOfBlockModification.doOutOfBlockModification(ktFile) } 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 d372eba27ec..2564a483776 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 @@ -51,7 +51,7 @@ interface FrontendApiTestConfiguratorService { fun prepareTestFiles(files: List, module: TestModule, testServices: TestServices) {} } -abstract class AbstractFrontendApiTest : TestWithDisposable() { +abstract class AbstractFrontendApiTest(val configurator: FrontendApiTestConfiguratorService) : TestWithDisposable() { protected open val enableTestInDependedMode: Boolean = true protected lateinit var testInfo: KotlinTestInfo @@ -62,8 +62,6 @@ abstract class AbstractFrontendApiTest : TestWithDisposable() { protected lateinit var testDataPath: Path private set - protected abstract val configurator: FrontendApiTestConfiguratorService - protected open fun configureTest(builder: TestConfigurationBuilder) { with(configurator) { builder.configureTest(disposable) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt index 036ca49cfd9..c4b88fd7a82 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/AbstractReferenceResolveTest.kt @@ -11,6 +11,7 @@ import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions import org.jetbrains.kotlin.analysis.api.components.RendererModifier +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.analysis.api.symbols.* @@ -27,7 +28,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractReferenceResolveTest : AbstractHLApiSingleModuleTest() { +abstract class AbstractReferenceResolveTest(configurator: FrontendApiTestConfiguratorService) : AbstractHLApiSingleModuleTest(configurator) { override fun configureTest(builder: TestConfigurationBuilder) { super.configureTest(builder) with(builder) { diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractCompileTimeConstantEvaluatorTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractCompileTimeConstantEvaluatorTest.kt index 8edaff8e7ca..bf04df2e68f 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractCompileTimeConstantEvaluatorTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractCompileTimeConstantEvaluatorTest.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.api.symbols.markers.* @@ -15,7 +16,9 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractCompileTimeConstantEvaluatorTest : AbstractHLApiSingleFileTest() { +abstract class AbstractCompileTimeConstantEvaluatorTest( + configurator: FrontendApiTestConfiguratorService +) : AbstractHLApiSingleFileTest(configurator) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { super.doTestByFileStructure(ktFile, module, testServices) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractExpectedExpressionTypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractExpectedExpressionTypeTest.kt index 7dcd9da836a..920c02155e5 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractExpectedExpressionTypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractExpectedExpressionTypeTest.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtExpression @@ -13,7 +14,9 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractExpectedExpressionTypeTest : AbstractHLApiSingleFileTest() { +abstract class AbstractExpectedExpressionTypeTest( + configurator: FrontendApiTestConfiguratorService +) : AbstractHLApiSingleFileTest(configurator) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { super.doTestByFileStructure(ktFile, module, testServices) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHLExpressionTypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHLExpressionTypeTest.kt index d95f83448bc..18cbc228fd7 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHLExpressionTypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHLExpressionTypeTest.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtExpression @@ -13,7 +14,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractHLExpressionTypeTest : AbstractHLApiSingleFileTest() { +abstract class AbstractHLExpressionTypeTest(configurator: FrontendApiTestConfiguratorService) : AbstractHLApiSingleFileTest(configurator) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { super.doTestByFileStructure(ktFile, module, testServices) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHasCommonSubtypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHasCommonSubtypeTest.kt index ca62c610cf6..dea5db9c212 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHasCommonSubtypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractHasCommonSubtypeTest.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtCallExpression import org.jetbrains.kotlin.psi.KtFile @@ -21,7 +22,7 @@ import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions import java.io.File -abstract class AbstractHasCommonSubtypeTest : AbstractHLApiSingleFileTest() { +abstract class AbstractHasCommonSubtypeTest(configurator: FrontendApiTestConfiguratorService) : AbstractHLApiSingleFileTest(configurator) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { super.doTestByFileStructure(ktFile, module, testServices) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractOverriddenDeclarationProviderTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractOverriddenDeclarationProviderTest.kt index b6ed5cfde89..e71824e3cff 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractOverriddenDeclarationProviderTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractOverriddenDeclarationProviderTest.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions import org.jetbrains.kotlin.analysis.api.impl.barebone.parentsOfType +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol @@ -19,7 +20,9 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractOverriddenDeclarationProviderTest : AbstractHLApiSingleModuleTest() { +abstract class AbstractOverriddenDeclarationProviderTest( + configurator: FrontendApiTestConfiguratorService +) : AbstractHLApiSingleModuleTest(configurator) { override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { super.doTestByFileStructure(ktFiles, module, testServices) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractRendererTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractRendererTest.kt index 003f694f8da..5b0ff982b26 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractRendererTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractRendererTest.kt @@ -7,13 +7,14 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractRendererTest : AbstractHLApiSingleFileTest() { +abstract class AbstractRendererTest(configurator: FrontendApiTestConfiguratorService) : AbstractHLApiSingleFileTest(configurator) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { super.doTestByFileStructure(ktFile, module, testServices) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt index 81f0766abc0..7b49e0f1498 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/fir/AbstractResolveCallTest.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.analysis.api.calls.KtCall import org.jetbrains.kotlin.analysis.api.calls.KtDelegatedConstructorCallKind import org.jetbrains.kotlin.analysis.api.calls.KtErrorCallTarget import org.jetbrains.kotlin.analysis.api.calls.KtSuccessCallTarget +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.impl.base.KtMapBackedSubstitutor import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleModuleTest @@ -27,7 +28,7 @@ import kotlin.reflect.full.memberProperties import kotlin.reflect.full.primaryConstructor import kotlin.reflect.jvm.javaGetter -abstract class AbstractResolveCallTest : AbstractHLApiSingleModuleTest() { +abstract class AbstractResolveCallTest(configurator: FrontendApiTestConfiguratorService) : AbstractHLApiSingleModuleTest(configurator) { override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { super.doTestByFileStructure(ktFiles, module, testServices) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractFileScopeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractFileScopeTest.kt index 8710e3e7dbe..5fcce6977b7 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractFileScopeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractFileScopeTest.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.psi.KtFile @@ -12,7 +13,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractFileScopeTest : AbstractHLApiSingleFileTest() { +abstract class AbstractFileScopeTest(configurator: FrontendApiTestConfiguratorService) : AbstractHLApiSingleFileTest(configurator) { override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) { super.doTestByFileStructure(ktFile, module, testServices) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractMemberScopeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractMemberScopeTest.kt index 7cdc25dbec5..c873895dae1 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractMemberScopeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractMemberScopeTest.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.scopes import org.jetbrains.kotlin.analysis.api.KtAnalysisSession +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.SymbolByFqName import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol @@ -13,7 +14,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.services.TestServices -abstract class AbstractMemberScopeByFqNameTest : AbstractSymbolByFqNameTest() { +abstract class AbstractMemberScopeByFqNameTest(configurator: FrontendApiTestConfiguratorService) : AbstractSymbolByFqNameTest(configurator) { override fun KtAnalysisSession.collectSymbols(ktFile: KtFile, testServices: TestServices): List { val symbolData = SymbolByFqName.getSymbolDataFromFile(testDataPath) val symbols = with(symbolData) { toSymbols() } diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByFqNameTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByFqNameTest.kt index ee5896078a3..1af8b42c8b9 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByFqNameTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByFqNameTest.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols import org.jetbrains.kotlin.analysis.api.KtAnalysisSession +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.SymbolByFqName import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.psi.KtFile @@ -13,7 +14,7 @@ import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives import org.jetbrains.kotlin.test.services.TestServices -abstract class AbstractSymbolByFqNameTest : AbstractSymbolTest() { +abstract class AbstractSymbolByFqNameTest(configurator: FrontendApiTestConfiguratorService) : AbstractSymbolTest(configurator) { override fun KtAnalysisSession.collectSymbols(ktFile: KtFile, testServices: TestServices): List { val symbolData = SymbolByFqName.getSymbolDataFromFile(testDataPath) return with(symbolData) { toSymbols() } diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByPsiTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByPsiTest.kt index 95617a568f5..8def23b74d8 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByPsiTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByPsiTest.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols import org.jetbrains.kotlin.analysis.api.KtAnalysisSession +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile @@ -13,7 +14,7 @@ import org.jetbrains.kotlin.psi.KtParameter import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType import org.jetbrains.kotlin.test.services.TestServices -abstract class AbstractSymbolByPsiTest : AbstractSymbolTest() { +abstract class AbstractSymbolByPsiTest(configurator: FrontendApiTestConfiguratorService) : AbstractSymbolTest(configurator) { override fun KtAnalysisSession.collectSymbols(ktFile: KtFile, testServices: TestServices): List { return ktFile.collectDescendantsOfType { it.isValidForSymbolCreation }.map { declaration -> declaration.getSymbol() diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByReferenceTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByReferenceTest.kt index 0051d4bb8ce..dfa4b305a5f 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByReferenceTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolByReferenceTest.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols import org.jetbrains.kotlin.analysis.api.KtAnalysisSession +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.idea.references.mainReference @@ -13,7 +14,7 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtNameReferenceExpression import org.jetbrains.kotlin.test.services.TestServices -abstract class AbstractSymbolByReferenceTest : AbstractSymbolTest() { +abstract class AbstractSymbolByReferenceTest(configurator: FrontendApiTestConfiguratorService) : AbstractSymbolTest(configurator) { override fun KtAnalysisSession.collectSymbols(ktFile: KtFile, testServices: TestServices): List { val referenceExpression = testServices.expressionMarkerProvider.getElementOfTypAtCaret(ktFile) return listOfNotNull(referenceExpression.mainReference.resolveToSymbol()) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolTest.kt index 07d6a57dd4d..f9192703e4c 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/symbols/AbstractSymbolTest.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols import org.jetbrains.kotlin.analysis.api.KtAnalysisSession +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol @@ -18,7 +19,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions -abstract class AbstractSymbolTest : AbstractHLApiSingleFileTest() { +abstract class AbstractSymbolTest(configurator: FrontendApiTestConfiguratorService) : AbstractHLApiSingleFileTest(configurator) { override fun configureTest(builder: TestConfigurationBuilder) { super.configureTest(builder) with(builder) { diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleFileTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleFileTest.kt index a65f639697a..6fd1687afb1 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleFileTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleFileTest.kt @@ -5,11 +5,12 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices -abstract class AbstractHLApiSingleFileTest : AbstractHLApiSingleModuleTest() { +abstract class AbstractHLApiSingleFileTest(configurator: FrontendApiTestConfiguratorService) : AbstractHLApiSingleModuleTest(configurator) { final override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { val singleFile = ktFiles.single() doTestByFileStructure(singleFile, module, testServices) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleModuleTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleModuleTest.kt index eb3db491680..c92e403ce4e 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleModuleTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleModuleTest.kt @@ -11,13 +11,14 @@ import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.analyse import org.jetbrains.kotlin.analysis.api.analyseInDependedAnalysisSession import org.jetbrains.kotlin.analysis.api.impl.barebone.test.AbstractFrontendApiTest +import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestModuleStructure import org.jetbrains.kotlin.test.services.TestServices -abstract class AbstractHLApiSingleModuleTest : AbstractFrontendApiTest() { +abstract class AbstractHLApiSingleModuleTest(configurator: FrontendApiTestConfiguratorService) : AbstractFrontendApiTest(configurator) { final override fun doTestByFileStructure(ktFiles: List, moduleStructure: TestModuleStructure, testServices: TestServices) { val singleModule = moduleStructure.modules.single() doTestByFileStructure(ktFiles, singleModule, testServices) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiSingleModuleTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiSingleModuleTest.kt index 210587b2c27..c7516d296d1 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiSingleModuleTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/AbstractLowLevelApiSingleModuleTest.kt @@ -6,9 +6,5 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.test.base import org.jetbrains.kotlin.analysis.api.impl.barebone.test.AbstractFrontendApiTest -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService -abstract class AbstractLowLevelApiSingleModuleTest : AbstractFrontendApiTest() { - override val configurator: FrontendApiTestConfiguratorService - get() = FirLowLevelFrontendApiTestConfiguratorService -} \ No newline at end of file +abstract class AbstractLowLevelApiSingleModuleTest : AbstractFrontendApiTest(FirLowLevelFrontendApiTestConfiguratorService) \ No newline at end of file