[Tests] Adjust testrunners after moving js.translator/testData/box/* to compiler/testData/js/box ^KT-77374
diff --git a/js/js.translator/testData/_commonFiles/arrayAsserts.kt b/compiler/testData/js/_commonFiles/arrayAsserts.kt similarity index 100% rename from js/js.translator/testData/_commonFiles/arrayAsserts.kt rename to compiler/testData/js/_commonFiles/arrayAsserts.kt
diff --git a/js/js.translator/testData/_commonFiles/asserts.kt b/compiler/testData/js/_commonFiles/asserts.kt similarity index 100% rename from js/js.translator/testData/_commonFiles/asserts.kt rename to compiler/testData/js/_commonFiles/asserts.kt
diff --git a/js/js.translator/testData/_commonFiles/fail.kt b/compiler/testData/js/_commonFiles/fail.kt similarity index 100% rename from js/js.translator/testData/_commonFiles/fail.kt rename to compiler/testData/js/_commonFiles/fail.kt
diff --git a/js/js.translator/testData/moduleEmulation.js b/compiler/testData/js/moduleEmulation.js similarity index 100% rename from js/js.translator/testData/moduleEmulation.js rename to compiler/testData/js/moduleEmulation.js
diff --git a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt index 9b2dd05..f77c67e 100644 --- a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt +++ b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt
@@ -31,7 +31,7 @@ get() = listOf(JsEnvironmentConfigurationDirectives, KlibBasedCompilerTestDirectives) companion object { - const val TEST_DATA_DIR_PATH = "js/js.translator/testData" + const val TEST_DATA_DIR_PATH = "compiler/testData/js" const val OLD_MODULE_SUFFIX = "_old" val kotlinTestPath: String
diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 9edb24d..f2e0c09 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts
@@ -162,10 +162,8 @@ testData(project(":compiler").isolated, "testData/klib/syntheticAccessors") testData(project(":compiler").isolated, "testData/klib/__utils__") - testData(project(":js:js.translator").isolated, "testData/_commonFiles") - testData(project(":js:js.translator").isolated, "testData/moduleEmulation.js") + testData(project(":compiler").isolated, "testData/js") testData(project(":js:js.translator").isolated, "testData/incremental") - testData(project(":js:js.translator").isolated, "testData/box") testData(project(":js:js.translator").isolated, "testData/lineNumbers") testData(project(":js:js.translator").isolated, "testData/js-optimizer/") testData(project(":js:js.translator").isolated, "testData/js-name-resolution")
diff --git a/js/js.tests/testFixtures/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/testFixtures/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt index 3a6a56f11..2c6aa5d 100644 --- a/js/js.tests/testFixtures/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt +++ b/js/js.tests/testFixtures/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
@@ -89,7 +89,7 @@ } } - testGroup(testsRoot, "js/js.translator/testData/box", testRunnerMethodName = "runTest0") { + testGroup(testsRoot, "compiler/testData/js/box", testRunnerMethodName = "runTest0") { testClass<AbstractPsiJsBoxTest> { model(pattern = "^([^_](.+))\\.kt$", excludeDirs = listOf("es6classes")) }
diff --git a/js/js.tests/testFixtures/org/jetbrains/kotlin/js/test/utils/RunnerUtils.kt b/js/js.tests/testFixtures/org/jetbrains/kotlin/js/test/utils/RunnerUtils.kt index 934937f..578b82e 100644 --- a/js/js.tests/testFixtures/org/jetbrains/kotlin/js/test/utils/RunnerUtils.kt +++ b/js/js.tests/testFixtures/org/jetbrains/kotlin/js/test/utils/RunnerUtils.kt
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.utils.filterIsInstanceAnd import java.io.File -const val MODULE_EMULATION_FILE = "${JsEnvironmentConfigurator.TEST_DATA_DIR_PATH}/moduleEmulation.js" +const val MODULE_EMULATION_FILE = "../../${JsEnvironmentConfigurator.TEST_DATA_DIR_PATH}/moduleEmulation.js" fun TestModule.getNameFor(filePath: String, testServices: TestServices): String { return testServices.klibEnvironmentConfigurator.getKlibArtifactSimpleName(testServices, name) + "-js-" + filePath
diff --git a/wasm/wasm.tests/build.gradle.kts b/wasm/wasm.tests/build.gradle.kts index ed85579..7bd77ba 100644 --- a/wasm/wasm.tests/build.gradle.kts +++ b/wasm/wasm.tests/build.gradle.kts
@@ -465,7 +465,7 @@ testData(project(":compiler").isolated, "testData/klib/__utils__") testData(project(":js:js.translator").isolated, "testData/incremental") - testData(project(":js:js.translator").isolated, "testData/box") + testData(project(":compiler").isolated, "testData/js/box") testData(project(":js:js.translator").isolated, "testData/typescript-export/wasm/") withWasmRuntime()
diff --git a/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/generators/tests/GenerateWasmTests.kt b/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/generators/tests/GenerateWasmTests.kt index 77f062f..1b5de38 100644 --- a/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/generators/tests/GenerateWasmTests.kt +++ b/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/generators/tests/GenerateWasmTests.kt
@@ -89,7 +89,7 @@ } } - testGroup(testsRoot, "js/js.translator/testData/box", testRunnerMethodName = "runTest0") { + testGroup(testsRoot, "compiler/testData/js/box", testRunnerMethodName = "runTest0") { testClass<AbstractFirWasmJsTranslatorTest> { model("main", pattern = jsTranslatorTestPattern) model("native/", pattern = jsTranslatorTestPattern)
diff --git a/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/wasm/test/AbstractFirWasmTest.kt b/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/wasm/test/AbstractFirWasmTest.kt index 64d03a7..64c3952 100644 --- a/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/wasm/test/AbstractFirWasmTest.kt +++ b/wasm/wasm.tests/testFixtures/org/jetbrains/kotlin/wasm/test/AbstractFirWasmTest.kt
@@ -193,8 +193,8 @@ } open class AbstractFirWasmJsTranslatorTest : AbstractFirWasmJsTest( - "js/js.translator/testData/box/", - "js.translator/firBox" + "compiler/testData/js/box/", + "js/box" ) open class AbstractFirWasmJsSteppingTest(