From b28dd95621bb0bcfab0782b6563f43b1070e12df Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 25 Oct 2022 16:10:17 +0200 Subject: [PATCH] FIR JS: rename test classes for uniformity --- .../kotlin/generators/tests/GenerateJsTests.kt | 4 ++-- .../jetbrains/kotlin/js/test/ir/AbstractJsIrTest.kt | 12 ++++++------ ...TestGenerated.java => FirJsBoxTestGenerated.java} | 2 +- ...a => FirJsCodegenWasmJsInteropTestGenerated.java} | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/{FirBoxJsTestGenerated.java => FirJsBoxTestGenerated.java} (99%) rename js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/{FirCodegenWasmJsInteropJsTestGenerated.java => FirJsCodegenWasmJsInteropTestGenerated.java} (96%) 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 aa3b7cfff35..6b9d490deb8 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 @@ -120,7 +120,7 @@ fun main(args: Array) { model("lineNumbers/") } - testClass { + testClass { model("box/", pattern = "^([^_](.+))\\.kt$") } @@ -190,7 +190,7 @@ fun main(args: Array) { model("codegen/boxInline") } - testClass { + testClass { model("codegen/boxWasmJsInterop") } 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 c3f5186a6b7..70c3f8aa5c7 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 @@ -191,7 +191,7 @@ open class AbstractIrCodegenWasmJsInteropJsTest : AbstractJsIrTest( testGroupOutputDirPrefix = "codegen/wasmJsInteropJs" ) -open class AbstractFirJsTest( +open class AbstractFirJsBlackBoxCodegenTest( pathToTestDir: String = "${JsEnvironmentConfigurator.TEST_DATA_DIR_PATH}/box/", testGroupOutputDirPrefix: String = "firBox/", ) : AbstractJsBlackBoxCodegenTestBase( @@ -251,12 +251,12 @@ open class AbstractFirJsTest( } } -open class AbstractFirBoxJsTest : AbstractFirJsTest( +open class AbstractFirJsBoxTest : AbstractFirJsBlackBoxCodegenTest( pathToTestDir = "${JsEnvironmentConfigurator.TEST_DATA_DIR_PATH}/box/", testGroupOutputDirPrefix = "irBox/" ) -open class AbstractFirJsCodegenBoxTest : AbstractFirJsTest( +open class AbstractFirJsCodegenBoxTest : AbstractFirJsBlackBoxCodegenTest( pathToTestDir = "compiler/testData/codegen/box/", testGroupOutputDirPrefix = "codegen/irBox/" ) { @@ -272,12 +272,12 @@ open class AbstractFirJsCodegenBoxTest : AbstractFirJsTest( } } -open class AbstractFirJsCodegenBoxErrorTest : AbstractFirJsTest( +open class AbstractFirJsCodegenBoxErrorTest : AbstractFirJsBlackBoxCodegenTest( pathToTestDir = "compiler/testData/codegen/boxError/", testGroupOutputDirPrefix = "codegen/irBoxError/" ) -open class AbstractFirJsCodegenInlineTest : AbstractFirJsTest( +open class AbstractFirJsCodegenInlineTest : AbstractFirJsBlackBoxCodegenTest( pathToTestDir = "compiler/testData/codegen/boxInline/", testGroupOutputDirPrefix = "codegen/irBoxInline/" ) @@ -315,7 +315,7 @@ open class AbstractFirJsCodegenInlineTest : AbstractFirJsTest( // } //} -open class AbstractFirCodegenWasmJsInteropJsTest : AbstractFirJsTest( +open class AbstractFirJsCodegenWasmJsInteropTest : AbstractFirJsBlackBoxCodegenTest( pathToTestDir = "compiler/testData/codegen/wasmJsInterop", testGroupOutputDirPrefix = "codegen/wasmJsInteropJs" ) diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/FirBoxJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/FirJsBoxTestGenerated.java similarity index 99% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/FirBoxJsTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/FirJsBoxTestGenerated.java index a88f1707a3c..138ca2f4dd1 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/FirBoxJsTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/FirJsBoxTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("js/js.translator/testData/box") @TestDataPath("$PROJECT_ROOT") -public class FirBoxJsTestGenerated extends AbstractFirBoxJsTest { +public class FirJsBoxTestGenerated extends AbstractFirJsBoxTest { @Test public void testAllFilesPresentInBox() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/box"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/FirCodegenWasmJsInteropJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/FirJsCodegenWasmJsInteropTestGenerated.java similarity index 96% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/FirCodegenWasmJsInteropJsTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/FirJsCodegenWasmJsInteropTestGenerated.java index 791147ad480..fa370c70e3b 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/FirCodegenWasmJsInteropJsTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/FirJsCodegenWasmJsInteropTestGenerated.java @@ -19,7 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/boxWasmJsInterop") @TestDataPath("$PROJECT_ROOT") -public class FirCodegenWasmJsInteropJsTestGenerated extends AbstractFirCodegenWasmJsInteropJsTest { +public class FirJsCodegenWasmJsInteropTestGenerated extends AbstractFirJsCodegenWasmJsInteropTest { @Test public void testAllFilesPresentInBoxWasmJsInterop() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/boxWasmJsInterop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);