[Test] Cleanup the diagnostics test configuration

- move all `configure...` utility methods to separate files (`Base...Configuration.kt`), so base test runners and shared configuration utilities are separated - move `TestTierChecker.kt` from `.runners` package to `.services`
JetBrains · Jan 10, 2025 · 8611d62 · 8611d62
1 parent 777d0d9
commit 8611d62
Show file tree

Hide file tree

Showing 24 changed files with 758 additions and 664 deletions.
diff --git a/.../analysis/low/level/api/fir/konan/compiler/based/AbstractCompilerBasedNativeTestForFir.kt b/.../analysis/low/level/api/fir/konan/compiler/based/AbstractCompilerBasedNativeTestForFir.kt
@@ -11,11 +11,11 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.compiler.based.AbstractLo
 import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostic.compiler.based.ReversedFirIdenticalChecker
 import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostic.compiler.based.facades.LLFirAnalyzerFacadeFactoryWithPreresolveInReversedOrder
 import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostic.compiler.based.facades.LLFirAnalyzerFacadeFactoryWithoutPreresolve
+import org.jetbrains.kotlin.konan.test.diagnostics.baseFirNativeDiagnosticTestConfiguration
+import org.jetbrains.kotlin.konan.test.diagnostics.baseNativeDiagnosticTestConfiguration
 import org.jetbrains.kotlin.platform.konan.NativePlatforms
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
-import org.jetbrains.kotlin.test.builders.baseFirNativeDiagnosticTestConfiguration
-import org.jetbrains.kotlin.test.builders.baseNativeDiagnosticTestConfiguration
-import org.jetbrains.kotlin.test.runners.configurationForClassicAndFirTestsAlongside
+import org.jetbrains.kotlin.test.configuration.configurationForClassicAndFirTestsAlongside
 import org.jetbrains.kotlin.utils.bind
 
 abstract class AbstractLLFirNativeTestBase : AbstractLowLevelCompilerBasedTest() {
@@ -49,4 +49,4 @@ abstract class AbstractLLFirReversedNativeTest : AbstractLLFirNativeTestBase() {
             useAfterAnalysisCheckers(::LLFirOnlyReversedTestSuppressor)
         }
     }
-}
+}
diff --git a/...uilders/TestConfigurationBuilderNative.kt → ...tics/BaseNativeDiagnosticConfiguration.kt b/...uilders/TestConfigurationBuilderNative.kt → ...tics/BaseNativeDiagnosticConfiguration.kt
@@ -1,16 +1,23 @@
 /*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2025 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.test.builders
+package org.jetbrains.kotlin.konan.test.diagnostics
 
 import org.jetbrains.kotlin.test.Constructor
+import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
+import org.jetbrains.kotlin.test.builders.firHandlersStep
 import org.jetbrains.kotlin.test.directives.ConfigurationDirectives
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
 import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives
 import org.jetbrains.kotlin.test.frontend.classic.handlers.OldNewInferenceMetaInfoProcessor
-import org.jetbrains.kotlin.test.frontend.fir.handlers.*
+import org.jetbrains.kotlin.test.frontend.fir.handlers.FirCfgConsistencyHandler
+import org.jetbrains.kotlin.test.frontend.fir.handlers.FirCfgDumpHandler
+import org.jetbrains.kotlin.test.frontend.fir.handlers.FirDiagnosticsHandler
+import org.jetbrains.kotlin.test.frontend.fir.handlers.FirDumpHandler
+import org.jetbrains.kotlin.test.frontend.fir.handlers.FirResolvedTypesVerifier
+import org.jetbrains.kotlin.test.frontend.fir.handlers.FirScopeDumpHandler
 import org.jetbrains.kotlin.test.model.FrontendFacade
 import org.jetbrains.kotlin.test.model.ResultingArtifact
 import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator

diff --git a/...n-new/tests/org/jetbrains/kotlin/test/backend/handlers/NoLightTreeParsingErrorsHandler.kt b/...n-new/tests/org/jetbrains/kotlin/test/backend/handlers/NoLightTreeParsingErrorsHandler.kt
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact
 import org.jetbrains.kotlin.test.frontend.fir.handlers.FirAnalysisHandler
 import org.jetbrains.kotlin.test.frontend.fir.handlers.FirDiagnosticCollectorService
 import org.jetbrains.kotlin.test.model.TestModule
-import org.jetbrains.kotlin.test.runners.lightTreeSyntaxDiagnosticsReporterHolder
+import org.jetbrains.kotlin.test.services.fir.lightTreeSyntaxDiagnosticsReporterHolder
 import org.jetbrains.kotlin.test.services.ServiceRegistrationData
 import org.jetbrains.kotlin.test.services.TestServices
 import org.jetbrains.kotlin.test.services.diagnosticsService

diff --git a/...-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/TestTierExceptionInverter.kt b/...-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/TestTierExceptionInverter.kt
@@ -7,9 +7,9 @@ package org.jetbrains.kotlin.test.backend.handlers
 
 import org.jetbrains.kotlin.test.model.AnalysisHandler
 import org.jetbrains.kotlin.test.model.ResultingArtifact
-import org.jetbrains.kotlin.test.runners.TestTierLabel
-import org.jetbrains.kotlin.test.runners.TierPassesMarker
-import org.jetbrains.kotlin.test.runners.applicableTestTiers
+import org.jetbrains.kotlin.test.services.TestTierLabel
+import org.jetbrains.kotlin.test.services.TierPassesMarker
+import org.jetbrains.kotlin.test.services.applicableTestTiers
 import org.jetbrains.kotlin.test.services.TestServices
 import org.jetbrains.kotlin.test.services.moduleStructure
 

diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/TestTierDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/TestTierDirectives.kt
@@ -6,12 +6,12 @@
 package org.jetbrains.kotlin.test.directives
 
 import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer
-import org.jetbrains.kotlin.test.runners.TestTierLabel
+import org.jetbrains.kotlin.test.services.TestTierLabel
 
 object TestTierDirectives : SimpleDirectivesContainer() {
     /**
-     * See: [TestTiersLabel][org.jetbrains.kotlin.test.runners.TestTierLabel] for the list of values.
-     * If not set, the test will be generated into [FRONTEND][org.jetbrains.kotlin.test.runners.TestTierLabel.FRONTEND]
+     * See: [TestTierLabel] for the list of values.
+     * If not set, the test will be generated into [FRONTEND][TestTierLabel.FRONTEND]
      * tiers, but the infrastructure will still complain about the missing directive.
      */
     val RUN_PIPELINE_TILL by enumDirective<TestTierLabel>(

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
@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.cli.jvm.config.jvmModularRoots
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.config.JvmTarget
-import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageFeature.MultiPlatformProjects
 import org.jetbrains.kotlin.fir.*
 import org.jetbrains.kotlin.fir.checkers.registerExperimentalCheckers
@@ -54,7 +53,7 @@ import org.jetbrains.kotlin.test.model.FrontendFacade
 import org.jetbrains.kotlin.test.model.FrontendKinds
 import org.jetbrains.kotlin.test.model.TestFile
 import org.jetbrains.kotlin.test.model.TestModule
-import org.jetbrains.kotlin.test.runners.lightTreeSyntaxDiagnosticsReporterHolder
+import org.jetbrains.kotlin.test.services.fir.lightTreeSyntaxDiagnosticsReporterHolder
 import org.jetbrains.kotlin.test.services.*
 import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator
 import org.jetbrains.kotlin.test.services.configuration.NativeEnvironmentConfigurator

diff --git a/...er/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirReplFrontendFacade.kt b/...er/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirReplFrontendFacade.kt
@@ -50,7 +50,7 @@ import org.jetbrains.kotlin.test.model.FrontendFacade
 import org.jetbrains.kotlin.test.model.FrontendKinds
 import org.jetbrains.kotlin.test.model.TestFile
 import org.jetbrains.kotlin.test.model.TestModule
-import org.jetbrains.kotlin.test.runners.lightTreeSyntaxDiagnosticsReporterHolder
+import org.jetbrains.kotlin.test.services.fir.lightTreeSyntaxDiagnosticsReporterHolder
 import org.jetbrains.kotlin.test.services.*
 import org.jetbrains.kotlin.utils.addToStdlib.runIf
 import org.jetbrains.kotlin.wasm.config.wasmTarget

diff --git a/...common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt b/...common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirDiagnosticsHandler.kt
@@ -64,7 +64,7 @@ import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact
 import org.jetbrains.kotlin.test.model.AfterAnalysisChecker
 import org.jetbrains.kotlin.test.model.TestFile
 import org.jetbrains.kotlin.test.model.TestModule
-import org.jetbrains.kotlin.test.runners.lightTreeSyntaxDiagnosticsReporterHolder
+import org.jetbrains.kotlin.test.services.fir.lightTreeSyntaxDiagnosticsReporterHolder
 import org.jetbrains.kotlin.test.services.*
 import org.jetbrains.kotlin.test.utils.AbstractTwoAttributesMetaInfoProcessor
 import org.jetbrains.kotlin.test.utils.MultiModuleInfoDumper

diff --git a/...-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirBlackBoxCodegenTestSpec.kt b/...-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirBlackBoxCodegenTestSpec.kt
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirective
 import org.jetbrains.kotlin.test.frontend.fir.FirFailingTestSuppressor
 import org.jetbrains.kotlin.test.runners.codegen.AbstractFirBlackBoxCodegenTestBase
 import org.jetbrains.kotlin.test.services.PackageNamePreprocessor
+import org.jetbrains.kotlin.test.services.fir.LightTreeSyntaxDiagnosticsReporterHolder
 import org.jetbrains.kotlin.test.services.sourceProviders.SpecHelpersSourceFilesProvider
 import org.jetbrains.kotlin.utils.bind