From 3838552a759f0512377cc8ce4558e4eb8696b73c Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 16 Mar 2022 18:11:28 +0100 Subject: [PATCH] [analysis api] move some test framework parts to a separate module --- analysis/analysis-api-fe10/build.gradle.kts | 2 + ...tFe10FrontendApiTestConfiguratorService.kt | 2 +- ...KtFe10ModuleRegistrarPreAnalysisHandler.kt | 4 +- ...nnotationsOnDeclarationsTestGenerated.java | 2 +- ...sisApiAnnotationsOnTypesTestGenerated.java | 2 +- .../Fe10ResolveCallTestGenerated.java | 2 +- .../Fe10ResolveCandidatesTestGenerated.java | 2 +- ...ileTimeConstantEvaluatorTestGenerated.java | 2 +- .../Fe10CollectDiagnosticsTestGenerated.java | 2 +- .../Fe10ReturnTargetSymbolTestGenerated.java | 2 +- .../Fe10WhenMissingCasesTestGenerated.java | 2 +- ...e10DeclarationReturnTypeTestGenerated.java | 2 +- ...10ExpectedExpressionTypeTestGenerated.java | 2 +- .../Fe10HLExpressionTypeTestGenerated.java | 2 +- .../Fe10HLSmartCastInfoTestGenerated.java | 2 +- .../Fe10IsSubclassOfTestGenerated.java | 2 +- ...iddenDeclarationProviderTestGenerated.java | 2 +- .../Fe10RendererTestGenerated.java | 2 +- .../Fe10TypeParameterTypeTestGenerated.java | 2 +- .../Fe10IsDenotableTestGenerated.java | 2 +- .../Fe10HasCommonSubtypeTestGenerated.java | 2 +- .../Fe10SymbolByFqNameTestGenerated.java | 2 +- .../symbols/Fe10SymbolByPsiTestGenerated.java | 2 +- .../Fe10SymbolByReferenceTestGenerated.java | 2 +- analysis/analysis-api-fir/build.gradle.kts | 1 + .../FirFrontendApiTestConfiguratorService.kt | 2 +- ...rySourceReferenceResolveTestGenerated.java | 2 +- ...irSourceReferenceResolveTestGenerated.java | 2 +- ...nnotationsOnDeclarationsTestGenerated.java | 2 +- ...sisApiAnnotationsOnFilesTestGenerated.java | 2 +- ...sisApiAnnotationsOnTypesTestGenerated.java | 2 +- .../FirResolveCallTestGenerated.java | 2 +- .../FirResolveCandidatesTestGenerated.java | 2 +- ...ileTimeConstantEvaluatorTestGenerated.java | 2 +- .../FirCollectDiagnosticsTestGenerated.java | 2 +- .../FirReturnTargetSymbolTestGenerated.java | 2 +- .../FirWhenMissingCasesTestGenerated.java | 2 +- ...FirDeclarationReturnTypeTestGenerated.java | 2 +- ...irExpectedExpressionTypeTestGenerated.java | 2 +- .../FirHLExpressionTypeTestGenerated.java | 2 +- .../AbstractHLImportOptimizerTest.kt | 2 +- .../AbstractExpressionPsiTypeProviderTest.kt | 4 +- .../AbstractPsiTypeProviderTest.kt | 4 +- .../FirHLSmartCastInfoTestGenerated.java | 2 +- .../FirIsSubclassOfTestGenerated.java | 2 +- ...iddenDeclarationProviderTestGenerated.java | 2 +- .../FirRendererTestGenerated.java | 2 +- .../FirTypeParameterTypeTestGenerated.java | 2 +- .../FirFunctionClassKindTestGenerated.java | 2 +- .../FirIsDenotableTestGenerated.java | 2 +- .../AbstractFirGetSuperTypesTest.kt | 4 +- .../FirHasCommonSubtypeTestGenerated.java | 2 +- .../FirHLImportOptimizerTestGenerated.java | 2 +- ...xpressionPsiTypeProviderTestGenerated.java | 2 +- .../FirPsiTypeProviderTestGenerated.java | 2 +- .../FirFirGetSuperTypesTestGenerated.java | 2 +- .../FirDelegateMemberScopeTestGenerated.java | 2 +- .../fir/scopes/FirFileScopeTestGenerated.java | 2 +- .../FirMemberScopeByFqNameTestGenerated.java | 2 +- ...utionOverridesUnwrappingTestGenerated.java | 2 +- .../FirSymbolByFqNameTestGenerated.java | 2 +- .../symbols/FirSymbolByPsiTestGenerated.java | 2 +- .../FirSymbolByReferenceTestGenerated.java | 2 +- ...braryFrontendApiTestConfiguratorService.kt | 4 +- ...ibraryModuleRegistrarPreAnalysisHandler.kt | 6 +- ...ourceFrontendApiTestConfiguratorService.kt | 6 +- ...SourceModuleRegistrarPreAnalysisHandler.kt | 6 +- .../test/AbstractCompilerBasedTest.kt | 2 +- .../analysis-api-impl-base/build.gradle.kts | 1 + .../base/test/AbstractReferenceResolveTest.kt | 5 +- ...nalysisApiAnnotationsOnDeclarationsTest.kt | 9 +-- ...stractAnalysisApiAnnotationsOnFilesTest.kt | 3 +- .../AnalysisApiAnnotationsOnTypesTest.kt | 7 +- .../annotations/TestAnnotationRenderer.kt | 2 +- .../components/AbstractResolveCallTest.kt | 4 +- .../AbstractResolveCandidatesTest.kt | 4 +- ...bstractCompileTimeConstantEvaluatorTest.kt | 4 +- .../AbstractCollectDiagnosticsTest.kt | 3 +- .../AbstractReturnTargetSymbolTest.kt | 5 +- .../AbstractWhenMissingCasesTest.kt | 6 +- .../AbstractDeclarationReturnTypeTest.kt | 6 +- .../AbstractExpectedExpressionTypeTest.kt | 6 +- .../AbstractHLExpressionTypeTest.kt | 6 +- .../AbstractHLSmartCastInfoTest.kt | 6 +- .../AbstractIsSubclassOfTest.kt | 4 +- ...stractOverriddenDeclarationProviderTest.kt | 6 +- .../AbstractRendererTest.kt | 4 +- .../AbstractTypeParameterTypeTest.kt | 6 +- .../AbstractFunctionClassKindTest.kt | 6 +- .../AbstractIsDenotableTest.kt | 4 +- .../AbstractHasCommonSubtypeTest.kt | 4 +- .../scopes/AbstractDelegateMemberScopeTest.kt | 2 +- .../base/test/scopes/AbstractFileScopeTest.kt | 4 +- .../test/scopes/AbstractMemberScopeTest.kt | 2 +- ...ractSubstitutionOverridesUnwrappingTest.kt | 4 +- .../symbols/AbstractSymbolByFqNameTest.kt | 2 +- .../test/symbols/AbstractSymbolByPsiTest.kt | 2 +- .../symbols/AbstractSymbolByReferenceTest.kt | 4 +- .../base/test/symbols/AbstractSymbolTest.kt | 4 +- .../AbstractStandaloneModeSingleModuleTest.kt | 4 +- .../StandaloneModeConfiguratorService.kt | 2 +- ...andaloneModeSingleModuleTestGenerated.java | 2 +- .../analysis-test-framework/build.gradle.kts | 32 ++++++++ .../FrontendApiTestConfiguratorService.kt | 44 +++++++++++ .../test/framework}/TestWithDisposable.kt | 4 +- .../base}/AbstractHLApiSingleFileTest.kt | 5 +- .../base}/AbstractHLApiSingleModuleTest.kt | 7 +- .../framework/base/AnalysisApiBasedTest.kt} | 74 ++++--------------- .../KotlinProjectStructureProviderTestImpl.kt | 3 +- .../structure}/TestKtModuleProvider.kt | 4 +- .../project/structure}/TestKtSourceModule.kt | 2 +- .../structure/projectStructureUtils.kt | 20 +++++ ...ExpressionMarkersSourceFilePreprocessor.kt | 2 +- .../libraries/CompiledLibraryProvider.kt | 2 +- .../services}/libraries/CompilerExecutor.kt | 4 +- .../LibraryEnvironmentConfigurator.kt | 2 +- .../services}/libraries/TestModuleCompiler.kt | 2 +- .../framework/utils}/SkipTestException.kt | 2 +- .../test/framework/utils}/commonTestUtils.kt | 4 +- analysis/low-level-api-fir/build.gradle.kts | 1 + .../api/fir/AbstractGetOrBuildFirTest.kt | 2 +- .../based/AbstractCompilerBasedTestForFir.kt | 9 ++- .../ModuleRegistrarPreAnalysisHandler.kt | 8 +- .../AbstractLowLevelApiSingleModuleTest.kt | 7 +- ...LevelFrontendApiTestConfiguratorService.kt | 2 +- .../AbstractSymbolLightClassesFacadeTest.kt | 2 +- .../AbstractSymbolLightClassesLoadingTest.kt | 2 +- .../base/AbstractSymbolLightClassesTest.kt | 2 +- .../AbstractSymbolLightClassesTestBase.kt | 4 +- ...braryFrontendApiTestConfiguratorService.kt | 2 +- settings.gradle | 1 + 131 files changed, 302 insertions(+), 253 deletions(-) create mode 100644 analysis/analysis-test-framework/build.gradle.kts create mode 100644 analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/FrontendApiTestConfiguratorService.kt rename analysis/{analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test => analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework}/TestWithDisposable.kt (86%) rename analysis/{analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework => analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base}/AbstractHLApiSingleFileTest.kt (76%) rename analysis/{analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework => analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base}/AbstractHLApiSingleModuleTest.kt (88%) rename analysis/{analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractFrontendApiTest.kt => analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AnalysisApiBasedTest.kt} (78%) rename analysis/{analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test => analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure}/KotlinProjectStructureProviderTestImpl.kt (87%) rename analysis/{analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test => analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure}/TestKtModuleProvider.kt (89%) rename analysis/{analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test => analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure}/TestKtSourceModule.kt (98%) create mode 100644 analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/projectStructureUtils.kt rename analysis/{analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test => analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services}/ExpressionMarkersSourceFilePreprocessor.kt (98%) rename analysis/{analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils => analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services}/libraries/CompiledLibraryProvider.kt (94%) rename analysis/{analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils => analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services}/libraries/CompilerExecutor.kt (94%) rename analysis/{analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils => analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services}/libraries/LibraryEnvironmentConfigurator.kt (92%) rename analysis/{analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils => analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services}/libraries/TestModuleCompiler.kt (97%) rename analysis/{analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test => analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/utils}/SkipTestException.kt (81%) rename analysis/{analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test => analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/utils}/commonTestUtils.kt (95%) diff --git a/analysis/analysis-api-fe10/build.gradle.kts b/analysis/analysis-api-fe10/build.gradle.kts index f7dfcd06ac9..f2719bc3cb6 100644 --- a/analysis/analysis-api-fe10/build.gradle.kts +++ b/analysis/analysis-api-fe10/build.gradle.kts @@ -24,6 +24,8 @@ dependencies { testImplementation(projectTests(":compiler:tests-common-new")) testImplementation(projectTests(":analysis:analysis-api-impl-barebone")) testImplementation(projectTests(":analysis:analysis-api-impl-base")) + testImplementation(projectTests(":analysis:analysis-test-framework")) + } sourceSets { 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 3e45aa7fa88..ee480763344 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 @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisHandlerExtension import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSessionProvider import org.jetbrains.kotlin.analysis.api.descriptors.references.base.KtFe10KotlinReferenceProviderContributor -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.references.HLApiReferenceProviderService import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider import org.jetbrains.kotlin.config.CompilerConfiguration diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10ModuleRegistrarPreAnalysisHandler.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10ModuleRegistrarPreAnalysisHandler.kt index 76c9a1b7acd..9cd6d387307 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10ModuleRegistrarPreAnalysisHandler.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/descriptors/test/KtFe10ModuleRegistrarPreAnalysisHandler.kt @@ -7,14 +7,14 @@ package org.jetbrains.kotlin.analysis.api.descriptors.test import com.intellij.mock.MockProject import com.intellij.openapi.Disposable -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.TestKtSourceModule -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.projectModuleProvider import org.jetbrains.kotlin.analysis.providers.KotlinDeclarationProviderFactory import org.jetbrains.kotlin.analysis.providers.KotlinModificationTrackerFactory import org.jetbrains.kotlin.analysis.providers.KotlinPackageProviderFactory import org.jetbrains.kotlin.analysis.providers.impl.KotlinStaticDeclarationProviderFactory import org.jetbrains.kotlin.analysis.providers.impl.KotlinStaticModificationTrackerFactory import org.jetbrains.kotlin.analysis.providers.impl.KotlinStaticPackageProviderFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestKtSourceModule +import org.jetbrains.kotlin.analysis.test.framework.project.structure.projectModuleProvider import org.jetbrains.kotlin.test.services.* class KtFe10ModuleRegistrarPreAnalysisHandler( diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnDeclarationsTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnDeclarationsTestGenerated.java index 5f70d8bf2ef..8cf62fbd7f8 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnDeclarationsTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnDeclarationsTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.annotations; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnDeclarationsTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnTypesTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnTypesTestGenerated.java index 03d506a8b54..c922571d663 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnTypesTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/annotations/Fe10AnalysisApiAnnotationsOnTypesTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.annotations; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnTypesTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCallTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCallTestGenerated.java index e146b20af5c..be73db0e437 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCallTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCallTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCandidatesTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCandidatesTestGenerated.java index 7e918c9298f..c98cfb1b0c0 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCandidatesTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/Fe10ResolveCandidatesTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCandidatesTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorTestGenerated.java index c530fad7805..112ea712b3c 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.compileTimeConstantPro import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/diagnosticProvider/Fe10CollectDiagnosticsTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/diagnosticProvider/Fe10CollectDiagnosticsTestGenerated.java index 385d247e465..423616d2a9e 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/diagnosticProvider/Fe10CollectDiagnosticsTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/diagnosticProvider/Fe10CollectDiagnosticsTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.diagnosticProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.diagnosticProvider.AbstractCollectDiagnosticsTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10ReturnTargetSymbolTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10ReturnTargetSymbolTestGenerated.java index 76c757d0b07..581b176ae1c 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10ReturnTargetSymbolTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10ReturnTargetSymbolTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionInfoProvider import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractReturnTargetSymbolTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10WhenMissingCasesTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10WhenMissingCasesTestGenerated.java index b5b4d69c371..cc36c2f22d0 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10WhenMissingCasesTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionInfoProvider/Fe10WhenMissingCasesTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionInfoProvider import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractWhenMissingCasesTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10DeclarationReturnTypeTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10DeclarationReturnTypeTestGenerated.java index 4b296967adf..cdc6087bf32 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10DeclarationReturnTypeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10DeclarationReturnTypeTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionTypeProvider import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractDeclarationReturnTypeTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10ExpectedExpressionTypeTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10ExpectedExpressionTypeTestGenerated.java index c4cb3e7c23f..52024171e4d 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10ExpectedExpressionTypeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10ExpectedExpressionTypeTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionTypeProvider import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractExpectedExpressionTypeTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10HLExpressionTypeTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10HLExpressionTypeTestGenerated.java index b33d1f007c6..9c20aa3cf59 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10HLExpressionTypeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/expressionTypeProvider/Fe10HLExpressionTypeTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.expressionTypeProvider import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractHLExpressionTypeTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/smartCastProvider/Fe10HLSmartCastInfoTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/smartCastProvider/Fe10HLSmartCastInfoTestGenerated.java index 763f342048b..c6dee54b86c 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/smartCastProvider/Fe10HLSmartCastInfoTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/smartCastProvider/Fe10HLSmartCastInfoTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.smartCastProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.smartCastProvider.AbstractHLSmartCastInfoTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10IsSubclassOfTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10IsSubclassOfTestGenerated.java index 1b526e2f061..87d69507230 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10IsSubclassOfTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10IsSubclassOfTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.symbolDeclarationOverr import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractIsSubclassOfTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10OverriddenDeclarationProviderTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10OverriddenDeclarationProviderTestGenerated.java index 77ff2408c1a..85bc63ecd7f 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10OverriddenDeclarationProviderTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationOverridesProvider/Fe10OverriddenDeclarationProviderTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.symbolDeclarationOverr import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractOverriddenDeclarationProviderTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationRenderer/Fe10RendererTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationRenderer/Fe10RendererTestGenerated.java index 0bf88de8dad..c410e28ef4d 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationRenderer/Fe10RendererTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/symbolDeclarationRenderer/Fe10RendererTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.symbolDeclarationRende import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationRenderer.AbstractRendererTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeCreator/Fe10TypeParameterTypeTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeCreator/Fe10TypeParameterTypeTestGenerated.java index beedad8353d..d0076fb5c95 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeCreator/Fe10TypeParameterTypeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeCreator/Fe10TypeParameterTypeTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.typeCreator; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeCreator.AbstractTypeParameterTypeTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeInfoProvider/Fe10IsDenotableTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeInfoProvider/Fe10IsDenotableTestGenerated.java index 6e6122a56f8..41dab717a0a 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeInfoProvider/Fe10IsDenotableTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeInfoProvider/Fe10IsDenotableTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.typeInfoProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractIsDenotableTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeProvider/Fe10HasCommonSubtypeTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeProvider/Fe10HasCommonSubtypeTestGenerated.java index 3d7ee405f38..28bf10ba0e8 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeProvider/Fe10HasCommonSubtypeTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/typeProvider/Fe10HasCommonSubtypeTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.components.typeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeProvider.AbstractHasCommonSubtypeTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByFqNameTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByFqNameTestGenerated.java index 689e42edc7c..02fd0bd7f36 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByFqNameTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByFqNameTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByPsiTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByPsiTestGenerated.java index 8510dab19ae..72633f52e16 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByPsiTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByPsiTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByReferenceTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByReferenceTestGenerated.java index 75d5e3f371f..ae06ed2dcfe 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByReferenceTestGenerated.java +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/symbols/Fe10SymbolByReferenceTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fe10.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/build.gradle.kts b/analysis/analysis-api-fir/build.gradle.kts index 95a449767e0..445a8fa73ce 100644 --- a/analysis/analysis-api-fir/build.gradle.kts +++ b/analysis/analysis-api-fir/build.gradle.kts @@ -33,6 +33,7 @@ dependencies { testApi(project(":analysis:decompiled:decompiler-to-file-stubs")) testApi(project(":analysis:decompiled:decompiler-to-psi")) testApi(project(":kotlin-test:kotlin-test-junit")) + testImplementation(projectTests(":analysis:analysis-test-framework")) testApi(toolsJar()) testApiJUnit5() diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirFrontendApiTestConfiguratorService.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirFrontendApiTestConfiguratorService.kt index a46a43ebfd6..da5a1d8ac22 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirFrontendApiTestConfiguratorService.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirFrontendApiTestConfiguratorService.kt @@ -11,10 +11,10 @@ import com.intellij.openapi.Disposable import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.analysis.api.fir.utils.configureOptionalTestCompilerPlugin -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.references.HLApiReferenceProviderService import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.FirLowLevelFrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.idea.references.KotlinFirReferenceContributor import org.jetbrains.kotlin.idea.references.KotlinReferenceProviderContributor diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirLibrarySourceReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirLibrarySourceReferenceResolveTestGenerated.java index c14c9fd9b96..95ab9d2ac58 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirLibrarySourceReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirLibrarySourceReferenceResolveTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.utils.libraries.source.LibrarySourceFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.AbstractReferenceResolveTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirSourceReferenceResolveTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirSourceReferenceResolveTestGenerated.java index 4bc2cb0222d..526ff9a02c6 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirSourceReferenceResolveTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirSourceReferenceResolveTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.AbstractReferenceResolveTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnDeclarationsTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnDeclarationsTestGenerated.java index fefed053eb3..f3a45d2cc3f 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnDeclarationsTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnDeclarationsTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.annotations; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnDeclarationsTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnFilesTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnFilesTestGenerated.java index 63c7a7d0dc1..5523b4e119d 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnFilesTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnFilesTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.annotations; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnFilesTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnTypesTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnTypesTestGenerated.java index 259b46a5703..13d6bfb502e 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnTypesTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/annotations/FirAnalysisApiAnnotationsOnTypesTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.annotations; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnTypesTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCallTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCallTestGenerated.java index f6d447a11ed..2181d03cf12 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCallTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCallTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCandidatesTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCandidatesTestGenerated.java index b0507319932..7aa945f051c 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCandidatesTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/FirResolveCandidatesTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCandidatesTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.java index 54de7e23ecb..a55e027699a 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.compileTimeConstantProv import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/diagnosticProvider/FirCollectDiagnosticsTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/diagnosticProvider/FirCollectDiagnosticsTestGenerated.java index 26a6bee8703..aca14442070 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/diagnosticProvider/FirCollectDiagnosticsTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/diagnosticProvider/FirCollectDiagnosticsTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.diagnosticProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.diagnosticProvider.AbstractCollectDiagnosticsTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirReturnTargetSymbolTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirReturnTargetSymbolTestGenerated.java index f167f9a6fe5..0b778b00990 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirReturnTargetSymbolTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirReturnTargetSymbolTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionInfoProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractReturnTargetSymbolTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirWhenMissingCasesTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirWhenMissingCasesTestGenerated.java index 5a2da08902a..fe5f9d3d54a 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirWhenMissingCasesTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionInfoProvider/FirWhenMissingCasesTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionInfoProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractWhenMissingCasesTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirDeclarationReturnTypeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirDeclarationReturnTypeTestGenerated.java index c17b75aee12..e0fc88a1b55 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirDeclarationReturnTypeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirDeclarationReturnTypeTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionTypeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractDeclarationReturnTypeTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirExpectedExpressionTypeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirExpectedExpressionTypeTestGenerated.java index cf3018e7a54..f9ef50582db 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirExpectedExpressionTypeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirExpectedExpressionTypeTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionTypeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractExpectedExpressionTypeTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirHLExpressionTypeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirHLExpressionTypeTestGenerated.java index 232763ab3e8..99f8ecb4425 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirHLExpressionTypeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/expressionTypeProvider/FirHLExpressionTypeTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.expressionTypeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider.AbstractHLExpressionTypeTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/AbstractHLImportOptimizerTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/AbstractHLImportOptimizerTest.kt index b1166b5ded7..ac07553628c 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/AbstractHLImportOptimizerTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/AbstractHLImportOptimizerTest.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.importOptimizer import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleModuleTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractExpressionPsiTypeProviderTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractExpressionPsiTypeProviderTest.kt index 01d5f3ee583..984af6cc0bd 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractExpressionPsiTypeProviderTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractExpressionPsiTypeProviderTest.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider import org.jetbrains.kotlin.analysis.api.analyse import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -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.test.framework.services.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractPsiTypeProviderTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractPsiTypeProviderTest.kt index 00b5aeadb9c..383205ebf21 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractPsiTypeProviderTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/AbstractPsiTypeProviderTest.kt @@ -11,8 +11,8 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiElementVisitor import org.jetbrains.kotlin.analysis.api.analyse import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -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.test.framework.services.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.elements.KtLightElement diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/smartCastProvider/FirHLSmartCastInfoTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/smartCastProvider/FirHLSmartCastInfoTestGenerated.java index 94b6902c07e..b7312254113 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/smartCastProvider/FirHLSmartCastInfoTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/smartCastProvider/FirHLSmartCastInfoTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.smartCastProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.smartCastProvider.AbstractHLSmartCastInfoTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirIsSubclassOfTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirIsSubclassOfTestGenerated.java index 899de34415c..33ea5101f47 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirIsSubclassOfTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirIsSubclassOfTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.symbolDeclarationOverri import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractIsSubclassOfTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirOverriddenDeclarationProviderTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirOverriddenDeclarationProviderTestGenerated.java index c694458374e..68f21d41d78 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirOverriddenDeclarationProviderTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationOverridesProvider/FirOverriddenDeclarationProviderTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.symbolDeclarationOverri import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider.AbstractOverriddenDeclarationProviderTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationRenderer/FirRendererTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationRenderer/FirRendererTestGenerated.java index 44bca19b7fc..84dc3bfd971 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationRenderer/FirRendererTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/symbolDeclarationRenderer/FirRendererTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.symbolDeclarationRender import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationRenderer.AbstractRendererTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeCreator/FirTypeParameterTypeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeCreator/FirTypeParameterTypeTestGenerated.java index debb0cad794..600c49b7524 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeCreator/FirTypeParameterTypeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeCreator/FirTypeParameterTypeTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeCreator; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeCreator.AbstractTypeParameterTypeTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirFunctionClassKindTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirFunctionClassKindTestGenerated.java index 0764b1b2b73..3b5a8123a97 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirFunctionClassKindTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirFunctionClassKindTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeInfoProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractFunctionClassKindTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirIsDenotableTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirIsDenotableTestGenerated.java index 296758bb52b..78916140e5b 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirIsDenotableTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeInfoProvider/FirIsDenotableTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeInfoProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider.AbstractIsDenotableTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/AbstractFirGetSuperTypesTest.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/AbstractFirGetSuperTypesTest.kt index 45b3c9cd5e2..5729591225f 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/AbstractFirGetSuperTypesTest.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/AbstractFirGetSuperTypesTest.kt @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeProvider 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.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirHasCommonSubtypeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirHasCommonSubtypeTestGenerated.java index c76e268b1aa..8dff3a20d42 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirHasCommonSubtypeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirHasCommonSubtypeTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.components.typeProvider; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeProvider.AbstractHasCommonSubtypeTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/FirHLImportOptimizerTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/FirHLImportOptimizerTestGenerated.java index 355cd2cd5c4..be444d169f4 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/FirHLImportOptimizerTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/importOptimizer/FirHLImportOptimizerTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.org.jetbrains.kotlin.analysis.api. import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.components.importOptimizer.AbstractHLImportOptimizerTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirExpressionPsiTypeProviderTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirExpressionPsiTypeProviderTestGenerated.java index 3f216026c05..aaedbcb2320 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirExpressionPsiTypeProviderTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirExpressionPsiTypeProviderTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.org.jetbrains.kotlin.analysis.api. import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider.AbstractExpressionPsiTypeProviderTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirPsiTypeProviderTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirPsiTypeProviderTestGenerated.java index b509d844af4..0c6df1e5e5d 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirPsiTypeProviderTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/psiTypeProvider/FirPsiTypeProviderTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.org.jetbrains.kotlin.analysis.api. import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.components.psiTypeProvider.AbstractPsiTypeProviderTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirFirGetSuperTypesTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirFirGetSuperTypesTestGenerated.java index 7301d6095b6..5ad22fe9834 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirFirGetSuperTypesTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/org/jetbrains/kotlin/analysis/api/fir/components/typeProvider/FirFirGetSuperTypesTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.org.jetbrains.kotlin.analysis.api. import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.components.typeProvider.AbstractFirGetSuperTypesTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirDelegateMemberScopeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirDelegateMemberScopeTestGenerated.java index 32e53d123a3..2bff01ef3e2 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirDelegateMemberScopeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirDelegateMemberScopeTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.scopes; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractDelegateMemberScopeTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirFileScopeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirFileScopeTestGenerated.java index 56ad2312f1f..00623242acd 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirFileScopeTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirFileScopeTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.scopes; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractFileScopeTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirMemberScopeByFqNameTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirMemberScopeByFqNameTestGenerated.java index eed7d25685d..f76f98885be 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirMemberScopeByFqNameTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirMemberScopeByFqNameTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.scopes; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractMemberScopeByFqNameTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirSubstitutionOverridesUnwrappingTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirSubstitutionOverridesUnwrappingTestGenerated.java index 6b50c8fa248..2dc8e1e4bc6 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirSubstitutionOverridesUnwrappingTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/scopes/FirSubstitutionOverridesUnwrappingTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.scopes; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.scopes.AbstractSubstitutionOverridesUnwrappingTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByFqNameTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByFqNameTestGenerated.java index 2edcfed6211..317dea7deff 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByFqNameTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByFqNameTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByFqNameTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByPsiTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByPsiTestGenerated.java index 61102ca5de0..956bda08fdd 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByPsiTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByPsiTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByPsiTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByReferenceTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByReferenceTestGenerated.java index 3a56dec5809..fe2379273b3 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByReferenceTestGenerated.java +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/symbols/FirSymbolByReferenceTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.symbols; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolByReferenceTest; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryFrontendApiTestConfiguratorService.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryFrontendApiTestConfiguratorService.kt index ea64487f929..0044580d4c6 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryFrontendApiTestConfiguratorService.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryFrontendApiTestConfiguratorService.kt @@ -16,8 +16,7 @@ import com.intellij.psi.FileTypeFileViewProviders import com.intellij.psi.compiled.ClassFileDecompilers import com.intellij.psi.search.GlobalSearchScope 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.utils.libraries.LibraryEnvironmentConfigurator +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInDecompiler import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinClassFileDecompiler import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache @@ -25,6 +24,7 @@ import org.jetbrains.kotlin.analysis.decompiler.stub.file.FileAttributeService import org.jetbrains.kotlin.analysis.decompiler.stub.files.DummyFileAttributeService import org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based.registerTestServices import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider +import org.jetbrains.kotlin.analysis.test.framework.services.libraries.LibraryEnvironmentConfigurator import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.psi.KtFile diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryModuleRegistrarPreAnalysisHandler.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryModuleRegistrarPreAnalysisHandler.kt index 2587ac5ad50..d6bb41e78d0 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryModuleRegistrarPreAnalysisHandler.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryModuleRegistrarPreAnalysisHandler.kt @@ -7,11 +7,11 @@ package org.jetbrains.kotlin.analysis.api.fir.utils.libraries.binary import com.intellij.openapi.project.Project import com.intellij.psi.PsiManager -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.TestKtLibraryModule -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.projectModuleProvider -import org.jetbrains.kotlin.analysis.api.impl.base.test.utils.libraries.compiledLibraryProvider import org.jetbrains.kotlin.analysis.api.impl.base.util.LibraryUtils import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile +import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestKtLibraryModule +import org.jetbrains.kotlin.analysis.test.framework.project.structure.projectModuleProvider +import org.jetbrains.kotlin.analysis.test.framework.services.libraries.compiledLibraryProvider import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.PreAnalysisHandler import org.jetbrains.kotlin.test.services.TestModuleStructure diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceFrontendApiTestConfiguratorService.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceFrontendApiTestConfiguratorService.kt index 660e737d802..51fc5690f6c 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceFrontendApiTestConfiguratorService.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceFrontendApiTestConfiguratorService.kt @@ -11,11 +11,11 @@ import com.intellij.openapi.Disposable import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import com.intellij.psi.search.GlobalSearchScope 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.utils.libraries.CompiledLibraryProvider -import org.jetbrains.kotlin.analysis.api.impl.base.test.utils.libraries.LibraryEnvironmentConfigurator +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based.registerTestServices import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider +import org.jetbrains.kotlin.analysis.test.framework.services.libraries.CompiledLibraryProvider +import org.jetbrains.kotlin.analysis.test.framework.services.libraries.LibraryEnvironmentConfigurator import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.psi.KtFile diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceModuleRegistrarPreAnalysisHandler.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceModuleRegistrarPreAnalysisHandler.kt index b6e2b07c3e9..5a4c60fb494 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceModuleRegistrarPreAnalysisHandler.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceModuleRegistrarPreAnalysisHandler.kt @@ -8,13 +8,13 @@ package org.jetbrains.kotlin.analysis.api.fir.utils.libraries.source import com.intellij.openapi.project.Project import com.intellij.psi.PsiManager import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.TestKtLibrarySourceModule -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.projectModuleProvider -import org.jetbrains.kotlin.analysis.api.impl.base.test.utils.libraries.compiledLibraryProvider import org.jetbrains.kotlin.analysis.api.impl.base.util.LibraryUtils import org.jetbrains.kotlin.analysis.project.structure.KtLibraryModule import org.jetbrains.kotlin.analysis.project.structure.KtLibrarySourceModule import org.jetbrains.kotlin.analysis.project.structure.KtModule +import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestKtLibrarySourceModule +import org.jetbrains.kotlin.analysis.test.framework.project.structure.projectModuleProvider +import org.jetbrains.kotlin.analysis.test.framework.services.libraries.compiledLibraryProvider import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices diff --git a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractCompilerBasedTest.kt b/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractCompilerBasedTest.kt index cac0c33967f..333d6db3505 100644 --- a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractCompilerBasedTest.kt +++ b/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractCompilerBasedTest.kt @@ -3,7 +3,7 @@ * 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.analysis.api.impl.barebone.test +package org.jetbrains.kotlin.analysis.test.framework import com.intellij.openapi.Disposable import com.intellij.openapi.util.Disposer diff --git a/analysis/analysis-api-impl-base/build.gradle.kts b/analysis/analysis-api-impl-base/build.gradle.kts index 517a48f392f..913657ecd90 100644 --- a/analysis/analysis-api-impl-base/build.gradle.kts +++ b/analysis/analysis-api-impl-base/build.gradle.kts @@ -19,6 +19,7 @@ dependencies { testApi(projectTests(":compiler:test-infrastructure")) testApi(projectTests(":compiler:tests-common-new")) testApi(projectTests(":analysis:analysis-api-impl-barebone")) + testApi(projectTests(":analysis:analysis-test-framework")) testImplementation(project(":kotlin-reflect")) testImplementation(toolsJar()) } 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 bde3f7a91a6..4e8d28e8c5a 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 @@ -9,10 +9,11 @@ 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.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.impl.base.test.TestReferenceResolveResultRenderer.renderResolvedTo -import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.analysis.api.symbols.* +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.utils.unwrapMultiReferences import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnDeclarationsTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnDeclarationsTest.kt index 800b91d1959..bdb684ace77 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnDeclarationsTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnDeclarationsTest.kt @@ -5,14 +5,9 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.annotations -import org.jetbrains.kotlin.analysis.api.annotations.annotations -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.annotations.TestAnnotationRenderer -import org.jetbrains.kotlin.analysis.api.impl.base.test.indented -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.markers.KtAnnotatedSymbol +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnFilesTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnFilesTest.kt index bc3e6cbe9b0..9eb031db13c 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnFilesTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AbstractAnalysisApiAnnotationsOnFilesTest.kt @@ -5,8 +5,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.annotations -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.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AnalysisApiAnnotationsOnTypesTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AnalysisApiAnnotationsOnTypesTest.kt index ca05f1980ce..1dac4abf685 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AnalysisApiAnnotationsOnTypesTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/AnalysisApiAnnotationsOnTypesTest.kt @@ -6,11 +6,10 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.annotations import org.jetbrains.kotlin.analysis.api.annotations.annotations -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.indented -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.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.utils.indented import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtTypeReference import org.jetbrains.kotlin.test.model.TestModule diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/TestAnnotationRenderer.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/TestAnnotationRenderer.kt index 42e8b9dc367..3cb93ace468 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/TestAnnotationRenderer.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/annotations/TestAnnotationRenderer.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.annotations import org.jetbrains.kotlin.analysis.api.annotations.KtAnnotationsList -import org.jetbrains.kotlin.analysis.api.impl.base.test.indented import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer +import org.jetbrains.kotlin.analysis.test.framework.utils.indented object TestAnnotationRenderer { fun renderAnnotations(annotations: KtAnnotationsList) = buildString { diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCallTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCallTest.kt index a544eb4e448..2515dcfd45e 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCallTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCallTest.kt @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components import com.intellij.psi.PsiElement import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.calls.KtCallInfo -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.test.framework.base.AbstractHLApiSingleModuleTest +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCandidatesTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCandidatesTest.kt index 168e3a7c0b2..0693e6423c3 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCandidatesTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCandidatesTest.kt @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components import com.intellij.psi.PsiElement import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.calls.KtCallCandidateInfo -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.test.framework.base.AbstractHLApiSingleModuleTest +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorTest.kt index 5095a200bb6..48f45006f4d 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorTest.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider import org.jetbrains.kotlin.analysis.api.components.KtConstantEvaluationMode -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.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtValueArgument diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/diagnosticProvider/AbstractCollectDiagnosticsTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/diagnosticProvider/AbstractCollectDiagnosticsTest.kt index 8cf9db4ff17..72e04960eba 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/diagnosticProvider/AbstractCollectDiagnosticsTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/diagnosticProvider/AbstractCollectDiagnosticsTest.kt @@ -9,8 +9,7 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import org.jetbrains.kotlin.analysis.api.components.KtDiagnosticCheckerFilter import org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnosticWithPsi -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.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.diagnostics.DiagnosticUtils.getLineAndColumnRangeInPsiFile import org.jetbrains.kotlin.diagnostics.PsiDiagnosticUtils.offsetToLineAndColumn import org.jetbrains.kotlin.psi.KtElement diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractReturnTargetSymbolTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractReturnTargetSymbolTest.kt index c166f8bcace..924a2c3109e 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractReturnTargetSymbolTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractReturnTargetSymbolTest.kt @@ -8,9 +8,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionIn import com.intellij.psi.PsiComment import com.intellij.psi.PsiElement import com.intellij.psi.impl.source.tree.LeafPsiElement -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.base.test.getNameWithPositionString -import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.utils.getNameWithPositionString import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtReturnExpression import org.jetbrains.kotlin.psi.KtTreeVisitorVoid diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractWhenMissingCasesTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractWhenMissingCasesTest.kt index bbaa51bc55f..0d9ce0d92a0 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractWhenMissingCasesTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionInfoProvider/AbstractWhenMissingCasesTest.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider -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.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtWhenExpression import org.jetbrains.kotlin.test.model.TestModule diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractDeclarationReturnTypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractDeclarationReturnTypeTest.kt index 837120c291b..a1afe73a7f6 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractDeclarationReturnTypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractDeclarationReturnTypeTest.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.base.test.getNameWithPositionString -import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.utils.getNameWithPositionString import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractExpectedExpressionTypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractExpectedExpressionTypeTest.kt index 6bb9fe10140..1b84a4a4634 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractExpectedExpressionTypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractExpectedExpressionTypeTest.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider -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.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractHLExpressionTypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractHLExpressionTypeTest.kt index 6c9924ddbb8..ac9124baadf 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractHLExpressionTypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/expressionTypeProvider/AbstractHLExpressionTypeTest.kt @@ -6,9 +6,9 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionTypeProvider 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.barebone.test.expressionMarkerProvider -import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtValueArgument diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/smartCastProvider/AbstractHLSmartCastInfoTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/smartCastProvider/AbstractHLSmartCastInfoTest.kt index d69641a107a..108feb4e380 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/smartCastProvider/AbstractHLSmartCastInfoTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/smartCastProvider/AbstractHLSmartCastInfoTest.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.smartCastProvider -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.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractIsSubclassOfTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractIsSubclassOfTest.kt index 41d90364dfa..88ddfac7621 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractIsSubclassOfTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractIsSubclassOfTest.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclarationOverridesProvider -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.test.framework.services.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractOverriddenDeclarationProviderTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractOverriddenDeclarationProviderTest.kt index c97f09c083d..71529336761 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractOverriddenDeclarationProviderTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationOverridesProvider/AbstractOverriddenDeclarationProviderTest.kt @@ -8,9 +8,9 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclar 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.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSyntheticJavaPropertySymbol diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationRenderer/AbstractRendererTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationRenderer/AbstractRendererTest.kt index b893110e066..52c167b8b8c 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationRenderer/AbstractRendererTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/symbolDeclarationRenderer/AbstractRendererTest.kt @@ -7,10 +7,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.symbolDeclar 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.analysis.api.symbols.KtDeclarationSymbol -import org.jetbrains.kotlin.analysis.api.symbols.markers.KtPossibleMemberSymbol +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeCreator/AbstractTypeParameterTypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeCreator/AbstractTypeParameterTypeTest.kt index 899fbb16bdc..d45885fa210 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeCreator/AbstractTypeParameterTypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeCreator/AbstractTypeParameterTypeTest.kt @@ -6,9 +6,9 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeCreator import org.jetbrains.kotlin.analysis.api.components.buildTypeParameterType -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.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtTypeParameter import org.jetbrains.kotlin.test.model.TestModule diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractFunctionClassKindTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractFunctionClassKindTest.kt index d583dd7dc0d..679d9ec3b00 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractFunctionClassKindTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractFunctionClassKindTest.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProvider -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.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractIsDenotableTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractIsDenotableTest.kt index 189305fa11b..e85d4635ae1 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractIsDenotableTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeInfoProvider/AbstractIsDenotableTest.kt @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeInfoProv import com.intellij.psi.PsiElement import com.intellij.psi.impl.source.tree.LeafPsiElement import org.jetbrains.kotlin.analysis.api.impl.barebone.parentOfType -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.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtAnnotatedExpression import org.jetbrains.kotlin.psi.KtFile diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeProvider/AbstractHasCommonSubtypeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeProvider/AbstractHasCommonSubtypeTest.kt index 8bd49334131..a3a8db2bcc0 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeProvider/AbstractHasCommonSubtypeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/typeProvider/AbstractHasCommonSubtypeTest.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components.typeProvider 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.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.psi.KtCallExpression import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtTreeVisitorVoid diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractDelegateMemberScopeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractDelegateMemberScopeTest.kt index 42c2ee8b1f2..e919ab9fe82 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractDelegateMemberScopeTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractDelegateMemberScopeTest.kt @@ -6,7 +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.test.framework.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.impl.base.test.symbols.SymbolsData 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 961d325a117..1c63e694375 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,8 +5,8 @@ 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.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule 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 5d7b83838a0..7ac7936eecb 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,7 +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.test.framework.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.impl.base.test.symbols.SymbolsData diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractSubstitutionOverridesUnwrappingTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractSubstitutionOverridesUnwrappingTest.kt index 91aa40891b3..90f9133d8c2 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractSubstitutionOverridesUnwrappingTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/scopes/AbstractSubstitutionOverridesUnwrappingTest.kt @@ -6,8 +6,8 @@ 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.barebone.test.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.AbstractSymbolTest import org.jetbrains.kotlin.analysis.api.impl.base.test.symbols.SymbolsData import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer 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 d390281adc7..f6c429cbb90 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,7 +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.test.framework.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 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 4d5a2dca671..86b761205cf 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,7 +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.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile 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 aa5f1967c50..ce54a73e378 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,8 +6,8 @@ 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.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.psi.KtFile 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 5ab28e77576..96d812ee489 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 @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.symbols import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions -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.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleFileTest import org.jetbrains.kotlin.analysis.api.symbols.DebugSymbolRenderer import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtFileSymbol diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/AbstractStandaloneModeSingleModuleTest.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/AbstractStandaloneModeSingleModuleTest.kt index 35da166940a..d9f34a908bc 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/AbstractStandaloneModeSingleModuleTest.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/AbstractStandaloneModeSingleModuleTest.kt @@ -8,10 +8,10 @@ package org.jetbrains.kotlin.analysis.api.standalone import com.intellij.psi.util.PsiTreeUtil 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.expressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.analysis.api.impl.base.test.TestReferenceResolveResultRenderer.renderResolvedTo import org.jetbrains.kotlin.analysis.api.impl.base.test.findReferencesAtCaret -import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleModuleTest +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeConfiguratorService.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeConfiguratorService.kt index 2c2835828ec..32b5f6f1a6d 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeConfiguratorService.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeConfiguratorService.kt @@ -11,7 +11,7 @@ import com.intellij.openapi.Disposable import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.load.kotlin.PackagePartProvider diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeSingleModuleTestGenerated.java b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeSingleModuleTestGenerated.java index 6216a3cf6f7..e4600304c69 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeSingleModuleTestGenerated.java +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/StandaloneModeSingleModuleTestGenerated.java @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.analysis.api.standalone; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService; +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService; import org.jetbrains.kotlin.analysis.api.standalone.StandaloneModeConfiguratorService; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; diff --git a/analysis/analysis-test-framework/build.gradle.kts b/analysis/analysis-test-framework/build.gradle.kts new file mode 100644 index 00000000000..3626dd20439 --- /dev/null +++ b/analysis/analysis-test-framework/build.gradle.kts @@ -0,0 +1,32 @@ +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + testApi(kotlinStdlib()) + testApi(intellijCore()) + testApiJUnit5() + + testApi(project(":kotlin-test:kotlin-test-junit")) + testApi(project(":compiler:psi")) + testApi(project(":analysis:kt-references")) + testApi(projectTests(":compiler:tests-common-new")) + testApi(project(":analysis:analysis-api-providers")) + testApi(project(":analysis:analysis-api")) + testApi(project(":analysis:analysis-api-impl-barebone")) +} + +sourceSets { + "main" { none() } + "test" { projectDefault() } +} + +projectTest(jUnitMode = JUnitMode.JUnit5) { + dependsOn(":dist") + workingDir = rootDir + useJUnitPlatform() +} + +testsJar() + diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/FrontendApiTestConfiguratorService.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/FrontendApiTestConfiguratorService.kt new file mode 100644 index 00000000000..2a371cf1645 --- /dev/null +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/FrontendApiTestConfiguratorService.kt @@ -0,0 +1,44 @@ +/* + * Copyright 2010-2022 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.analysis.test.framework + +import com.intellij.mock.MockApplication +import com.intellij.mock.MockProject +import com.intellij.openapi.Disposable +import com.intellij.psi.search.GlobalSearchScope +import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider +import org.jetbrains.kotlin.config.CompilerConfiguration +import org.jetbrains.kotlin.load.kotlin.PackagePartProvider +import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder +import org.jetbrains.kotlin.test.model.TestModule +import org.jetbrains.kotlin.test.services.TestServices +import java.nio.file.Path + +interface FrontendApiTestConfiguratorService { + val testPrefix: String? get() = null + val allowDependedAnalysisSession: Boolean get() = true + + fun TestConfigurationBuilder.configureTest(disposable: Disposable) + fun processTestFiles(files: List): List = files + + fun getOriginalFile(file: KtFile): KtFile = file + fun registerProjectServices( + project: MockProject, + compilerConfig: CompilerConfiguration, + files: List, + packagePartProvider: (GlobalSearchScope) -> PackagePartProvider, + projectStructureProvider: ProjectStructureProvider + ) + + fun registerApplicationServices(application: MockApplication) + + fun prepareTestFiles(files: List, module: TestModule, testServices: TestServices) {} + + fun doOutOfBlockModification(file: KtFile) + + fun preprocessTestDataPath(path: Path): Path = path +} diff --git a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/TestWithDisposable.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/TestWithDisposable.kt similarity index 86% rename from analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/TestWithDisposable.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/TestWithDisposable.kt index 422fd6e90a3..5e7f8d8745f 100644 --- a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/TestWithDisposable.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/TestWithDisposable.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 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.analysis.api.impl.barebone.test +package org.jetbrains.kotlin.analysis.test.framework import com.intellij.openapi.Disposable import com.intellij.openapi.util.Disposer diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleFileTest.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleFileTest.kt similarity index 76% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleFileTest.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleFileTest.kt index 9a907e1bdb9..82e635d1182 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleFileTest.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleFileTest.kt @@ -1,11 +1,10 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 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.analysis.api.impl.base.test.test.framework +package org.jetbrains.kotlin.analysis.test.framework.base -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 diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleModuleTest.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleModuleTest.kt similarity index 88% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleModuleTest.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleModuleTest.kt index 60d586b9fc3..3e24f266b5b 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/test/framework/AbstractHLApiSingleModuleTest.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AbstractHLApiSingleModuleTest.kt @@ -3,22 +3,20 @@ * 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.analysis.api.impl.base.test.test.framework +package org.jetbrains.kotlin.analysis.test.framework.base import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.util.Computable 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 : AnalysisApiBasedTest() { final override fun doTestByFileStructure(ktFiles: List, moduleStructure: TestModuleStructure, testServices: TestServices) { val singleModule = moduleStructure.modules.single() doTestByFileStructure(ktFiles, singleModule, testServices) @@ -38,7 +36,6 @@ abstract class AbstractHLApiSingleModuleTest : AbstractFrontendApiTest() { protected inline fun executeOnPooledThreadInReadAction(crossinline action: () -> R): R = ApplicationManager.getApplication().executeOnPooledThread { runReadAction(action) }.get() - protected fun analyseForTest(contextElement: KtElement, action: KtAnalysisSession.() -> R): R { return if (useDependedAnalysisSession) { // Depended mode does not support analysing a KtFile. diff --git a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractFrontendApiTest.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AnalysisApiBasedTest.kt similarity index 78% rename from analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractFrontendApiTest.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AnalysisApiBasedTest.kt index 6686948f038..e9515e647b6 100644 --- a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractFrontendApiTest.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/base/AnalysisApiBasedTest.kt @@ -1,24 +1,26 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 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.analysis.api.impl.barebone.test +package org.jetbrains.kotlin.analysis.test.framework.base import com.intellij.mock.MockApplication import com.intellij.mock.MockProject -import com.intellij.openapi.Disposable import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.util.Disposer -import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem -import com.intellij.psi.search.GlobalSearchScope import com.intellij.testFramework.TestDataFile import junit.framework.ComparisonFailure -import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.TestWithDisposable +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KotlinProjectStructureProviderTestImpl +import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestKtModuleProvider +import org.jetbrains.kotlin.analysis.test.framework.services.ExpressionMarkerProvider +import org.jetbrains.kotlin.analysis.test.framework.services.ExpressionMarkersSourceFilePreprocessor +import org.jetbrains.kotlin.analysis.test.framework.utils.SkipTestException +import org.jetbrains.kotlin.analysis.test.framework.project.structure.getKtFilesFromModule import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.config.addJavaSourceRoots -import org.jetbrains.kotlin.config.CompilerConfiguration -import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.ExecutionListenerBasedDisposableProvider @@ -30,7 +32,6 @@ import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirective import org.jetbrains.kotlin.test.model.DependencyKind import org.jetbrains.kotlin.test.model.FrontendKinds import org.jetbrains.kotlin.test.model.ResultingArtifact -import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest import org.jetbrains.kotlin.test.services.* import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator @@ -45,38 +46,7 @@ import java.util.concurrent.ExecutionException import kotlin.io.path.exists import kotlin.io.path.nameWithoutExtension -interface FrontendApiTestConfiguratorService { - val testPrefix: String? - get() = null - - val allowDependedAnalysisSession: Boolean - get() = true - - fun TestConfigurationBuilder.configureTest(disposable: Disposable) - - fun processTestFiles(files: List): List = files - - fun getOriginalFile(file: KtFile): KtFile = file - - fun registerProjectServices( - project: MockProject, - compilerConfig: CompilerConfiguration, - files: List, - packagePartProvider: (GlobalSearchScope) -> PackagePartProvider, - projectStructureProvider: ProjectStructureProvider, - jarFileSystem: CoreJarFileSystem, - ) - - fun registerApplicationServices(application: MockApplication) - - fun prepareTestFiles(files: List, module: TestModule, testServices: TestServices) {} - - fun doOutOfBlockModification(file: KtFile) - - fun preprocessTestDataPath(path: Path): Path = path -} - -abstract class AbstractFrontendApiTest : TestWithDisposable() { +abstract class AnalysisApiBasedTest : TestWithDisposable() { abstract val configurator: FrontendApiTestConfiguratorService protected open val enableTestInDependedMode: Boolean @@ -157,7 +127,7 @@ abstract class AbstractFrontendApiTest : TestWithDisposable() { configureTest(this) startingArtifactFactory = { ResultingArtifact.Source() } - this.testInfo = this@AbstractFrontendApiTest.testInfo + this.testInfo = this@AnalysisApiBasedTest.testInfo } protected open fun handleInitializationError(exception: Throwable, moduleStructure: TestModuleStructure): InitializationErrorAction = @@ -198,16 +168,14 @@ abstract class AbstractFrontendApiTest : TestWithDisposable() { val ktFiles = getKtFilesFromModule(testServices, singleModule) with(project as MockProject) { - val compilerConfigurationProvider = testServices.compilerConfigurationProvider - val compilerConfiguration = compilerConfigurationProvider.getCompilerConfiguration(singleModule) + val compilerConfiguration = testServices.compilerConfigurationProvider.getCompilerConfiguration(singleModule) compilerConfiguration.addJavaSourceRoots(ktFiles.map { File(it.virtualFilePath) }) configurator.registerProjectServices( this, compilerConfiguration, ktFiles, - compilerConfigurationProvider.getPackagePartProviderFactory(singleModule), - KotlinProjectStructureProviderTestImpl(testServices), - compilerConfigurationProvider.getJarFileSystem(singleModule) + testServices.compilerConfigurationProvider.getPackagePartProviderFactory(singleModule), + KotlinProjectStructureProviderTestImpl(testServices) ) } @@ -263,14 +231,4 @@ abstract class AbstractFrontendApiTest : TestWithDisposable() { companion object { val DISABLE_DEPENDED_MODE_DIRECTIVE = "DISABLE_DEPENDED_MODE" } -} - -fun getKtFilesFromModule(testServices: TestServices, testModule: TestModule): List { - val moduleInfoProvider = testServices.projectModuleProvider - return when (val moduleInfo = moduleInfoProvider.getModule(testModule.name)) { - is TestKtSourceModule -> moduleInfo.testFilesToKtFiles.filterKeys { testFile -> !testFile.isAdditional }.values.toList() - is TestKtLibraryModule -> moduleInfo.ktFiles.toList() - is TestKtLibrarySourceModule -> moduleInfo.ktFiles.toList() - else -> error("Unexpected $moduleInfo") - } -} +} \ No newline at end of file diff --git a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/KotlinProjectStructureProviderTestImpl.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KotlinProjectStructureProviderTestImpl.kt similarity index 87% rename from analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/KotlinProjectStructureProviderTestImpl.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KotlinProjectStructureProviderTestImpl.kt index 2a6f6bf5757..0a9697ac48e 100644 --- a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/KotlinProjectStructureProviderTestImpl.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KotlinProjectStructureProviderTestImpl.kt @@ -3,9 +3,10 @@ * 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.analysis.api.impl.barebone.test +package org.jetbrains.kotlin.analysis.test.framework.project.structure import com.intellij.psi.PsiElement +import org.jetbrains.kotlin.analysis.project.structure.KtLibraryModule import org.jetbrains.kotlin.analysis.project.structure.KtModule import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider import org.jetbrains.kotlin.psi.KtFile diff --git a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/TestKtModuleProvider.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/TestKtModuleProvider.kt similarity index 89% rename from analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/TestKtModuleProvider.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/TestKtModuleProvider.kt index d867ef89f80..29d621aaac4 100644 --- a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/TestKtModuleProvider.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/TestKtModuleProvider.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 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.analysis.api.impl.barebone.test +package org.jetbrains.kotlin.analysis.test.framework.project.structure import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.model.TestModule diff --git a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/TestKtSourceModule.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/TestKtSourceModule.kt similarity index 98% rename from analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/TestKtSourceModule.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/TestKtSourceModule.kt index 1c2516b83db..8dbc8188a3e 100644 --- a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/TestKtSourceModule.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/TestKtSourceModule.kt @@ -3,7 +3,7 @@ * 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.analysis.api.impl.barebone.test +package org.jetbrains.kotlin.analysis.test.framework.project.structure import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/projectStructureUtils.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/projectStructureUtils.kt new file mode 100644 index 00000000000..9652e111be9 --- /dev/null +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/projectStructureUtils.kt @@ -0,0 +1,20 @@ +/* + * Copyright 2010-2022 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.analysis.test.framework.project.structure + +import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.test.model.TestModule +import org.jetbrains.kotlin.test.services.TestServices + +fun getKtFilesFromModule(testServices: TestServices, testModule: TestModule): List { + val moduleInfoProvider = testServices.projectModuleProvider + return when (val moduleInfo = moduleInfoProvider.getModule(testModule.name)) { + is TestKtSourceModule -> moduleInfo.testFilesToKtFiles.filterKeys { testFile -> !testFile.isAdditional }.values.toList() + is TestKtLibraryModule -> moduleInfo.ktFiles.toList() + is TestKtLibrarySourceModule -> moduleInfo.ktFiles.toList() + else -> error("Unexpected $moduleInfo") + } +} diff --git a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/ExpressionMarkersSourceFilePreprocessor.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/ExpressionMarkersSourceFilePreprocessor.kt similarity index 98% rename from analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/ExpressionMarkersSourceFilePreprocessor.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/ExpressionMarkersSourceFilePreprocessor.kt index 0e3ef4a1543..136477cd65d 100644 --- a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/ExpressionMarkersSourceFilePreprocessor.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/ExpressionMarkersSourceFilePreprocessor.kt @@ -3,7 +3,7 @@ * 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.analysis.api.impl.barebone.test +package org.jetbrains.kotlin.analysis.test.framework.services import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils/libraries/CompiledLibraryProvider.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompiledLibraryProvider.kt similarity index 94% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils/libraries/CompiledLibraryProvider.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompiledLibraryProvider.kt index 73f9c781ad5..c7b2b0e7e2a 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils/libraries/CompiledLibraryProvider.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompiledLibraryProvider.kt @@ -3,7 +3,7 @@ * 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.analysis.api.impl.base.test.utils.libraries +package org.jetbrains.kotlin.analysis.test.framework.services.libraries import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestService diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils/libraries/CompilerExecutor.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompilerExecutor.kt similarity index 94% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils/libraries/CompilerExecutor.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompilerExecutor.kt index 28638589d09..f18a06c13e9 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils/libraries/CompilerExecutor.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/CompilerExecutor.kt @@ -3,9 +3,9 @@ * 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.analysis.api.impl.base.test.utils.libraries +package org.jetbrains.kotlin.analysis.test.framework.services.libraries -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.SkipTestException +import org.jetbrains.kotlin.analysis.test.framework.utils.SkipTestException import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils/libraries/LibraryEnvironmentConfigurator.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/LibraryEnvironmentConfigurator.kt similarity index 92% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils/libraries/LibraryEnvironmentConfigurator.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/LibraryEnvironmentConfigurator.kt index 0e26a615dbb..788939a5451 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils/libraries/LibraryEnvironmentConfigurator.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/LibraryEnvironmentConfigurator.kt @@ -3,7 +3,7 @@ * 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.analysis.api.impl.base.test.utils.libraries +package org.jetbrains.kotlin.analysis.test.framework.services.libraries import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot import org.jetbrains.kotlin.config.CompilerConfiguration diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils/libraries/TestModuleCompiler.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/TestModuleCompiler.kt similarity index 97% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils/libraries/TestModuleCompiler.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/TestModuleCompiler.kt index 169f9d4b438..6da54ee8756 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/utils/libraries/TestModuleCompiler.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/TestModuleCompiler.kt @@ -3,7 +3,7 @@ * 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.analysis.api.impl.base.test.utils.libraries +package org.jetbrains.kotlin.analysis.test.framework.services.libraries import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices diff --git a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/SkipTestException.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/utils/SkipTestException.kt similarity index 81% rename from analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/SkipTestException.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/utils/SkipTestException.kt index a53c8f6a9ac..2aaa576a6d0 100644 --- a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/SkipTestException.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/utils/SkipTestException.kt @@ -3,6 +3,6 @@ * 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.analysis.api.impl.barebone.test +package org.jetbrains.kotlin.analysis.test.framework.utils abstract class SkipTestException : RuntimeException() \ No newline at end of file diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/commonTestUtils.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/utils/commonTestUtils.kt similarity index 95% rename from analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/commonTestUtils.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/utils/commonTestUtils.kt index e84a50f09fb..29b2345e554 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/commonTestUtils.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/utils/commonTestUtils.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2022 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.analysis.api.impl.base.test +package org.jetbrains.kotlin.analysis.test.framework.utils import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.util.Computable diff --git a/analysis/low-level-api-fir/build.gradle.kts b/analysis/low-level-api-fir/build.gradle.kts index 518ac29f4d9..73591e381a1 100644 --- a/analysis/low-level-api-fir/build.gradle.kts +++ b/analysis/low-level-api-fir/build.gradle.kts @@ -35,6 +35,7 @@ dependencies { testApi(projectTests(":compiler:tests-common")) testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests")) testApi(projectTests(":analysis:analysis-api-impl-barebone")) + testApi(projectTests(":analysis:analysis-test-framework")) testApi(project(":kotlin-test:kotlin-test-junit")) testApiJUnit5() testApi(project(":kotlin-reflect")) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt index 75fca54dd8d..72df82844d7 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/AbstractGetOrBuildFirTest.kt @@ -7,9 +7,9 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir import com.intellij.psi.PsiElement import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFir import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AbstractLowLevelApiSingleFileTest +import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirRenderer import org.jetbrains.kotlin.fir.declarations.FirImport diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/AbstractCompilerBasedTestForFir.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/AbstractCompilerBasedTestForFir.kt index 8f50c9469ef..4d6be88372e 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/AbstractCompilerBasedTestForFir.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/AbstractCompilerBasedTestForFir.kt @@ -5,14 +5,15 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.AbstractCompilerBasedTest -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.TestKtModuleProvider -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.TestKtSourceModule -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.projectModuleProvider + +import org.jetbrains.kotlin.analysis.test.framework.AbstractCompilerBasedTest import org.jetbrains.kotlin.analysis.low.level.api.fir.api.DiagnosticCheckerFilter import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirFile import org.jetbrains.kotlin.analysis.low.level.api.fir.createResolveStateForNoCaching import org.jetbrains.kotlin.analysis.low.level.api.fir.transformers.LLFirLazyTransformer +import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestKtModuleProvider +import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestKtSourceModule +import org.jetbrains.kotlin.analysis.test.framework.project.structure.projectModuleProvider import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.test.ExecutionListenerBasedDisposableProvider import org.jetbrains.kotlin.test.bind diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/ModuleRegistrarPreAnalysisHandler.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/ModuleRegistrarPreAnalysisHandler.kt index d32934845a0..de0f116ec5f 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/ModuleRegistrarPreAnalysisHandler.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/compiler/based/ModuleRegistrarPreAnalysisHandler.kt @@ -7,13 +7,13 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based import com.intellij.mock.MockProject import com.intellij.openapi.Disposable -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.KotlinProjectStructureProviderTestImpl -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.TestKtSourceModule -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.getKtFilesFromModule -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.projectModuleProvider import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getOrBuildFirFile import org.jetbrains.kotlin.analysis.low.level.api.fir.api.getResolveState import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KotlinProjectStructureProviderTestImpl +import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestKtSourceModule +import org.jetbrains.kotlin.analysis.test.framework.project.structure.getKtFilesFromModule +import org.jetbrains.kotlin.analysis.test.framework.project.structure.projectModuleProvider import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.resolve.ScopeSession 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 1780712ee5e..0f9e7cc4918 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 @@ -5,9 +5,10 @@ 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 +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.base.AnalysisApiBasedTest -abstract class AbstractLowLevelApiSingleModuleTest : AbstractFrontendApiTest() { + +abstract class AbstractLowLevelApiSingleModuleTest : AnalysisApiBasedTest() { override val configurator: FrontendApiTestConfiguratorService get() = FirLowLevelFrontendApiTestConfiguratorService } \ No newline at end of file diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/FirLowLevelFrontendApiTestConfiguratorService.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/FirLowLevelFrontendApiTestConfiguratorService.kt index 4db020b7ec4..0a71a176e61 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/FirLowLevelFrontendApiTestConfiguratorService.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/FirLowLevelFrontendApiTestConfiguratorService.kt @@ -11,12 +11,12 @@ import com.intellij.openapi.Disposable import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based.ModuleRegistrarPreAnalysisHandler import org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based.registerTestServices import org.jetbrains.kotlin.analysis.low.level.api.fir.util.originalKtFile import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider import org.jetbrains.kotlin.analysis.providers.KotlinModificationTrackerFactory +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.psi.KtFile diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesFacadeTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesFacadeTest.kt index f68e2376a0a..e1869b72acd 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesFacadeTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesFacadeTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.light.classes.symbol.base import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.renderClass diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt index cd818a0cd89..f045d16432a 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.light.classes.symbol.base import com.intellij.openapi.project.Project import com.intellij.psi.SyntaxTraverser -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.renderClass diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTest.kt index 08f94d0733a..0c78af4659d 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTest.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTest.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.light.classes.symbol.base import com.intellij.openapi.project.Project import com.intellij.psi.PsiClass import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.asJava.LightClassTestCommon import org.jetbrains.kotlin.asJava.finder.JavaElementFinder import org.jetbrains.kotlin.psi.KtFile diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt index b13cc3a1375..f2e6912a1bc 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTestBase.kt @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.light.classes.symbol.base import com.intellij.openapi.project.Project import com.intellij.psi.PsiClass import com.intellij.psi.search.GlobalSearchScope -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.analysis.test.framework.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.base.AbstractHLApiSingleModuleTest import org.jetbrains.kotlin.analysis.api.impl.base.test.utils.libraries.CompilerExecutor import org.jetbrains.kotlin.asJava.finder.JavaElementFinder import org.jetbrains.kotlin.light.classes.symbol.base.service.NullabilityAnnotationSourceProvider diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/service/SymbolLightClassesForLibraryFrontendApiTestConfiguratorService.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/service/SymbolLightClassesForLibraryFrontendApiTestConfiguratorService.kt index da78241d3e8..4fdaf1265f2 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/service/SymbolLightClassesForLibraryFrontendApiTestConfiguratorService.kt +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/service/SymbolLightClassesForLibraryFrontendApiTestConfiguratorService.kt @@ -11,7 +11,7 @@ import com.intellij.openapi.Disposable import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.analysis.api.fir.utils.libraries.binary.LibraryFrontendApiTestConfiguratorService -import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService +import org.jetbrains.kotlin.analysis.test.framework.FrontendApiTestConfiguratorService import org.jetbrains.kotlin.analysis.api.impl.base.test.utils.libraries.CompiledLibraryProvider import org.jetbrains.kotlin.analysis.decompiled.light.classes.ClsJavaStubByVirtualFileCache import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider diff --git a/settings.gradle b/settings.gradle index 6b553806ab9..354fda5d29d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -541,6 +541,7 @@ include ":generators:analysis-api-generator", ":analysis:analysis-api-impl-base", ":analysis:analysis-api-providers", ":analysis:analysis-internal-utils", + ":analysis:analysis-test-framework", ":analysis:kt-references", ":analysis:symbol-light-classes", ":analysis:project-structure",