diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsTest.kt index 4ea9e26bba5..b100665996b 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsTest.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlin.js.test.converters.ClassicJsBackendFacade import org.jetbrains.kotlin.js.test.converters.incremental.RecompileModuleJsBackendFacade import org.jetbrains.kotlin.js.test.handlers.* import org.jetbrains.kotlin.js.test.ir.AbstractJsBlackBoxCodegenTestBase +import org.jetbrains.kotlin.js.test.ir.AbstractJsIrTest import org.jetbrains.kotlin.js.test.utils.JsIncrementalEnvironmentConfigurator import org.jetbrains.kotlin.test.Constructor import org.jetbrains.kotlin.test.TargetBackend @@ -72,21 +73,6 @@ open class AbstractBoxJsTest : AbstractJsTest(pathToTestDir = "${JsEnvironmentCo } } -open class AbstractSourceMapGenerationSmokeTest : AbstractJsTest( - pathToTestDir = "${JsEnvironmentConfigurator.TEST_DATA_DIR_PATH}/sourcemap/", - testGroupOutputDirPrefix = "sourcemap/" -) { - override fun configure(builder: TestConfigurationBuilder) { - super.configure(builder) - with(builder) { - defaultDirectives { - +JsEnvironmentConfigurationDirectives.GENERATE_SOURCE_MAP - -JsEnvironmentConfigurationDirectives.GENERATE_NODE_JS_RUNNER - } - } - } -} - open class AbstractOutputPrefixPostfixTest : AbstractJsTest( pathToTestDir = "${JsEnvironmentConfigurator.TEST_DATA_DIR_PATH}/outputPrefixPostfix/", testGroupOutputDirPrefix = "outputPrefixPostfix/" diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt index 9aa403a59d1..4fa5f843013 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt @@ -132,6 +132,21 @@ open class AbstractJsIrLineNumberTest : AbstractJsIrTest( } } +open class AbstractSourceMapGenerationSmokeTest : AbstractJsIrTest( + pathToTestDir = "${JsEnvironmentConfigurator.TEST_DATA_DIR_PATH}/sourcemap/", + testGroupOutputDirPrefix = "sourcemap/" +) { + override fun configure(builder: TestConfigurationBuilder) { + super.configure(builder) + with(builder) { + defaultDirectives { + +JsEnvironmentConfigurationDirectives.GENERATE_SOURCE_MAP + -JsEnvironmentConfigurationDirectives.GENERATE_NODE_JS_RUNNER + } + } + } +} + private fun configureJsIrLineNumberTest(builder: TestConfigurationBuilder) { with(builder) { defaultDirectives { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/SourceMapGenerationSmokeTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/SourceMapGenerationSmokeTestGenerated.java similarity index 94% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/SourceMapGenerationSmokeTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/SourceMapGenerationSmokeTestGenerated.java index 0059b4e91ff..8fb2b57b1a2 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/SourceMapGenerationSmokeTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/SourceMapGenerationSmokeTestGenerated.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.js.test; +package org.jetbrains.kotlin.js.test.ir; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -22,7 +22,7 @@ import java.util.regex.Pattern; public class SourceMapGenerationSmokeTestGenerated extends AbstractSourceMapGenerationSmokeTest { @Test public void testAllFilesPresentInSourcemap() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/sourcemap"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/sourcemap"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } @Test