From 502a0b7e10080123754930db61ff97f94f21fb8d Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Mon, 13 Mar 2023 17:46:09 +0100 Subject: [PATCH] [test] Move JS-targeting irText test runners to js-specific directory --- .../test/runners/ir/AbstractIrTextTest.kt | 28 ------------- .../generators/tests/GenerateJsTests.kt | 6 +-- .../test/fir/AbstractFirJsIrTextTestBase.kt | 41 +++++++++++++++++++ .../FirLightTreeJsIrTextTestGenerated.java | 2 +- 4 files changed, 44 insertions(+), 33 deletions(-) create mode 100644 js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirJsIrTextTestBase.kt rename js/js.tests/tests-gen/org/jetbrains/kotlin/{test/runners/ir => js/test/fir}/FirLightTreeJsIrTextTestGenerated.java (99%) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractIrTextTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractIrTextTest.kt index 52be5fda845..0edf2ca3642 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractIrTextTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/ir/AbstractIrTextTest.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.test.runners.ir -import org.jetbrains.kotlin.platform.js.JsPlatforms import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.test.Constructor import org.jetbrains.kotlin.test.TargetBackend @@ -20,7 +19,6 @@ import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.DUMP_IR import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.DUMP_KT_IR import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives -import org.jetbrains.kotlin.test.directives.ModuleStructureDirectives import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade @@ -31,9 +29,7 @@ import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact import org.jetbrains.kotlin.test.model.* import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerWithTargetBackendTest import org.jetbrains.kotlin.test.runners.codegen.FirPsiCodegenTest -import org.jetbrains.kotlin.test.services.JsLibraryProvider import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator -import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurator import org.jetbrains.kotlin.test.services.sourceProviders.AdditionalDiagnosticsSourceFilesProvider import org.jetbrains.kotlin.test.services.sourceProviders.CodegenHelpersSourceFilesProvider @@ -151,27 +147,3 @@ open class AbstractFirLightTreeJvmIrTextTest : AbstractFirIrTextTestBase(FirPars @FirPsiCodegenTest open class AbstractFirPsiJvmIrTextTest : AbstractFirIrTextTestBase(FirParser.Psi, TargetBackend.JVM_IR) - -open class AbstractFirJsIrTextTestBase(parser: FirParser) : AbstractFirIrTextTestBase(parser, TargetBackend.JS_IR) { - override fun TestConfigurationBuilder.applyConfigurators() { - useConfigurators( - ::CommonEnvironmentConfigurator, - ::JsEnvironmentConfigurator, - ) - - useAdditionalService(::JsLibraryProvider) - } - - override fun configure(builder: TestConfigurationBuilder) { - super.configure(builder) - with(builder) { - globalDefaults { - targetPlatform = JsPlatforms.defaultJsPlatform - artifactKind = BinaryKind.NoArtifact - dependencyKind = DependencyKind.Source - } - } - } -} - -open class AbstractFirLightTreeJsIrTextTest : AbstractFirJsIrTextTestBase(FirParser.LightTree) diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt index 54aeb268ff5..ae49861e3b8 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.js.test.ir.* import org.jetbrains.kotlin.js.testOld.AbstractDceTest import org.jetbrains.kotlin.js.testOld.compatibility.binary.AbstractJsKlibBinaryCompatibilityTest import org.jetbrains.kotlin.test.TargetBackend -import org.jetbrains.kotlin.test.runners.ir.AbstractFirLightTreeJsIrTextTest +import org.jetbrains.kotlin.js.test.fir.AbstractFirLightTreeJsIrTextTest fun main(args: Array) { System.setProperty("java.awt.headless", "true") @@ -179,9 +179,7 @@ fun main(args: Array) { model("diagnostics/testsWithJsStdLib", pattern = "^([^_](.+))\\.kt$", excludedPattern = excludedFirTestdataPattern) } - testClass( - suiteTestClassName = "FirLightTreeJsIrTextTestGenerated" - ) { + testClass { model("ir/irText") } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirJsIrTextTestBase.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirJsIrTextTestBase.kt new file mode 100644 index 00000000000..689e3e3472d --- /dev/null +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirJsIrTextTestBase.kt @@ -0,0 +1,41 @@ +/* + * Copyright 2010-2023 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.js.test.fir + +import org.jetbrains.kotlin.platform.js.JsPlatforms +import org.jetbrains.kotlin.test.FirParser +import org.jetbrains.kotlin.test.TargetBackend +import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder +import org.jetbrains.kotlin.test.model.BinaryKind +import org.jetbrains.kotlin.test.model.DependencyKind +import org.jetbrains.kotlin.test.runners.ir.AbstractFirIrTextTestBase +import org.jetbrains.kotlin.test.services.JsLibraryProvider +import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator +import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator + +open class AbstractFirJsIrTextTestBase(parser: FirParser) : AbstractFirIrTextTestBase(parser, TargetBackend.JS_IR) { + override fun TestConfigurationBuilder.applyConfigurators() { + useConfigurators( + ::CommonEnvironmentConfigurator, + ::JsEnvironmentConfigurator, + ) + + useAdditionalService(::JsLibraryProvider) + } + + override fun configure(builder: TestConfigurationBuilder) { + super.configure(builder) + with(builder) { + globalDefaults { + targetPlatform = JsPlatforms.defaultJsPlatform + artifactKind = BinaryKind.NoArtifact + dependencyKind = DependencyKind.Source + } + } + } +} + +open class AbstractFirLightTreeJsIrTextTest : AbstractFirJsIrTextTestBase(FirParser.LightTree) diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJsIrTextTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsIrTextTestGenerated.java similarity index 99% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJsIrTextTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsIrTextTestGenerated.java index 4630976152b..14ca40910ea 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJsIrTextTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsIrTextTestGenerated.java @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.test.runners.ir; +package org.jetbrains.kotlin.js.test.fir; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil;