From 2bea77d4e29e677ac63d6d199c9e9c6f43ae2005 Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Mon, 30 Aug 2021 15:41:19 +0300 Subject: [PATCH] [JS TESTS] Replace `-` symbol in module name with `_` --- .../test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt | 2 +- .../box/crossModuleRef/inlineJsModuleNonIdentifier.kt | 10 +++++----- .../crossModuleRefIR/inlineJsModuleNonIdentifier.kt | 10 +++++----- ...overriddenExternalMethodWithSameStableNameMethod.kt | 2 +- js/js.translator/testData/box/export/exportAllFile.kt | 4 ++-- .../testData/box/export/exportNestedClass.kt | 4 ++-- .../testData/box/export/nonIndetifierModuleName.kt | 4 ++-- .../box/export/overriddenChainNonExportIntermediate.kt | 4 ++-- .../overriddenExternalMethodWithSameNameMethod.kt | 4 ++-- ...overriddenExternalMethodWithSameStableNameMethod.kt | 4 ++-- .../testData/box/multiModule/privateNameClash.kt | 4 ++-- .../amd/moduleWithNonIdentifierName.kt | 4 ++-- .../common_js/inlineFromModuleWithNonIdentifierName.kt | 4 ++-- .../common_js/moduleWithNonIdentifierName.kt | 4 ++-- .../plain/inlineFromModuleWithNonIdentifierName.kt | 4 ++-- .../plain/moduleWithNonIdentifierName.kt | 4 ++-- .../umd/moduleWithNonIdentifierName.kt | 4 ++-- 17 files changed, 38 insertions(+), 38 deletions(-) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt index 7fa23c08581..3186430460b 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt @@ -1265,7 +1265,7 @@ abstract class BasicBoxTest( const val TEST_MODULE = "JS_TESTS" const val DEFAULT_MODULE = "main" private const val TEST_FUNCTION = "box" - private const val OLD_MODULE_SUFFIX = "-old" + private const val OLD_MODULE_SUFFIX = "_old" const val KOTLIN_TEST_INTERNAL = "\$kotlin_test_internal\$" private val engineForMinifier = createScriptEngine() diff --git a/js/js.translator/testData/box/crossModuleRef/inlineJsModuleNonIdentifier.kt b/js/js.translator/testData/box/crossModuleRef/inlineJsModuleNonIdentifier.kt index c8cd37dab16..92f0f68a3af 100644 --- a/js/js.translator/testData/box/crossModuleRef/inlineJsModuleNonIdentifier.kt +++ b/js/js.translator/testData/box/crossModuleRef/inlineJsModuleNonIdentifier.kt @@ -1,16 +1,16 @@ // EXPECTED_REACHABLE_NODES: 1316 -// MODULE: lib-1 -// FILE: lib-1.js -define("lib-1", [], function() { +// MODULE: lib_1 +// FILE: lib_1.js +define("lib_1", [], function() { return function() { return "OK"; } }) -// MODULE: lib2(lib-1) +// MODULE: lib2(lib_1) // FILE: lib2.kt // MODULE_KIND: AMD -@JsModule("lib-1") +@JsModule("lib_1") external fun foo(): String // MODULE: lib3(lib2) diff --git a/js/js.translator/testData/box/crossModuleRefIR/inlineJsModuleNonIdentifier.kt b/js/js.translator/testData/box/crossModuleRefIR/inlineJsModuleNonIdentifier.kt index 6acc237518c..4cdb3333061 100644 --- a/js/js.translator/testData/box/crossModuleRefIR/inlineJsModuleNonIdentifier.kt +++ b/js/js.translator/testData/box/crossModuleRefIR/inlineJsModuleNonIdentifier.kt @@ -1,17 +1,17 @@ // SPLIT_PER_MODULE // EXPECTED_REACHABLE_NODES: 1316 -// MODULE: lib-1 -// FILE: lib-1.js -define("lib-1", [], function() { +// MODULE: lib_1 +// FILE: lib_1.js +define("lib_1", [], function() { return function() { return "OK"; } }) -// MODULE: lib2(lib-1) +// MODULE: lib2(lib_1) // FILE: lib2.kt // MODULE_KIND: AMD -@JsModule("lib-1") +@JsModule("lib_1") external fun foo(): String // MODULE: lib3(lib2) diff --git a/js/js.translator/testData/box/esModules/export/overriddenExternalMethodWithSameStableNameMethod.kt b/js/js.translator/testData/box/esModules/export/overriddenExternalMethodWithSameStableNameMethod.kt index ad531d2626a..f509e032b19 100644 --- a/js/js.translator/testData/box/esModules/export/overriddenExternalMethodWithSameStableNameMethod.kt +++ b/js/js.translator/testData/box/esModules/export/overriddenExternalMethodWithSameStableNameMethod.kt @@ -6,7 +6,7 @@ // TODO: Fix tests on Windows // DONT_TARGET_EXACT_BACKEND: JS_IR -// MODULE: overriden-external-method-with-same-stable-name-method +// MODULE: overriden_external_method_with_same_stable_name_method // FILE: lib.kt external abstract class Foo { abstract fun o(): String diff --git a/js/js.translator/testData/box/export/exportAllFile.kt b/js/js.translator/testData/box/export/exportAllFile.kt index c72cb73f3cb..6224acf1cdf 100644 --- a/js/js.translator/testData/box/export/exportAllFile.kt +++ b/js/js.translator/testData/box/export/exportAllFile.kt @@ -3,7 +3,7 @@ // RUN_PLAIN_BOX_FUNCTION // INFER_MAIN_MODULE -// MODULE: export-all-file +// MODULE: export_all_file // FILE: lib.kt @file:JsExport @@ -19,5 +19,5 @@ class B : A() { // FILE: test.js function box() { - return new this["export-all-file"].B().foo("K"); + return new this["export_all_file"].B().foo("K"); } \ No newline at end of file diff --git a/js/js.translator/testData/box/export/exportNestedClass.kt b/js/js.translator/testData/box/export/exportNestedClass.kt index 007281d02ed..99bff45a3f4 100644 --- a/js/js.translator/testData/box/export/exportNestedClass.kt +++ b/js/js.translator/testData/box/export/exportNestedClass.kt @@ -4,7 +4,7 @@ // INFER_MAIN_MODULE // SKIP_DCE_DRIVEN -// MODULE: export-nested-class +// MODULE: export_nested_class // FILE: lib.kt abstract class A { @@ -26,5 +26,5 @@ class B { // FILE: test.js function box() { - return new this["export-nested-class"].B.Foo().bar("K"); + return new this["export_nested_class"].B.Foo().bar("K"); } \ No newline at end of file diff --git a/js/js.translator/testData/box/export/nonIndetifierModuleName.kt b/js/js.translator/testData/box/export/nonIndetifierModuleName.kt index 688ed6a5793..2653db03b51 100644 --- a/js/js.translator/testData/box/export/nonIndetifierModuleName.kt +++ b/js/js.translator/testData/box/export/nonIndetifierModuleName.kt @@ -4,7 +4,7 @@ // INFER_MAIN_MODULE // SKIP_NODE_JS -// MODULE: non-identifier-module-name +// MODULE: non_identifier_module_name // FILE: lib.kt @JsName("foo") @JsExport @@ -12,5 +12,5 @@ public fun foo(k: String): String = "O$k" // FILE: test.js function box() { - return this["non-identifier-module-name"].foo("K"); + return this["non_identifier_module_name"].foo("K"); } diff --git a/js/js.translator/testData/box/export/overriddenChainNonExportIntermediate.kt b/js/js.translator/testData/box/export/overriddenChainNonExportIntermediate.kt index 0673087184a..06a21e6f193 100644 --- a/js/js.translator/testData/box/export/overriddenChainNonExportIntermediate.kt +++ b/js/js.translator/testData/box/export/overriddenChainNonExportIntermediate.kt @@ -3,7 +3,7 @@ // RUN_PLAIN_BOX_FUNCTION // INFER_MAIN_MODULE -// MODULE: overriden-chain-non-export-intermediate +// MODULE: overriden_chain_non_export_intermediate // FILE: lib.kt @JsExport abstract class A { @@ -29,7 +29,7 @@ class C : B() { // FILE: test.js function box() { - return test(new this["overriden-chain-non-export-intermediate"].C()); + return test(new this["overriden_chain_non_export_intermediate"].C()); } function test(c) { diff --git a/js/js.translator/testData/box/export/overriddenExternalMethodWithSameNameMethod.kt b/js/js.translator/testData/box/export/overriddenExternalMethodWithSameNameMethod.kt index 3bc1159c01f..bdd4e54336a 100644 --- a/js/js.translator/testData/box/export/overriddenExternalMethodWithSameNameMethod.kt +++ b/js/js.translator/testData/box/export/overriddenExternalMethodWithSameNameMethod.kt @@ -3,7 +3,7 @@ // RUN_PLAIN_BOX_FUNCTION // INFER_MAIN_MODULE -// MODULE: overriden-external-method-with-same-name-method +// MODULE: overriden_external_method_with_same_name_method // FILE: lib.kt external abstract class Foo { abstract fun o(): String @@ -31,7 +31,7 @@ Foo.prototype.k = function() { } function box() { - return test(new this["overriden-external-method-with-same-name-method"].Baz()); + return test(new this["overriden_external_method_with_same_name_method"].Baz()); } function test(foo) { diff --git a/js/js.translator/testData/box/export/overriddenExternalMethodWithSameStableNameMethod.kt b/js/js.translator/testData/box/export/overriddenExternalMethodWithSameStableNameMethod.kt index d7e05d74bd7..2f670054b86 100644 --- a/js/js.translator/testData/box/export/overriddenExternalMethodWithSameStableNameMethod.kt +++ b/js/js.translator/testData/box/export/overriddenExternalMethodWithSameStableNameMethod.kt @@ -3,7 +3,7 @@ // RUN_PLAIN_BOX_FUNCTION // INFER_MAIN_MODULE -// MODULE: overriden-external-method-with-same-stable-name-method +// MODULE: overriden_external_method_with_same_stable_name_method // FILE: lib.kt external abstract class Foo { abstract fun o(): String @@ -32,7 +32,7 @@ Foo.prototype.k = function() { } function box() { - return test(new this["overriden-external-method-with-same-stable-name-method"].Baz()); + return test(new this["overriden_external_method_with_same_stable_name_method"].Baz()); } function test(foo) { diff --git a/js/js.translator/testData/box/multiModule/privateNameClash.kt b/js/js.translator/testData/box/multiModule/privateNameClash.kt index fee2e708be1..b3d7af6a51c 100644 --- a/js/js.translator/testData/box/multiModule/privateNameClash.kt +++ b/js/js.translator/testData/box/multiModule/privateNameClash.kt @@ -12,7 +12,7 @@ open class A { fun foo() = x } -// MODULE: lib-old +// MODULE: lib_old // FILE: lib.kt package lib @@ -22,7 +22,7 @@ open class A { inline fun check() = true -// MODULE: main(lib-old) +// MODULE: main(lib_old) // FILE: main.kt package main diff --git a/js/js.translator/testData/box/multiModuleWrappers/amd/moduleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/amd/moduleWithNonIdentifierName.kt index 9118a506890..3b334aefee6 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/amd/moduleWithNonIdentifierName.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/amd/moduleWithNonIdentifierName.kt @@ -1,10 +1,10 @@ // EXPECTED_REACHABLE_NODES: 1284 -// MODULE: module-1 +// MODULE: module_1 // FILE: bar.kt // MODULE_KIND: AMD fun bar() = "bar" -// MODULE: main(module-1) +// MODULE: main(module_1) // FILE: box.kt // MODULE_KIND: AMD fun box(): String { diff --git a/js/js.translator/testData/box/multiModuleWrappers/common_js/inlineFromModuleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/common_js/inlineFromModuleWithNonIdentifierName.kt index d4b29dae2ef..7e492015dbc 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/common_js/inlineFromModuleWithNonIdentifierName.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/common_js/inlineFromModuleWithNonIdentifierName.kt @@ -1,5 +1,5 @@ // EXPECTED_REACHABLE_NODES: 1284 -// MODULE: #my-libr@ry +// MODULE: #my_libr@ry // FILE: bar.kt // MODULE_KIND: COMMON_JS // PROPERTY_NOT_WRITTEN_TO: baz @@ -11,7 +11,7 @@ inline fun foo() = "foo" inline fun baz() = "baz" inline fun boo() = "boo" -// MODULE: main(#my-libr@ry) +// MODULE: main(#my_libr@ry) // FILE: box.kt // MODULE_KIND: COMMON_JS // CHECK_CONTAINS_NO_CALLS: box except=assertEquals;assertEquals$default diff --git a/js/js.translator/testData/box/multiModuleWrappers/common_js/moduleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/common_js/moduleWithNonIdentifierName.kt index 6858b652081..1fdc65a6aac 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/common_js/moduleWithNonIdentifierName.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/common_js/moduleWithNonIdentifierName.kt @@ -1,10 +1,10 @@ // EXPECTED_REACHABLE_NODES: 1285 -// MODULE: module-1 +// MODULE: module_1 // FILE: bar.kt // MODULE_KIND: COMMON_JS fun bar() = "bar" -// MODULE: main(module-1) +// MODULE: main(module_1) // FILE: box.kt // MODULE_KIND: COMMON_JS fun box(): String { diff --git a/js/js.translator/testData/box/multiModuleWrappers/plain/inlineFromModuleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/plain/inlineFromModuleWithNonIdentifierName.kt index f503e03b5a3..5ee4e7957bc 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/plain/inlineFromModuleWithNonIdentifierName.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/plain/inlineFromModuleWithNonIdentifierName.kt @@ -1,5 +1,5 @@ // EXPECTED_REACHABLE_NODES: 1282 -// MODULE: #my-libr@ry +// MODULE: #my_libr@ry // FILE: bar.kt // MODULE_KIND: PLAIN // PROPERTY_NOT_WRITTEN_TO: baz @@ -11,7 +11,7 @@ inline fun foo() = "foo" inline fun baz() = "baz" inline fun boo() = "boo" -// MODULE: main(#my-libr@ry) +// MODULE: main(#my_libr@ry) // FILE: box.kt // MODULE_KIND: PLAIN // CHECK_CONTAINS_NO_CALLS: box except=assertEquals TARGET_BACKENDS=JS diff --git a/js/js.translator/testData/box/multiModuleWrappers/plain/moduleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/plain/moduleWithNonIdentifierName.kt index 9f670a28228..69db15951c9 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/plain/moduleWithNonIdentifierName.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/plain/moduleWithNonIdentifierName.kt @@ -1,10 +1,10 @@ // EXPECTED_REACHABLE_NODES: 1283 -// MODULE: module-1 +// MODULE: module_1 // FILE: bar.kt // MODULE_KIND: PLAIN fun bar() = "bar" -// MODULE: main(module-1) +// MODULE: main(module_1) // FILE: box.kt // MODULE_KIND: PLAIN fun box(): String { diff --git a/js/js.translator/testData/box/multiModuleWrappers/umd/moduleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/umd/moduleWithNonIdentifierName.kt index 1a97dc4cc78..e316b2d8d8e 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/umd/moduleWithNonIdentifierName.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/umd/moduleWithNonIdentifierName.kt @@ -1,10 +1,10 @@ // EXPECTED_REACHABLE_NODES: 1286 -// MODULE: module-1 +// MODULE: module_1 // FILE: bar.kt // MODULE_KIND: UMD fun bar() = "bar" -// MODULE: main(module-1) +// MODULE: main(module_1) // FILE: box.kt // MODULE_KIND: UMD fun box(): String {