From 4ea3de17608ecbc348295c738712a6c582457942 Mon Sep 17 00:00:00 2001 From: Marco Pennekamp Date: Mon, 26 Feb 2024 16:18:40 +0100 Subject: [PATCH] [AA] Refactoring: Rename `KtModuleFactory` to `KtTestModuleFactory` ^KT-65960 --- .../AnalysisApiFe10TestConfigurator.kt | 6 ++--- ...LibraryBinaryDecompiledTestConfigurator.kt | 6 ++--- ....kt => KtCodeFragmentTestModuleFactory.kt} | 2 +- ...braryBinaryDecompiledTestModuleFactory.kt} | 2 +- ...kt => KtLibraryBinaryTestModuleFactory.kt} | 2 +- ...> KtLibraryBinaryTestModuleFactoryBase.kt} | 2 +- ...kt => KtLibrarySourceTestModuleFactory.kt} | 2 +- ...actory.kt => KtScriptTestModuleFactory.kt} | 2 +- ...actory.kt => KtSourceTestModuleFactory.kt} | 2 +- ...oduleFactory.kt => KtTestModuleFactory.kt} | 26 +++++++++---------- .../test/configurators/TestModuleKind.kt | 12 ++++----- ...lysisApiFirCodeFragmentTestConfigurator.kt | 6 ++--- ...LibraryBinaryDecompiledTestConfigurator.kt | 6 ++--- ...ysisApiFirLibrarySourceTestConfigurator.kt | 6 ++--- ...sApiFirOutOfContentRootTestConfigurator.kt | 6 ++--- .../AnalysisApiFirScriptTestConfigurator.kt | 6 ++--- .../AnalysisApiFirSourceTestConfigurator.kt | 6 ++--- ...lysisApiFirStdlibSourceTestConfigurator.kt | 6 ++--- 18 files changed, 53 insertions(+), 53 deletions(-) rename analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/{KtCodeFragmentModuleFactory.kt => KtCodeFragmentTestModuleFactory.kt} (98%) rename analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/{KtLibraryBinaryDecompiledModuleFactory.kt => KtLibraryBinaryDecompiledTestModuleFactory.kt} (91%) rename analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/{KtLibraryBinaryModuleFactory.kt => KtLibraryBinaryTestModuleFactory.kt} (90%) rename analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/{KtLibraryBinaryModuleFactoryBase.kt => KtLibraryBinaryTestModuleFactoryBase.kt} (96%) rename analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/{KtLibrarySourceModuleFactory.kt => KtLibrarySourceTestModuleFactory.kt} (97%) rename analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/{KtScriptModuleFactory.kt => KtScriptTestModuleFactory.kt} (95%) rename analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/{KtSourceModuleFactory.kt => KtSourceTestModuleFactory.kt} (95%) rename analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/{KtModuleFactory.kt => KtTestModuleFactory.kt} (71%) diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestConfigurator.kt b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestConfigurator.kt index 60fc85518f9..3a69d819fb5 100644 --- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestConfigurator.kt +++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/test/configurator/AnalysisApiFe10TestConfigurator.kt @@ -9,8 +9,8 @@ import com.intellij.openapi.Disposable import com.intellij.openapi.project.Project import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiBaseTestServiceRegistrar import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiDecompiledCodeTestServiceRegistrar -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtModuleFactory -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtSourceModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtSourceTestModuleFactory import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModule import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModuleProjectStructure import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestModuleStructureFactory @@ -42,7 +42,7 @@ object AnalysisApiFe10TestConfigurator : AnalysisApiTestConfigurator() { override fun configureTest(builder: TestConfigurationBuilder, disposable: Disposable) { builder.apply { - useAdditionalService { KtSourceModuleFactory } + useAdditionalService { KtSourceTestModuleFactory } useAdditionalService { AnalysisApiIndexingConfiguration(AnalysisApiBinaryLibraryIndexingMode.NO_INDEXING) } useConfigurators( ::CommonEnvironmentConfigurator, diff --git a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/configurators/StandaloneModeLibraryBinaryDecompiledTestConfigurator.kt b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/configurators/StandaloneModeLibraryBinaryDecompiledTestConfigurator.kt index 395f5417961..09b9b5ada61 100644 --- a/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/configurators/StandaloneModeLibraryBinaryDecompiledTestConfigurator.kt +++ b/analysis/analysis-api-standalone/tests/org/jetbrains/kotlin/analysis/api/standalone/fir/test/configurators/StandaloneModeLibraryBinaryDecompiledTestConfigurator.kt @@ -11,8 +11,8 @@ import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisAp import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiLibraryBaseTestServiceRegistrar import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AnalysisApiFirTestServiceRegistrar import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.configureOptionalTestCompilerPlugin -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibraryBinaryDecompiledModuleFactory -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibraryBinaryDecompiledTestModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModuleFactory import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModuleProjectStructure import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestModuleStructureFactory import org.jetbrains.kotlin.analysis.test.framework.services.configuration.AnalysisApiJvmEnvironmentConfigurator @@ -38,7 +38,7 @@ object StandaloneModeLibraryBinaryDecompiledTestConfigurator : StandaloneModeCon useConfigurators(::ExternalAnnotationsEnvironmentConfigurator) useSourcePreprocessor(::ExternalAnnotationsSourcePreprocessor) - useAdditionalService { KtLibraryBinaryDecompiledModuleFactory } + useAdditionalService { KtLibraryBinaryDecompiledTestModuleFactory } useAdditionalService { DispatchingTestModuleCompiler() } useAdditionalService { TestModuleDecompilerJar() } diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtCodeFragmentModuleFactory.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtCodeFragmentTestModuleFactory.kt similarity index 98% rename from analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtCodeFragmentModuleFactory.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtCodeFragmentTestModuleFactory.kt index 1d28ade6806..fe17df3ef21 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtCodeFragmentModuleFactory.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtCodeFragmentTestModuleFactory.kt @@ -28,7 +28,7 @@ import java.nio.file.Path /** * @see TestModuleKind.CodeFragment */ -object KtCodeFragmentModuleFactory : KtModuleFactory { +object KtCodeFragmentTestModuleFactory : KtTestModuleFactory { override fun createModule( testModule: TestModule, contextModule: KtTestModule?, diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryDecompiledModuleFactory.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryDecompiledTestModuleFactory.kt similarity index 91% rename from analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryDecompiledModuleFactory.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryDecompiledTestModuleFactory.kt index 644e63f7195..639b48c67c0 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryDecompiledModuleFactory.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryDecompiledTestModuleFactory.kt @@ -15,7 +15,7 @@ import java.nio.file.Path /** * @see TestModuleKind.LibraryBinaryDecompiled */ -object KtLibraryBinaryDecompiledModuleFactory : KtLibraryBinaryModuleFactoryBase() { +object KtLibraryBinaryDecompiledTestModuleFactory : KtLibraryBinaryTestModuleFactoryBase() { override val testModuleKind: TestModuleKind get() = TestModuleKind.LibraryBinaryDecompiled diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryModuleFactory.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryTestModuleFactory.kt similarity index 90% rename from analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryModuleFactory.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryTestModuleFactory.kt index de426db0b50..c5581248bdb 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryModuleFactory.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryTestModuleFactory.kt @@ -14,7 +14,7 @@ import java.nio.file.Path /** * @see TestModuleKind.LibraryBinary */ -object KtLibraryBinaryModuleFactory : KtLibraryBinaryModuleFactoryBase() { +object KtLibraryBinaryTestModuleFactory : KtLibraryBinaryTestModuleFactoryBase() { override val testModuleKind: TestModuleKind get() = TestModuleKind.LibraryBinary diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryModuleFactoryBase.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryTestModuleFactoryBase.kt similarity index 96% rename from analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryModuleFactoryBase.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryTestModuleFactoryBase.kt index 5f5c2379030..cc6650f81b8 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryModuleFactoryBase.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibraryBinaryTestModuleFactoryBase.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import java.nio.file.Path -abstract class KtLibraryBinaryModuleFactoryBase : KtModuleFactory { +abstract class KtLibraryBinaryTestModuleFactoryBase : KtTestModuleFactory { protected abstract val testModuleKind: TestModuleKind protected abstract fun decompileToPsiFiles(binaryRoot: Path, testServices: TestServices, project: Project): List diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibrarySourceModuleFactory.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibrarySourceTestModuleFactory.kt similarity index 97% rename from analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibrarySourceModuleFactory.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibrarySourceTestModuleFactory.kt index b310998be84..eab33ec38e8 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibrarySourceModuleFactory.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtLibrarySourceTestModuleFactory.kt @@ -21,7 +21,7 @@ import java.nio.file.Path /** * @see TestModuleKind.LibrarySource */ -object KtLibrarySourceModuleFactory : KtModuleFactory { +object KtLibrarySourceTestModuleFactory : KtTestModuleFactory { override fun createModule( testModule: TestModule, contextModule: KtTestModule?, diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtScriptModuleFactory.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtScriptTestModuleFactory.kt similarity index 95% rename from analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtScriptModuleFactory.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtScriptTestModuleFactory.kt index 136b34d7ca9..a6dba7f3b7f 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtScriptModuleFactory.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtScriptTestModuleFactory.kt @@ -15,7 +15,7 @@ import java.nio.file.Path /** * @see TestModuleKind.ScriptSource */ -object KtScriptModuleFactory : KtModuleFactory { +object KtScriptTestModuleFactory : KtTestModuleFactory { override fun createModule( testModule: TestModule, contextModule: KtTestModule?, diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtSourceModuleFactory.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtSourceTestModuleFactory.kt similarity index 95% rename from analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtSourceModuleFactory.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtSourceTestModuleFactory.kt index ef23812b42e..5531e06afe6 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtSourceModuleFactory.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtSourceTestModuleFactory.kt @@ -15,7 +15,7 @@ import java.nio.file.Path /** * @see TestModuleKind.Source */ -object KtSourceModuleFactory : KtModuleFactory { +object KtSourceTestModuleFactory : KtTestModuleFactory { override fun createModule( testModule: TestModule, contextModule: KtTestModule?, diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtModuleFactory.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtTestModuleFactory.kt similarity index 71% rename from analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtModuleFactory.kt rename to analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtTestModuleFactory.kt index 5ba616c0782..72e1e7c61e7 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtModuleFactory.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtTestModuleFactory.kt @@ -13,9 +13,9 @@ import org.jetbrains.kotlin.test.services.TestService import org.jetbrains.kotlin.test.services.TestServices import java.nio.file.Path -fun interface KtModuleFactory : TestService { +fun interface KtTestModuleFactory : TestService { /** - * Creates a [KtModule](org.jetbrains.kotlin.analysis.project.structure.KtModule) for the given [testModule]. + * Creates a [KtTestModule] for the given [testModule]. * * @param contextModule a module to use as a context module. Some kinds of modules (such as dangling file modules) require a * context module. Modules representing code fragments also require a context element. That is why the [KtTestModule] is passed @@ -32,13 +32,13 @@ fun interface KtModuleFactory : TestService { ): KtTestModule } -private val TestServices.ktModuleFactory: KtModuleFactory by TestServices.testServiceAccessor() +private val TestServices.ktTestModuleFactory: KtTestModuleFactory by TestServices.testServiceAccessor() /** - * Returns the appropriate [KtModuleFactory] to build a [KtModule][org.jetbrains.kotlin.analysis.project.structure.KtModule] for the given + * Returns the appropriate [KtTestModuleFactory] to build a [KtModule][org.jetbrains.kotlin.analysis.project.structure.KtModule] for the given * [testModule]. * - * By default, the [KtModuleFactory] registered with these [TestServices] is returned. It may be overruled by the + * By default, the [KtTestModuleFactory] registered with these [TestServices] is returned. It may be overruled by the * [MODULE_KIND][org.jetbrains.kotlin.analysis.test.framework.AnalysisApiTestDirectives.MODULE_KIND] directive for a specific test module. * * [DependencyKindModuleStructureTransformer][org.jetbrains.kotlin.analysis.test.framework.services.DependencyKindModuleStructureTransformer] @@ -46,13 +46,13 @@ private val TestServices.ktModuleFactory: KtModuleFactory by TestServices.testSe * * @see org.jetbrains.kotlin.analysis.test.framework.services.DependencyKindModuleStructureTransformer */ -fun TestServices.getKtModuleFactoryForTestModule(testModule: TestModule): KtModuleFactory = when (testModule.explicitTestModuleKind) { - TestModuleKind.Source -> KtSourceModuleFactory - TestModuleKind.LibraryBinary -> KtLibraryBinaryModuleFactory - TestModuleKind.LibraryBinaryDecompiled -> KtLibraryBinaryDecompiledModuleFactory - TestModuleKind.LibrarySource -> KtLibrarySourceModuleFactory - TestModuleKind.ScriptSource -> KtScriptModuleFactory - TestModuleKind.CodeFragment -> KtCodeFragmentModuleFactory +fun TestServices.getKtModuleFactoryForTestModule(testModule: TestModule): KtTestModuleFactory = when (testModule.explicitTestModuleKind) { + TestModuleKind.Source -> KtSourceTestModuleFactory + TestModuleKind.LibraryBinary -> KtLibraryBinaryTestModuleFactory + TestModuleKind.LibraryBinaryDecompiled -> KtLibraryBinaryDecompiledTestModuleFactory + TestModuleKind.LibrarySource -> KtLibrarySourceTestModuleFactory + TestModuleKind.ScriptSource -> KtScriptTestModuleFactory + TestModuleKind.CodeFragment -> KtCodeFragmentTestModuleFactory TestModuleKind.NotUnderContentRoot -> error("Unsupported test module kind: ${TestModuleKind.NotUnderContentRoot}") - else -> ktModuleFactory + else -> ktTestModuleFactory } diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/TestModuleKind.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/TestModuleKind.kt index b9023e384a9..89ceddda164 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/TestModuleKind.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/test/configurators/TestModuleKind.kt @@ -20,12 +20,12 @@ import org.jetbrains.kotlin.test.model.TestModule */ enum class TestModuleKind(val suffix: String) { /** - * @see org.jetbrains.kotlin.analysis.test.framework.project.structure.KtSourceModuleFactory + * @see org.jetbrains.kotlin.analysis.test.framework.project.structure.KtSourceTestModuleFactory */ Source("Source"), /** - * @see org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibraryBinaryModuleFactory + * @see org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibraryBinaryTestModuleFactory */ LibraryBinary("LibraryBinary"), @@ -37,22 +37,22 @@ enum class TestModuleKind(val suffix: String) { * module. See [AbstractAnalysisApiBasedTest][org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedTest] for an * overview of "main module" and "main file". * - * @see org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibraryBinaryDecompiledModuleFactory + * @see org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibraryBinaryDecompiledTestModuleFactory */ LibraryBinaryDecompiled("LibraryBinaryDecompiled"), /** - * @see org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibrarySourceModuleFactory + * @see org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibrarySourceTestModuleFactory */ LibrarySource("LibrarySource"), /** - * @see org.jetbrains.kotlin.analysis.test.framework.project.structure.KtScriptModuleFactory + * @see org.jetbrains.kotlin.analysis.test.framework.project.structure.KtScriptTestModuleFactory */ ScriptSource("ScriptSource"), /** - * @see org.jetbrains.kotlin.analysis.test.framework.project.structure.KtCodeFragmentModuleFactory + * @see org.jetbrains.kotlin.analysis.test.framework.project.structure.KtCodeFragmentTestModuleFactory */ CodeFragment("CodeFragment"), diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirCodeFragmentTestConfigurator.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirCodeFragmentTestConfigurator.kt index 851939a16df..265d8f3aa8f 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirCodeFragmentTestConfigurator.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirCodeFragmentTestConfigurator.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators import com.intellij.openapi.Disposable import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiLibraryBaseTestServiceRegistrar -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtCodeFragmentModuleFactory -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtCodeFragmentTestModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModuleFactory import org.jetbrains.kotlin.analysis.test.framework.services.DependencyKindModuleStructureTransformer import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar import org.jetbrains.kotlin.test.TestInfrastructureInternals @@ -21,7 +21,7 @@ class AnalysisApiFirCodeFragmentTestConfigurator( super.configureTest(builder, disposable) builder.apply { - useAdditionalService { KtCodeFragmentModuleFactory } + useAdditionalService { KtCodeFragmentTestModuleFactory } @OptIn(TestInfrastructureInternals::class) useModuleStructureTransformers(DependencyKindModuleStructureTransformer) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirLibraryBinaryDecompiledTestConfigurator.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirLibraryBinaryDecompiledTestConfigurator.kt index 01beac5d550..9c2d4c546a8 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirLibraryBinaryDecompiledTestConfigurator.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirLibraryBinaryDecompiledTestConfigurator.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisAp import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiLibraryBaseTestServiceRegistrar import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AnalysisApiFirTestServiceRegistrar import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.configureOptionalTestCompilerPlugin -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibraryBinaryDecompiledModuleFactory -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibraryBinaryDecompiledTestModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModuleFactory import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModuleProjectStructure import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestModuleStructureFactory import org.jetbrains.kotlin.analysis.test.framework.services.configuration.AnalysisApiBinaryLibraryIndexingMode @@ -35,7 +35,7 @@ object AnalysisApiFirLibraryBinaryDecompiledTestConfigurator : AnalysisApiTestCo override fun configureTest(builder: TestConfigurationBuilder, disposable: Disposable) { builder.apply { - useAdditionalService { KtLibraryBinaryDecompiledModuleFactory } + useAdditionalService { KtLibraryBinaryDecompiledTestModuleFactory } useAdditionalService { AnalysisApiIndexingConfiguration(AnalysisApiBinaryLibraryIndexingMode.INDEX_STUBS) } configureLibraryCompilationSupport(this) configureOptionalTestCompilerPlugin() diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirLibrarySourceTestConfigurator.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirLibrarySourceTestConfigurator.kt index 4a0e6510b35..f50cda6d7d0 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirLibrarySourceTestConfigurator.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirLibrarySourceTestConfigurator.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisAp import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiLibraryBaseTestServiceRegistrar import org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based.SealedClassesInheritorsCalculatorPreAnalysisHandler import org.jetbrains.kotlin.analysis.low.level.api.fir.test.base.AnalysisApiFirTestServiceRegistrar -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibrarySourceModuleFactory -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtLibrarySourceTestModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModuleFactory import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModuleProjectStructure import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestModuleStructureFactory import org.jetbrains.kotlin.analysis.test.framework.services.configuration.AnalysisApiBinaryLibraryIndexingMode @@ -37,7 +37,7 @@ object AnalysisApiFirLibrarySourceTestConfigurator : AnalysisApiTestConfigurator disposable: Disposable ) { builder.apply { - useAdditionalService { KtLibrarySourceModuleFactory } + useAdditionalService { KtLibrarySourceTestModuleFactory } useAdditionalService { DispatchingTestModuleCompiler() } useAdditionalService { AnalysisApiIndexingConfiguration(AnalysisApiBinaryLibraryIndexingMode.INDEX_STUBS) } useDirectives(SealedClassesInheritorsCalculatorPreAnalysisHandler.Directives) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirOutOfContentRootTestConfigurator.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirOutOfContentRootTestConfigurator.kt index fabe9d1101b..613dbf6f404 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirOutOfContentRootTestConfigurator.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirOutOfContentRootTestConfigurator.kt @@ -12,7 +12,7 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.LLFirBuiltinsSessionFactory import org.jetbrains.kotlin.analysis.project.structure.KtModule import org.jetbrains.kotlin.analysis.project.structure.KtNotUnderContentRootModule -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModuleFactory import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModuleProjectStructure import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModule import org.jetbrains.kotlin.analysis.test.framework.project.structure.TestModuleStructureFactory @@ -38,7 +38,7 @@ object AnalysisApiFirOutOfContentRootTestConfigurator : AnalysisApiFirSourceLike builder.apply { useDirectives(Directives) - useAdditionalService { KtOutOfContentRootModuleFactory } + useAdditionalService { KtOutOfContentRootTestModuleFactory } } } @@ -64,7 +64,7 @@ object AnalysisApiFirOutOfContentRootTestConfigurator : AnalysisApiFirSourceLike private class SkipWhenOutOfContentRootException : SkipTestException() -private object KtOutOfContentRootModuleFactory : KtModuleFactory { +private object KtOutOfContentRootTestModuleFactory : KtTestModuleFactory { override fun createModule( testModule: TestModule, contextModule: KtTestModule?, diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirScriptTestConfigurator.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirScriptTestConfigurator.kt index 05c148a5e7a..d09aa4f8142 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirScriptTestConfigurator.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirScriptTestConfigurator.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators import com.intellij.openapi.Disposable import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiScriptTestServiceRegistrar -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtModuleFactory -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtScriptModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtScriptTestModuleFactory import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder @@ -18,7 +18,7 @@ class AnalysisApiFirScriptTestConfigurator(analyseInDependentSession: Boolean) : super.configureTest(builder, disposable) builder.apply { - useAdditionalService { KtScriptModuleFactory } + useAdditionalService { KtScriptTestModuleFactory } } } diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirSourceTestConfigurator.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirSourceTestConfigurator.kt index ca310c20185..a5de3ff1c88 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirSourceTestConfigurator.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirSourceTestConfigurator.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators import com.intellij.openapi.Disposable import org.jetbrains.kotlin.analysis.api.impl.base.test.configurators.AnalysisApiLibraryBaseTestServiceRegistrar -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtModuleFactory -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtSourceModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtSourceTestModuleFactory import org.jetbrains.kotlin.analysis.test.framework.services.DependencyKindModuleStructureTransformer import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestServiceRegistrar import org.jetbrains.kotlin.test.TestInfrastructureInternals @@ -21,7 +21,7 @@ open class AnalysisApiFirSourceTestConfigurator( super.configureTest(builder, disposable) builder.apply { - useAdditionalService { KtSourceModuleFactory } + useAdditionalService { KtSourceTestModuleFactory } @OptIn(TestInfrastructureInternals::class) useModuleStructureTransformers(DependencyKindModuleStructureTransformer) diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirStdlibSourceTestConfigurator.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirStdlibSourceTestConfigurator.kt index 1ad2dbd80f4..fc72547575a 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirStdlibSourceTestConfigurator.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirStdlibSourceTestConfigurator.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators import com.intellij.openapi.Disposable import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtModuleFactory +import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModuleFactory import org.jetbrains.kotlin.analysis.test.framework.project.structure.KtTestModule import org.jetbrains.kotlin.analysis.test.framework.project.structure.createKtLibrarySourceModule import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime @@ -20,12 +20,12 @@ object AnalysisApiFirStdlibSourceTestConfigurator : AnalysisApiFirSourceLikeTest override fun configureTest(builder: TestConfigurationBuilder, disposable: Disposable) { super.configureTest(builder, disposable) builder.apply { - useAdditionalService { KtStdlibSourceModuleFactory } + useAdditionalService { KtStdlibSourceTestModuleFactory } } } } -private object KtStdlibSourceModuleFactory : KtModuleFactory { +private object KtStdlibSourceTestModuleFactory : KtTestModuleFactory { override fun createModule( testModule: TestModule, contextModule: KtTestModule?,