From ba48f80e539928f7946b3b61eef92c59193f97ee Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 20 Jul 2021 12:47:55 +0300 Subject: [PATCH] [Test] Introduce single interface for all entities which provides directive containers and test services --- .../kotlin/test/model/AfterAnalysisChecker.kt | 6 +----- .../kotlin/test/model/AnalysisHandler.kt | 10 +--------- .../org/jetbrains/kotlin/test/model/Facades.kt | 16 +++++++++------- .../test/services/AdditionalSourceProvider.kt | 7 ++----- .../test/services/EnvironmentConfigurator.kt | 14 ++++++-------- .../kotlin/test/services/MetaTestConfigurator.kt | 7 ++----- .../test/backend/BlackBoxCodegenSuppressor.kt | 7 +++++-- .../backend/classic/ClassicJvmBackendFacade.kt | 2 +- .../backend/handlers/BytecodeInliningHandler.kt | 2 +- .../backend/handlers/BytecodeListingHandler.kt | 2 +- .../test/backend/handlers/BytecodeTextHandler.kt | 3 +-- .../test/backend/handlers/DxCheckerHandler.kt | 2 +- .../handlers/FirIrDumpIdenticalCheckers.kt | 2 +- .../handlers/IrPrettyKotlinDumpHandler.kt | 2 +- .../test/backend/handlers/IrTextDumpHandler.kt | 8 +++++--- .../backend/handlers/IrTreeVerifierHandler.kt | 2 +- .../handlers/NoCompilationErrorsHandler.kt | 2 +- .../handlers/NoFirCompilationErrorsHandler.kt | 2 +- .../test/backend/handlers/SMAPDumpHandler.kt | 2 +- .../handlers/ClassicDiagnosticsHandler.kt | 3 +-- .../classic/handlers/ConstantValuesHandler.kt | 2 +- .../classic/handlers/DeclarationsDumpHandler.kt | 2 +- .../DiagnosticTestWithJavacSkipConfigurator.kt | 2 +- .../classic/handlers/DynamicCallsDumpHandler.kt | 2 +- .../handlers/FirTestDataConsistencyHandler.kt | 2 +- .../test/frontend/fir/FirFrontendFacade.kt | 2 +- .../frontend/fir/FirMetaInfoDiffSuppressor.kt | 2 +- .../frontend/fir/handlers/FirCfgDumpHandler.kt | 2 +- .../fir/handlers/FirDiagnosticsHandler.kt | 2 +- .../test/frontend/fir/handlers/FirDumpHandler.kt | 2 +- .../frontend/fir/handlers/FirScopeDumpHandler.kt | 2 +- .../kotlin/test/impl/TestConfigurationImpl.kt | 12 ++++++------ .../CommonEnvironmentConfigurator.kt | 2 +- .../configuration/JsEnvironmentConfigurator.kt | 2 +- .../configuration/JvmEnvironmentConfigurator.kt | 2 +- .../JvmForeignAnnotationsConfigurator.kt | 8 +++++--- .../AdditionalDiagnosticsSourceFilesProvider.kt | 2 +- .../CodegenHelpersSourceFilesProvider.kt | 2 +- .../CoroutineHelpersSourceFilesProvider.kt | 2 +- .../IrInterpreterHelpersSourceFilesProvider.kt | 4 ++-- .../SpecHelpersSourceFilesProvider.kt | 2 +- .../compiler/based/AbstractCompilerBasedTest.kt | 4 ++-- .../api/compiler/based/IdeTestIgnoreHandler.kt | 7 +++---- 43 files changed, 79 insertions(+), 93 deletions(-) diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/AfterAnalysisChecker.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/AfterAnalysisChecker.kt index 3b5fd4cf324..3a85078fda0 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/AfterAnalysisChecker.kt +++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/AfterAnalysisChecker.kt @@ -6,13 +6,9 @@ package org.jetbrains.kotlin.test.model import org.jetbrains.kotlin.test.WrappedException -import org.jetbrains.kotlin.test.directives.model.DirectivesContainer import org.jetbrains.kotlin.test.services.TestServices -abstract class AfterAnalysisChecker(protected val testServices: TestServices) { - open val directives: List - get() = emptyList() - +abstract class AfterAnalysisChecker(protected val testServices: TestServices) : ServicesAndDirectivesContainer { open fun check(failedAssertions: List) {} open fun suppressIfNeeded(failedAssertions: List): List = failedAssertions diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/AnalysisHandler.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/AnalysisHandler.kt index 992d9adc172..c739c943505 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/AnalysisHandler.kt +++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/AnalysisHandler.kt @@ -6,8 +6,6 @@ package org.jetbrains.kotlin.test.model import org.jetbrains.kotlin.test.Assertions -import org.jetbrains.kotlin.test.directives.model.DirectivesContainer -import org.jetbrains.kotlin.test.services.ServiceRegistrationData import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.assertions @@ -15,16 +13,10 @@ abstract class AnalysisHandler>( val testServices: TestServices, val failureDisablesNextSteps: Boolean, val doNotRunIfThereWerePreviousFailures: Boolean -) { +) : ServicesAndDirectivesContainer { protected val assertions: Assertions get() = testServices.assertions - open val directivesContainers: List - get() = emptyList() - - open val additionalServices: List - get() = emptyList() - abstract val artifactKind: TestArtifactKind abstract fun processModule(module: TestModule, info: A) diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/Facades.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/Facades.kt index dc6fbba6eb2..8066d86a1cf 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/Facades.kt +++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/model/Facades.kt @@ -9,17 +9,19 @@ import org.jetbrains.kotlin.test.directives.model.DirectivesContainer import org.jetbrains.kotlin.test.services.ServiceRegistrationData import org.jetbrains.kotlin.test.services.TestServices -abstract class AbstractTestFacade, O : ResultingArtifact> { +interface ServicesAndDirectivesContainer { + val additionalServices: List + get() = emptyList() + + val directiveContainers: List + get() = emptyList() +} + +abstract class AbstractTestFacade, O : ResultingArtifact> : ServicesAndDirectivesContainer { abstract val inputKind: TestArtifactKind abstract val outputKind: TestArtifactKind abstract fun transform(module: TestModule, inputArtifact: I): O? - - open val additionalServices: List - get() = emptyList() - - open val additionalDirectives: List - get() = emptyList() } abstract class FrontendFacade>( diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/AdditionalSourceProvider.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/AdditionalSourceProvider.kt index 22642e37ea5..d0ed719b140 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/AdditionalSourceProvider.kt +++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/AdditionalSourceProvider.kt @@ -5,17 +5,14 @@ package org.jetbrains.kotlin.test.services -import org.jetbrains.kotlin.test.directives.model.DirectivesContainer import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives import org.jetbrains.kotlin.test.directives.model.SimpleDirective +import org.jetbrains.kotlin.test.model.ServicesAndDirectivesContainer import org.jetbrains.kotlin.test.model.TestFile import org.jetbrains.kotlin.test.model.TestModule import java.io.File -abstract class AdditionalSourceProvider(val testServices: TestServices) { - open val directives: List - get() = emptyList() - +abstract class AdditionalSourceProvider(val testServices: TestServices) : ServicesAndDirectivesContainer { /** * Note that you can not use [testServices.moduleStructure] here because it's not initialized yet */ diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt index cffc9ea490d..babd8e781d4 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt +++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt @@ -10,16 +10,14 @@ import org.jetbrains.kotlin.config.AnalysisFlag import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfigurationKey import org.jetbrains.kotlin.config.LanguageVersion -import org.jetbrains.kotlin.test.directives.model.* +import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives +import org.jetbrains.kotlin.test.directives.model.SimpleDirective +import org.jetbrains.kotlin.test.directives.model.ValueDirective +import org.jetbrains.kotlin.test.directives.model.singleOrZeroValue +import org.jetbrains.kotlin.test.model.ServicesAndDirectivesContainer import org.jetbrains.kotlin.test.model.TestModule -abstract class EnvironmentConfigurator(protected val testServices: TestServices) { - open val directivesContainers: List - get() = emptyList() - - open val additionalServices: List - get() = emptyList() - +abstract class EnvironmentConfigurator(protected val testServices: TestServices) : ServicesAndDirectivesContainer { protected val moduleStructure: TestModuleStructure get() = testServices.moduleStructure diff --git a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/MetaTestConfigurator.kt b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/MetaTestConfigurator.kt index 75a155dce84..8c53d10af7c 100644 --- a/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/MetaTestConfigurator.kt +++ b/compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/MetaTestConfigurator.kt @@ -5,12 +5,9 @@ package org.jetbrains.kotlin.test.services -import org.jetbrains.kotlin.test.directives.model.DirectivesContainer - -abstract class MetaTestConfigurator(protected val testServices: TestServices) { - open val directives: List - get() = emptyList() +import org.jetbrains.kotlin.test.model.ServicesAndDirectivesContainer +abstract class MetaTestConfigurator(protected val testServices: TestServices) : ServicesAndDirectivesContainer { open fun transformTestDataPath(testDataFileName: String): String = testDataFileName open fun shouldSkipTest(): Boolean = false diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/BlackBoxCodegenSuppressor.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/BlackBoxCodegenSuppressor.kt index 87503846cc8..3a7705b90bd 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/BlackBoxCodegenSuppressor.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/BlackBoxCodegenSuppressor.kt @@ -14,14 +14,17 @@ import org.jetbrains.kotlin.test.directives.model.DirectivesContainer import org.jetbrains.kotlin.test.directives.model.ValueDirective import org.jetbrains.kotlin.test.model.AfterAnalysisChecker import org.jetbrains.kotlin.test.model.FrontendKinds -import org.jetbrains.kotlin.test.services.* +import org.jetbrains.kotlin.test.services.TestModuleStructure +import org.jetbrains.kotlin.test.services.TestServices +import org.jetbrains.kotlin.test.services.defaultsProvider +import org.jetbrains.kotlin.test.services.moduleStructure import org.jetbrains.kotlin.test.util.joinToArrayString class BlackBoxCodegenSuppressor( testServices: TestServices, val customIgnoreDirective: ValueDirective? = null ) : AfterAnalysisChecker(testServices) { - override val directives: List + override val directiveContainers: List get() = listOf(CodegenTestDirectives) @OptIn(ExperimentalStdlibApi::class) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/classic/ClassicJvmBackendFacade.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/classic/ClassicJvmBackendFacade.kt index fc215cdafff..3e23448a53e 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/classic/ClassicJvmBackendFacade.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/classic/ClassicJvmBackendFacade.kt @@ -22,7 +22,7 @@ class ClassicJvmBackendFacade( ) : ClassicBackendFacade(testServices, ArtifactKinds.Jvm) { private val javaCompilerFacade = JavaCompilerFacade(testServices) - override val additionalDirectives: List + override val directiveContainers: List get() = listOf(CodegenTestDirectives) override fun transform( diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BytecodeInliningHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BytecodeInliningHandler.kt index 00670637558..094fdf6fb58 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BytecodeInliningHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BytecodeInliningHandler.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.test.services.dependencyProvider import org.jetbrains.kotlin.test.services.moduleStructure class BytecodeInliningHandler(testServices: TestServices) : JvmBinaryArtifactHandler(testServices) { - override val directivesContainers: List + override val directiveContainers: List get() = listOf(CodegenTestDirectives) override fun processModule(module: TestModule, info: BinaryArtifacts.Jvm) {} diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BytecodeListingHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BytecodeListingHandler.kt index 1f7424b784d..91cde703998 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BytecodeListingHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BytecodeListingHandler.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.test.utils.withSuffixAndExtension import java.io.File class BytecodeListingHandler(testServices: TestServices) : JvmBinaryArtifactHandler(testServices) { - override val directivesContainers: List + override val directiveContainers: List get() = listOf(CodegenTestDirectives) private val multiModuleInfoDumper = MultiModuleInfoDumperImpl() diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BytecodeTextHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BytecodeTextHandler.kt index 67b70266ff6..843cd258da1 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BytecodeTextHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BytecodeTextHandler.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.test.model.TestFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.isKtFile -import java.util.LinkedHashMap class BytecodeTextHandler(testServices: TestServices, private val shouldEnableExplicitly: Boolean = false) : JvmBinaryArtifactHandler(testServices) { @@ -25,7 +24,7 @@ class BytecodeTextHandler(testServices: TestServices, private val shouldEnableEx private const val IGNORED_PREFIX = "helpers/" } - override val directivesContainers: List + override val directiveContainers: List get() = listOf(CodegenTestDirectives) override fun processModule(module: TestModule, info: BinaryArtifacts.Jvm) { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/DxCheckerHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/DxCheckerHandler.kt index 16b037a85a6..ed13d1e197a 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/DxCheckerHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/DxCheckerHandler.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.jvm.compiledClassesManager class DxCheckerHandler(testServices: TestServices) : JvmBinaryArtifactHandler(testServices) { - override val directivesContainers: List + override val directiveContainers: List get() = listOf(CodegenTestDirectives) override fun processModule(module: TestModule, info: BinaryArtifacts.Jvm) { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/FirIrDumpIdenticalCheckers.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/FirIrDumpIdenticalCheckers.kt index 5a11b2570c2..f63add3999c 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/FirIrDumpIdenticalCheckers.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/FirIrDumpIdenticalCheckers.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.test.utils.withExtension import java.io.File class FirIrDumpIdenticalChecker(testServices: TestServices) : AfterAnalysisChecker(testServices) { - override val directives: List + override val directiveContainers: List get() = listOf(FirDiagnosticsDirectives) private val simpleDumpChecker = object : FirIdenticalCheckerHelper(testServices) { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrPrettyKotlinDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrPrettyKotlinDumpHandler.kt index 115856f3a3b..3809a7284a3 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrPrettyKotlinDumpHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrPrettyKotlinDumpHandler.kt @@ -30,7 +30,7 @@ class IrPrettyKotlinDumpHandler(testServices: TestServices) : AbstractIrHandler( private val dumper = MultiModuleInfoDumperImpl("// MODULE: %s") - override val directivesContainers: List + override val directiveContainers: List get() = listOf(CodegenTestDirectives, FirDiagnosticsDirectives) override fun processModule(module: TestModule, info: IrBackendInput) { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTextDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTextDumpHandler.kt index 277579ec894..5a3930aaabd 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTextDumpHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTextDumpHandler.kt @@ -12,7 +12,10 @@ import org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.JsManglerDesc import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl -import org.jetbrains.kotlin.ir.util.* +import org.jetbrains.kotlin.ir.util.DeclarationStubGenerator +import org.jetbrains.kotlin.ir.util.SymbolTable +import org.jetbrains.kotlin.ir.util.dump +import org.jetbrains.kotlin.ir.util.dumpTreesFromLineNumber import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi2ir.generators.DeclarationStubGeneratorImpl @@ -33,7 +36,6 @@ import org.jetbrains.kotlin.test.utils.MultiModuleInfoDumperImpl import org.jetbrains.kotlin.test.utils.withExtension import org.jetbrains.kotlin.test.utils.withSuffixAndExtension import java.io.File -import java.io.PrintStream class IrTextDumpHandler(testServices: TestServices) : AbstractIrHandler(testServices) { companion object { @@ -51,7 +53,7 @@ class IrTextDumpHandler(testServices: TestServices) : AbstractIrHandler(testServ } } - override val directivesContainers: List + override val directiveContainers: List get() = listOf(CodegenTestDirectives, FirDiagnosticsDirectives) private val baseDumper = MultiModuleInfoDumperImpl() diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTreeVerifierHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTreeVerifierHandler.kt index 841e62ce4ae..fb8225b0bb7 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTreeVerifierHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/IrTreeVerifierHandler.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices class IrTreeVerifierHandler(testServices: TestServices) : AbstractIrHandler(testServices) { - override val directivesContainers: List + override val directiveContainers: List get() = listOf(CodegenTestDirectives) override fun processModule(module: TestModule, info: IrBackendInput) { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/NoCompilationErrorsHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/NoCompilationErrorsHandler.kt index 07516602e42..4e5acedbffc 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/NoCompilationErrorsHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/NoCompilationErrorsHandler.kt @@ -18,7 +18,7 @@ class NoCompilationErrorsHandler(testServices: TestServices) : ClassicFrontendAn testServices, failureDisablesNextSteps = true ) { - override val directivesContainers: List + override val directiveContainers: List get() = listOf(CodegenTestDirectives) override fun processModule(module: TestModule, info: ClassicFrontendOutputArtifact) { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/NoFirCompilationErrorsHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/NoFirCompilationErrorsHandler.kt index e3c951c5384..321b5dbf202 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/NoFirCompilationErrorsHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/NoFirCompilationErrorsHandler.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices class NoFirCompilationErrorsHandler(testServices: TestServices) : FirAnalysisHandler(testServices, failureDisablesNextSteps = true) { - override val directivesContainers: List + override val directiveContainers: List get() = listOf(CodegenTestDirectives) override fun processModule(module: TestModule, info: FirOutputArtifact) { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/SMAPDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/SMAPDumpHandler.kt index 8d436f15936..8a00b933054 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/SMAPDumpHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/SMAPDumpHandler.kt @@ -27,7 +27,7 @@ class SMAPDumpHandler(testServices: TestServices) : JvmBinaryArtifactHandler(tes const val SMAP_NON_SEP_EXT = "smap-nonseparate-compilation" } - override val directivesContainers: List + override val directiveContainers: List get() = listOf(CodegenTestDirectives) private val dumper = MultiModuleInfoDumperImpl(moduleHeaderTemplate = null) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/ClassicDiagnosticsHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/ClassicDiagnosticsHandler.kt index 4c4b9cf8ae8..2807a6514ea 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/ClassicDiagnosticsHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/ClassicDiagnosticsHandler.kt @@ -29,10 +29,9 @@ import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendOutputArtifact import org.jetbrains.kotlin.test.model.TestFile import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.* -import java.util.* class ClassicDiagnosticsHandler(testServices: TestServices) : ClassicFrontendAnalysisHandler(testServices) { - override val directivesContainers: List = + override val directiveContainers: List = listOf(DiagnosticsDirectives) override val additionalServices: List = diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/ConstantValuesHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/ConstantValuesHandler.kt index 87bff910637..8a393365939 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/ConstantValuesHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/ConstantValuesHandler.kt @@ -48,7 +48,7 @@ class ConstantValuesHandler(testServices: TestServices) : ClassicFrontendAnalysi UsesVariableAsConstant } - override val directivesContainers: List + override val directiveContainers: List get() = listOf(DiagnosticsDirectives) private val metaInfoHandler = testServices.globalMetadataInfoHandler diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DeclarationsDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DeclarationsDumpHandler.kt index 2a9811ff291..1a273fa3600 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DeclarationsDumpHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DeclarationsDumpHandler.kt @@ -42,7 +42,7 @@ class DeclarationsDumpHandler( private val JAVA_PACKAGE_PATTERN = Pattern.compile("^\\s*package [.\\w\\d]*", Pattern.MULTILINE) } - override val directivesContainers: List + override val directiveContainers: List get() = listOf(DiagnosticsDirectives) private val dumper: MultiModuleInfoDumper = MultiModuleInfoDumperImpl(moduleHeaderTemplate = "// -- Module: <%s> --") diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DiagnosticTestWithJavacSkipConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DiagnosticTestWithJavacSkipConfigurator.kt index 20b1569feb5..1f6611741ea 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DiagnosticTestWithJavacSkipConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DiagnosticTestWithJavacSkipConfigurator.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.moduleStructure class DiagnosticTestWithJavacSkipConfigurator(testServices: TestServices) : MetaTestConfigurator(testServices) { - override val directives: List + override val directiveContainers: List get() = listOf(DiagnosticsDirectives) override fun shouldSkipTest(): Boolean { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DynamicCallsDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DynamicCallsDumpHandler.kt index 5450174adb1..aaaabd0247b 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DynamicCallsDumpHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/DynamicCallsDumpHandler.kt @@ -26,7 +26,7 @@ class DynamicCallsDumpHandler(testServices: TestServices) : ClassicFrontendAnaly private const val DYNAMIC_PREFIX = ".dynamic.txt" } - override val directivesContainers: List + override val directiveContainers: List get() = listOf(DiagnosticsDirectives) private val dumper: MultiModuleInfoDumper = MultiModuleInfoDumperImpl(moduleHeaderTemplate = "// -- Module: <%s> --") diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/FirTestDataConsistencyHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/FirTestDataConsistencyHandler.kt index 1597ec7f883..de90a119cdf 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/FirTestDataConsistencyHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/handlers/FirTestDataConsistencyHandler.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.test.utils.firTestDataFile import java.io.File class FirTestDataConsistencyHandler(testServices: TestServices) : AfterAnalysisChecker(testServices) { - override val directives: List + override val directiveContainers: List get() = listOf(FirDiagnosticsDirectives) override fun check(failedAssertions: List) { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt index 5437ec86d25..fa5e902fb15 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt @@ -39,7 +39,7 @@ class FirFrontendFacade( override val additionalServices: List get() = listOf(service(::FirModuleInfoProvider)) - override val additionalDirectives: List + override val directiveContainers: List get() = listOf(FirDiagnosticsDirectives) override fun analyze(module: TestModule): FirOutputArtifact { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirMetaInfoDiffSuppressor.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirMetaInfoDiffSuppressor.kt index 582a5f52d24..593d5219622 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirMetaInfoDiffSuppressor.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirMetaInfoDiffSuppressor.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.moduleStructure class FirMetaInfoDiffSuppressor(testServices: TestServices) : AfterAnalysisChecker(testServices) { - override val directives: List + override val directiveContainers: List get() = listOf(CodegenTestDirectives) override fun suppressIfNeeded(failedAssertions: List): List { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirCfgDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirCfgDumpHandler.kt index ed1389beb31..aede4a8a82d 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirCfgDumpHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirCfgDumpHandler.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.test.services.moduleStructure // TODO: adapt to multifile and multimodule tests class FirCfgDumpHandler(testServices: TestServices) : FirAnalysisHandler(testServices) { - override val directivesContainers: List + override val directiveContainers: List get() = listOf(FirDiagnosticsDirectives) private val builder = StringBuilder() diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt index c96a1b03f7d..350a62e2c50 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt @@ -61,7 +61,7 @@ class FirDiagnosticsHandler(testServices: TestServices) : FirAnalysisHandler(tes private val diagnosticsService: DiagnosticsService get() = testServices.diagnosticsService - override val directivesContainers: List = + override val directiveContainers: List = listOf(DiagnosticsDirectives) override val additionalServices: List = diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDumpHandler.kt index ad3cb818713..cec5ed0de58 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDumpHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDumpHandler.kt @@ -20,7 +20,7 @@ class FirDumpHandler( ) : FirAnalysisHandler(testServices) { private val dumper: MultiModuleInfoDumper = MultiModuleInfoDumperImpl() - override val directivesContainers: List + override val directiveContainers: List get() = listOf(FirDiagnosticsDirectives) override fun processModule(module: TestModule, info: FirOutputArtifact) { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirScopeDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirScopeDumpHandler.kt index ce4c4fe6d53..4ae5bff865e 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirScopeDumpHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirScopeDumpHandler.kt @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.util.withIndent class FirScopeDumpHandler(testServices: TestServices) : FirAnalysisHandler(testServices) { private val dumper = MultiModuleInfoDumperImpl() - override val directivesContainers: List + override val directiveContainers: List get() = listOf(FirDiagnosticsDirectives) override fun processModule(module: TestModule, info: FirOutputArtifact) { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/impl/TestConfigurationImpl.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/impl/TestConfigurationImpl.kt index c1979cdf789..715da881693 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/impl/TestConfigurationImpl.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/impl/TestConfigurationImpl.kt @@ -68,7 +68,7 @@ class TestConfigurationImpl( private val environmentConfigurators: List = environmentConfigurators.map { it.invoke(testServices) }.also { configurators -> - configurators.flatMapTo(allDirectives) { it.directivesContainers } + configurators.flatMapTo(allDirectives) { it.directiveContainers } for (configurator in configurators) { configurator.additionalServices.forEach { testServices.register(it) } } @@ -80,7 +80,7 @@ class TestConfigurationImpl( override val moduleStructureExtractor: ModuleStructureExtractor = ModuleStructureExtractorImpl( testServices, additionalSourceProviders.map { it.invoke(testServices) }.also { - it.flatMapTo(allDirectives) { provider -> provider.directives } + it.flatMapTo(allDirectives) { provider -> provider.directiveContainers } }, moduleStructureTransformers, this.environmentConfigurators @@ -88,13 +88,13 @@ class TestConfigurationImpl( override val metaTestConfigurators: List = metaTestConfigurators.map { it.invoke(testServices).also { configurator -> - allDirectives += configurator.directives + allDirectives += configurator.directiveContainers } } override val afterAnalysisCheckers: List = afterAnalysisCheckers.map { it.invoke(testServices).also { checker -> - allDirectives += checker.directives + allDirectives += checker.directiveContainers } } @@ -141,7 +141,7 @@ class TestConfigurationImpl( } private fun registerDirectivesAndServices(handler: AnalysisHandler<*>) { - allDirectives += handler.directivesContainers + allDirectives += handler.directiveContainers testServices.register(handler.additionalServices) } @@ -150,7 +150,7 @@ class TestConfigurationImpl( this@TestConfigurationImpl.facades.values.forEach { it.values.forEach { facade -> register(facade.additionalServices) - allDirectives += facade.additionalDirectives + allDirectives += facade.directiveContainers } } } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/CommonEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/CommonEnvironmentConfigurator.kt index 1d9d69563e5..6ea03c4075d 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/CommonEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/CommonEnvironmentConfigurator.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.test.services.EnvironmentConfigurator import org.jetbrains.kotlin.test.services.TestServices class CommonEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) { - override val directivesContainers: List + override val directiveContainers: List get() = listOf(ConfigurationDirectives) override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt index 2c7c1e7355a..966ccc1c212 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.util.joinToArrayString class JsEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) { - override val directivesContainers: List + override val directiveContainers: List get() = listOf(JsEnvironmentConfigurationDirectives) override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) { diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt index 9cc2bf6c65a..f1bc773f2e8 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt @@ -124,7 +124,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig } } - override val directivesContainers: List + override val directiveContainers: List get() = listOf(JvmEnvironmentConfigurationDirectives) override val additionalServices: List diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt index da7c67a0092..1d6f70caa95 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmForeignAnnotationsConfigurator.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.load.java.* +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.TestJavacVersion import org.jetbrains.kotlin.test.directives.ForeignAnnotationsDirectives @@ -23,9 +24,10 @@ import org.jetbrains.kotlin.test.directives.model.DirectivesContainer import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives import org.jetbrains.kotlin.test.directives.model.singleOrZeroValue import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.* +import org.jetbrains.kotlin.test.services.EnvironmentConfigurator +import org.jetbrains.kotlin.test.services.JUnit5Assertions +import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.util.KtTestUtil -import org.jetbrains.kotlin.name.FqName import java.io.File import kotlin.io.path.createTempDirectory @@ -40,7 +42,7 @@ open class JvmForeignAnnotationsConfigurator(testServices: TestServices) : Envir const val JSR_305_TEST_ANNOTATIONS_PATH = "compiler/testData/diagnostics/helpers/jsr305_test_annotations" } - override val directivesContainers: List + override val directiveContainers: List get() = listOf(ForeignAnnotationsDirectives) @OptIn(ExperimentalStdlibApi::class) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/AdditionalDiagnosticsSourceFilesProvider.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/AdditionalDiagnosticsSourceFilesProvider.kt index a9caf35b379..831b689a19a 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/AdditionalDiagnosticsSourceFilesProvider.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/AdditionalDiagnosticsSourceFilesProvider.kt @@ -24,7 +24,7 @@ class AdditionalDiagnosticsSourceFilesProvider(testServices: TestServices, baseD INFERENCE_HELPERS to "$helpersPath/inference/inferenceUtils.kt" ) - override val directives: List = + override val directiveContainers: List = listOf(AdditionalFilesDirectives) @OptIn(ExperimentalStdlibApi::class) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/CodegenHelpersSourceFilesProvider.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/CodegenHelpersSourceFilesProvider.kt index 1cd65645792..5d8be3ca7b7 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/CodegenHelpersSourceFilesProvider.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/CodegenHelpersSourceFilesProvider.kt @@ -21,7 +21,7 @@ class CodegenHelpersSourceFilesProvider(testServices: TestServices) : Additional private const val IR_BACKEND_PATH = "$HELPERS_PATH/CodegenTestHelpersIR.kt" } - override val directives: List = + override val directiveContainers: List = listOf(CodegenTestDirectives) @OptIn(ExperimentalStdlibApi::class) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/CoroutineHelpersSourceFilesProvider.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/CoroutineHelpersSourceFilesProvider.kt index c6af8690e8e..efede5e9a38 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/CoroutineHelpersSourceFilesProvider.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/CoroutineHelpersSourceFilesProvider.kt @@ -24,7 +24,7 @@ class CoroutineHelpersSourceFilesProvider(testServices: TestServices, testDataPa private val stateMachineCheckerPath = "$helpersPath/StateMachineChecker.kt" private val tailCallOptimizationCheckerPath = "$helpersPath/TailCallOptimizationChecker.kt" - override val directives: List = + override val directiveContainers: List = listOf(AdditionalFilesDirectives) @OptIn(ExperimentalStdlibApi::class) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/IrInterpreterHelpersSourceFilesProvider.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/IrInterpreterHelpersSourceFilesProvider.kt index f3d4b2eee05..18a462806c3 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/IrInterpreterHelpersSourceFilesProvider.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/IrInterpreterHelpersSourceFilesProvider.kt @@ -38,7 +38,7 @@ class IrInterpreterHelpersSourceFilesProvider(testServices: TestServices) : Addi ) } - override val directives: List = + override val directiveContainers: List = listOf(AdditionalFilesDirectives) private fun getTestFilesForEachDirectory(vararg directories: String): List { @@ -55,4 +55,4 @@ class IrInterpreterHelpersSourceFilesProvider(testServices: TestServices) : Addi override fun produceAdditionalFiles(globalDirectives: RegisteredDirectives, module: TestModule): List { return getTestFilesForEachDirectory(HELPERS_PATH, UNSIGNED_PATH, *RUNTIME_PATHS, *ANNOTATIONS_PATHS, REFLECT_PATH) } -} \ No newline at end of file +} diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/SpecHelpersSourceFilesProvider.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/SpecHelpersSourceFilesProvider.kt index cd528fd8de8..503ec6ab00f 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/SpecHelpersSourceFilesProvider.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/SpecHelpersSourceFilesProvider.kt @@ -18,7 +18,7 @@ import java.io.File class SpecHelpersSourceFilesProvider(testServices: TestServices, baseDir: String) : AdditionalSourceProvider(testServices) { private val helpersDirPath = "$baseDir/compiler/tests-spec/testData/diagnostics/helpers" - override val directives: List = + override val directiveContainers: List = listOf(AdditionalFilesDirectives) override fun produceAdditionalFiles(globalDirectives: RegisteredDirectives, module: TestModule): List { diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/compiler/based/AbstractCompilerBasedTest.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/compiler/based/AbstractCompilerBasedTest.kt index 9af1dd45b9e..c0ad9ecb8d7 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/compiler/based/AbstractCompilerBasedTest.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/compiler/based/AbstractCompilerBasedTest.kt @@ -96,7 +96,7 @@ abstract class AbstractCompilerBasedTest : AbstractKotlinCompilerTest() { testServices: TestServices ) : FrontendFacade(testServices, FrontendKinds.FIR) { - override val additionalDirectives: List + override val directiveContainers: List get() = listOf(FirDiagnosticsDirectives) override fun analyze(module: TestModule): FirOutputArtifact { @@ -330,4 +330,4 @@ private fun reRegisterJavaElementFinder(project: Project) { ) } PsiElementFinder.EP.getPoint(project).registerExtension(JavaElementFinder(project)) -} \ No newline at end of file +} diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/compiler/based/IdeTestIgnoreHandler.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/compiler/based/IdeTestIgnoreHandler.kt index 71bbb8a70f9..55d644b56b4 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/compiler/based/IdeTestIgnoreHandler.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/tests/org/jetbrains/kotlin/idea/fir/low/level/api/compiler/based/IdeTestIgnoreHandler.kt @@ -7,10 +7,9 @@ package org.jetbrains.kotlin.idea.fir.low.level.api.compiler.based import org.jetbrains.kotlin.test.WrappedException import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder -import org.jetbrains.kotlin.test.model.AfterAnalysisChecker -import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives -import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.directives.model.DirectivesContainer +import org.jetbrains.kotlin.test.model.AfterAnalysisChecker +import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.moduleStructure import org.jetbrains.kotlin.test.utils.removeDirectiveFromFile @@ -19,7 +18,7 @@ class IdeTestIgnoreHandler(testServices: TestServices) : AfterAnalysisChecker(te private val isTeamCityBuild: Boolean = System.getenv("TEAMCITY_VERSION") != null } - override val directives: List + override val directiveContainers: List get() = listOf(FirIdeDirectives) override fun check(failedAssertions: List) {