From 32e6d3908d1892b7f91d9d06b71d6b7148bd20fa Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Fri, 3 Sep 2021 12:41:12 +0300 Subject: [PATCH] [JS TESTS] Move MODULE_KIND directive to module level --- .../testData/box/crossModuleRef/inlineJsModule.kt | 6 +++--- .../box/crossModuleRef/inlineJsModuleNonIdentifier.kt | 6 +++--- .../testData/box/crossModuleRef/inlineJsModulePackage.kt | 6 +++--- .../testData/box/crossModuleRefIR/inlineJsModule.kt | 6 +++--- .../box/crossModuleRefIR/inlineJsModuleNonIdentifier.kt | 6 +++--- .../box/crossModuleRefIR/inlineJsModulePackage.kt | 6 +++--- js/js.translator/testData/box/incremental/jsModule.kt | 4 ++-- .../testData/box/jsModule/externalClassNameClash.kt | 3 +-- .../testData/box/jsModule/externalPackage.kt | 2 +- .../testData/box/jsModule/externalPackageUmdFallback.kt | 2 +- js/js.translator/testData/box/jsQualifier/umdFallback.kt | 9 ++++----- js/js.translator/testData/box/jsQualifier/withModule.kt | 4 ++-- .../box/multiModuleWrappers/amd/jsModuleOnPackage.kt | 4 ++-- .../amd/moduleWithNonIdentifierName.kt | 4 ++-- .../testData/box/multiModuleWrappers/amd/simple.kt | 4 ++-- .../common_js/inlineFromModuleWithNonIdentifierName.kt | 4 ++-- .../common_js/moduleWithNonIdentifierName.kt | 4 ++-- .../testData/box/multiModuleWrappers/common_js/simple.kt | 4 ++-- .../plain/inlineFromModuleWithNonIdentifierName.kt | 4 ++-- .../plain/moduleWithNonIdentifierName.kt | 4 ++-- .../testData/box/multiModuleWrappers/plain/simple.kt | 4 ++-- .../umd/moduleWithNonIdentifierName.kt | 4 ++-- .../testData/box/multiModuleWrappers/umd/simple.kt | 4 ++-- js/js.translator/testData/multiModuleOrder/umd.kt | 4 ++-- 24 files changed, 53 insertions(+), 55 deletions(-) diff --git a/js/js.translator/testData/box/crossModuleRef/inlineJsModule.kt b/js/js.translator/testData/box/crossModuleRef/inlineJsModule.kt index 350c5931a8f..b3ae78e33f0 100644 --- a/js/js.translator/testData/box/crossModuleRef/inlineJsModule.kt +++ b/js/js.translator/testData/box/crossModuleRef/inlineJsModule.kt @@ -8,18 +8,18 @@ define("lib1", [], function() { }) // MODULE: lib2(lib1) -// FILE: lib2.kt // MODULE_KIND: AMD +// FILE: lib2.kt @JsModule("lib1") external fun foo(): String // MODULE: lib3(lib2) -// FILE: lib3.kt // MODULE_KIND: AMD +// FILE: lib3.kt inline fun bar() = foo() // MODULE: main(lib3) -// FILE: main.kt // MODULE_KIND: AMD +// FILE: main.kt fun box() = bar() \ No newline at end of file diff --git a/js/js.translator/testData/box/crossModuleRef/inlineJsModuleNonIdentifier.kt b/js/js.translator/testData/box/crossModuleRef/inlineJsModuleNonIdentifier.kt index 92f0f68a3af..452ba9d1a5d 100644 --- a/js/js.translator/testData/box/crossModuleRef/inlineJsModuleNonIdentifier.kt +++ b/js/js.translator/testData/box/crossModuleRef/inlineJsModuleNonIdentifier.kt @@ -8,18 +8,18 @@ define("lib_1", [], function() { }) // MODULE: lib2(lib_1) -// FILE: lib2.kt // MODULE_KIND: AMD +// FILE: lib2.kt @JsModule("lib_1") external fun foo(): String // MODULE: lib3(lib2) -// FILE: lib3.kt // MODULE_KIND: AMD +// FILE: lib3.kt inline fun bar() = foo() // MODULE: main(lib3) -// FILE: main.kt // MODULE_KIND: AMD +// FILE: main.kt fun box() = bar() \ No newline at end of file diff --git a/js/js.translator/testData/box/crossModuleRef/inlineJsModulePackage.kt b/js/js.translator/testData/box/crossModuleRef/inlineJsModulePackage.kt index ee5b223e6c1..52d6dea2ba7 100644 --- a/js/js.translator/testData/box/crossModuleRef/inlineJsModulePackage.kt +++ b/js/js.translator/testData/box/crossModuleRef/inlineJsModulePackage.kt @@ -10,19 +10,19 @@ define("lib1", [], function() { }) // MODULE: lib2(lib1) -// FILE: lib2.kt // MODULE_KIND: AMD +// FILE: lib2.kt @file:JsModule("lib1") external fun foo(): String // MODULE: lib3(lib2) -// FILE: lib3.kt // MODULE_KIND: AMD +// FILE: lib3.kt inline fun bar() = foo() // MODULE: main(lib3) -// FILE: main.kt // MODULE_KIND: AMD +// FILE: main.kt fun box() = bar() \ No newline at end of file diff --git a/js/js.translator/testData/box/crossModuleRefIR/inlineJsModule.kt b/js/js.translator/testData/box/crossModuleRefIR/inlineJsModule.kt index 8dfc47bea58..d8ab68cb0c1 100644 --- a/js/js.translator/testData/box/crossModuleRefIR/inlineJsModule.kt +++ b/js/js.translator/testData/box/crossModuleRefIR/inlineJsModule.kt @@ -9,18 +9,18 @@ define("lib1", [], function() { }) // MODULE: lib2(lib1) -// FILE: lib2.kt // MODULE_KIND: AMD +// FILE: lib2.kt @JsModule("lib1") external fun foo(): String // MODULE: lib3(lib2) -// FILE: lib3.kt // MODULE_KIND: AMD +// FILE: lib3.kt inline fun bar() = foo() // MODULE: main(lib3) -// FILE: main.kt // MODULE_KIND: AMD +// FILE: main.kt fun box() = bar() \ No newline at end of file diff --git a/js/js.translator/testData/box/crossModuleRefIR/inlineJsModuleNonIdentifier.kt b/js/js.translator/testData/box/crossModuleRefIR/inlineJsModuleNonIdentifier.kt index 4cdb3333061..78d9ce77d92 100644 --- a/js/js.translator/testData/box/crossModuleRefIR/inlineJsModuleNonIdentifier.kt +++ b/js/js.translator/testData/box/crossModuleRefIR/inlineJsModuleNonIdentifier.kt @@ -9,18 +9,18 @@ define("lib_1", [], function() { }) // MODULE: lib2(lib_1) -// FILE: lib2.kt // MODULE_KIND: AMD +// FILE: lib2.kt @JsModule("lib_1") external fun foo(): String // MODULE: lib3(lib2) -// FILE: lib3.kt // MODULE_KIND: AMD +// FILE: lib3.kt inline fun bar() = foo() // MODULE: main(lib3) -// FILE: main.kt // MODULE_KIND: AMD +// FILE: main.kt fun box() = bar() \ No newline at end of file diff --git a/js/js.translator/testData/box/crossModuleRefIR/inlineJsModulePackage.kt b/js/js.translator/testData/box/crossModuleRefIR/inlineJsModulePackage.kt index 68eec4a1c8d..28f495ddac1 100644 --- a/js/js.translator/testData/box/crossModuleRefIR/inlineJsModulePackage.kt +++ b/js/js.translator/testData/box/crossModuleRefIR/inlineJsModulePackage.kt @@ -11,19 +11,19 @@ define("lib1", [], function() { }) // MODULE: lib2(lib1) -// FILE: lib2.kt // MODULE_KIND: AMD +// FILE: lib2.kt @file:JsModule("lib1") external fun foo(): String // MODULE: lib3(lib2) -// FILE: lib3.kt // MODULE_KIND: AMD +// FILE: lib3.kt inline fun bar() = foo() // MODULE: main(lib3) -// FILE: main.kt // MODULE_KIND: AMD +// FILE: main.kt fun box() = bar() \ No newline at end of file diff --git a/js/js.translator/testData/box/incremental/jsModule.kt b/js/js.translator/testData/box/incremental/jsModule.kt index ccf99d1e7f2..dc04fc0f8c2 100644 --- a/js/js.translator/testData/box/incremental/jsModule.kt +++ b/js/js.translator/testData/box/incremental/jsModule.kt @@ -2,8 +2,8 @@ // SKIP_IR_INCREMENTAL_CHECKS // MODULE: lib -// FILE: a.kt // MODULE_KIND: AMD +// FILE: a.kt @file:JsModule("foo") external fun fooF(): String @@ -18,8 +18,8 @@ external fun barF(): String fun dummyF() = "dummy" // MODULE: main(lib) -// FILE: main.kt // MODULE_KIND: AMD +// FILE: main.kt fun box(): String { val foo = fooF() diff --git a/js/js.translator/testData/box/jsModule/externalClassNameClash.kt b/js/js.translator/testData/box/jsModule/externalClassNameClash.kt index 82bd9e6c440..9fc57b48df4 100644 --- a/js/js.translator/testData/box/jsModule/externalClassNameClash.kt +++ b/js/js.translator/testData/box/jsModule/externalClassNameClash.kt @@ -1,6 +1,6 @@ // EXPECTED_REACHABLE_NODES: 1284 -// FILE: a.kt // MODULE_KIND: AMD +// FILE: a.kt @file:JsModule("a") package a @@ -13,7 +13,6 @@ external fun bar(): Int external val prop: Int // FILE: b.kt -// MODULE_KIND: AMD @file:JsModule("b") package b diff --git a/js/js.translator/testData/box/jsModule/externalPackage.kt b/js/js.translator/testData/box/jsModule/externalPackage.kt index 2eafb178e38..bdbca624673 100644 --- a/js/js.translator/testData/box/jsModule/externalPackage.kt +++ b/js/js.translator/testData/box/jsModule/externalPackage.kt @@ -1,6 +1,6 @@ // EXPECTED_REACHABLE_NODES: 1290 -// FILE: a.kt // MODULE_KIND: AMD +// FILE: a.kt @file:JsModule("lib") package foo diff --git a/js/js.translator/testData/box/jsModule/externalPackageUmdFallback.kt b/js/js.translator/testData/box/jsModule/externalPackageUmdFallback.kt index 47837c99d5c..373e8f45a7e 100644 --- a/js/js.translator/testData/box/jsModule/externalPackageUmdFallback.kt +++ b/js/js.translator/testData/box/jsModule/externalPackageUmdFallback.kt @@ -1,7 +1,7 @@ // EXPECTED_REACHABLE_NODES: 1290 -// FILE: a.kt // MODULE_KIND: UMD // NO_JS_MODULE_SYSTEM +// FILE: a.kt @file:JsModule("lib") @file:JsNonModule package foo diff --git a/js/js.translator/testData/box/jsQualifier/umdFallback.kt b/js/js.translator/testData/box/jsQualifier/umdFallback.kt index efd915eed0e..7f0550a1253 100644 --- a/js/js.translator/testData/box/jsQualifier/umdFallback.kt +++ b/js/js.translator/testData/box/jsQualifier/umdFallback.kt @@ -1,14 +1,13 @@ // EXPECTED_REACHABLE_NODES: 1284 -// MODULE: lib -// FILE: lib.kt -// MODULE_KIND: UMD // NO_JS_MODULE_SYSTEM +// MODULE: lib +// MODULE_KIND: UMD +// FILE: lib.kt @file:JsQualifier("foo") external fun bar(): String // MODULE: main(lib) -// FILE: main.kt // MODULE_KIND: UMD -// NO_JS_MODULE_SYSTEM +// FILE: main.kt fun box() = bar() \ No newline at end of file diff --git a/js/js.translator/testData/box/jsQualifier/withModule.kt b/js/js.translator/testData/box/jsQualifier/withModule.kt index 89a5402727a..29cb1ff273b 100644 --- a/js/js.translator/testData/box/jsQualifier/withModule.kt +++ b/js/js.translator/testData/box/jsQualifier/withModule.kt @@ -1,7 +1,7 @@ // EXPECTED_REACHABLE_NODES: 1282 // MODULE: lib -// FILE: lib.kt // MODULE_KIND: AMD +// FILE: lib.kt @file:JsQualifier("a.b") @file:JsModule("libjs") package ab @@ -9,8 +9,8 @@ package ab external fun c(): String // MODULE: main(lib) -// FILE: main.kt // MODULE_KIND: AMD +// FILE: main.kt package main fun box() = ab.c() \ No newline at end of file diff --git a/js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.kt b/js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.kt index a16165de573..149212f3545 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.kt @@ -1,7 +1,7 @@ // EXPECTED_REACHABLE_NODES: 1289 // MODULE: lib -// FILE: lib.kt // MODULE_KIND: AMD +// FILE: lib.kt @file:JsModule("native-lib") package foo @@ -24,8 +24,8 @@ external val bar: Int = definedExternally external var mbar: Int = definedExternally // MODULE: main(lib) -// FILE: main.kt // MODULE_KIND: AMD +// FILE: main.kt package foo fun box(): String { diff --git a/js/js.translator/testData/box/multiModuleWrappers/amd/moduleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/amd/moduleWithNonIdentifierName.kt index 3b334aefee6..1e98c483dc7 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/amd/moduleWithNonIdentifierName.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/amd/moduleWithNonIdentifierName.kt @@ -1,12 +1,12 @@ // EXPECTED_REACHABLE_NODES: 1284 // MODULE: module_1 -// FILE: bar.kt // MODULE_KIND: AMD +// FILE: bar.kt fun bar() = "bar" // MODULE: main(module_1) -// FILE: box.kt // MODULE_KIND: AMD +// FILE: box.kt fun box(): String { assertEquals("bar", bar()) return "OK" diff --git a/js/js.translator/testData/box/multiModuleWrappers/amd/simple.kt b/js/js.translator/testData/box/multiModuleWrappers/amd/simple.kt index bfb4f75265a..eb1aaaf5418 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/amd/simple.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/amd/simple.kt @@ -1,12 +1,12 @@ // EXPECTED_REACHABLE_NODES: 1284 // MODULE: module1 -// FILE: bar.kt // MODULE_KIND: AMD +// FILE: bar.kt fun bar() = "bar" // MODULE: main(module1) -// FILE: box.kt // MODULE_KIND: AMD +// FILE: box.kt fun box(): String { assertEquals("bar", bar()) return "OK" 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 7e492015dbc..49f8653b747 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/common_js/inlineFromModuleWithNonIdentifierName.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/common_js/inlineFromModuleWithNonIdentifierName.kt @@ -1,7 +1,7 @@ // EXPECTED_REACHABLE_NODES: 1284 // MODULE: #my_libr@ry -// FILE: bar.kt // MODULE_KIND: COMMON_JS +// FILE: bar.kt // PROPERTY_NOT_WRITTEN_TO: baz // PROPERTY_NOT_WRITTEN_TO: boo_287e2$ @file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") @@ -12,8 +12,8 @@ inline fun baz() = "baz" inline fun boo() = "boo" // MODULE: main(#my_libr@ry) -// FILE: box.kt // MODULE_KIND: COMMON_JS +// FILE: box.kt // CHECK_CONTAINS_NO_CALLS: box except=assertEquals;assertEquals$default fun box(): String { 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 1fdc65a6aac..09030dbce48 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/common_js/moduleWithNonIdentifierName.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/common_js/moduleWithNonIdentifierName.kt @@ -1,12 +1,12 @@ // EXPECTED_REACHABLE_NODES: 1285 // MODULE: module_1 -// FILE: bar.kt // MODULE_KIND: COMMON_JS +// FILE: bar.kt fun bar() = "bar" // MODULE: main(module_1) -// FILE: box.kt // MODULE_KIND: COMMON_JS +// FILE: box.kt fun box(): String { assertEquals("bar", bar()) return "OK" diff --git a/js/js.translator/testData/box/multiModuleWrappers/common_js/simple.kt b/js/js.translator/testData/box/multiModuleWrappers/common_js/simple.kt index fbd85ae0663..69b8f7bc234 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/common_js/simple.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/common_js/simple.kt @@ -1,12 +1,12 @@ // EXPECTED_REACHABLE_NODES: 1285 // MODULE: module1 -// FILE: bar.kt // MODULE_KIND: COMMON_JS +// FILE: bar.kt fun bar() = "bar" // MODULE: main(module1) -// FILE: box.kt // MODULE_KIND: COMMON_JS +// FILE: box.kt fun box(): String { assertEquals("bar", bar()) return "OK" diff --git a/js/js.translator/testData/box/multiModuleWrappers/plain/inlineFromModuleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/plain/inlineFromModuleWithNonIdentifierName.kt index 5ee4e7957bc..5b2da77feca 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/plain/inlineFromModuleWithNonIdentifierName.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/plain/inlineFromModuleWithNonIdentifierName.kt @@ -1,7 +1,7 @@ // EXPECTED_REACHABLE_NODES: 1282 // MODULE: #my_libr@ry -// FILE: bar.kt // MODULE_KIND: PLAIN +// FILE: bar.kt // PROPERTY_NOT_WRITTEN_TO: baz // PROPERTY_NOT_WRITTEN_TO: boo_287e2$ @file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") @@ -12,8 +12,8 @@ inline fun baz() = "baz" inline fun boo() = "boo" // MODULE: main(#my_libr@ry) -// FILE: box.kt // MODULE_KIND: PLAIN +// FILE: box.kt // CHECK_CONTAINS_NO_CALLS: box except=assertEquals TARGET_BACKENDS=JS // CHECK_CONTAINS_NO_CALLS: box except=assertEquals$default IGNORED_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 69db15951c9..bef8ea348c3 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/plain/moduleWithNonIdentifierName.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/plain/moduleWithNonIdentifierName.kt @@ -1,12 +1,12 @@ // EXPECTED_REACHABLE_NODES: 1283 // MODULE: module_1 -// FILE: bar.kt // MODULE_KIND: PLAIN +// FILE: bar.kt fun bar() = "bar" // MODULE: main(module_1) -// FILE: box.kt // MODULE_KIND: PLAIN +// FILE: box.kt fun box(): String { assertEquals("bar", bar()) return "OK" diff --git a/js/js.translator/testData/box/multiModuleWrappers/plain/simple.kt b/js/js.translator/testData/box/multiModuleWrappers/plain/simple.kt index 0ec3afa23f1..733a8dd7ca5 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/plain/simple.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/plain/simple.kt @@ -1,12 +1,12 @@ // EXPECTED_REACHABLE_NODES: 1283 // MODULE: module1 -// FILE: bar.kt // MODULE_KIND: PLAIN +// FILE: bar.kt fun bar() = "bar" // MODULE: main(module1) -// FILE: box.kt // MODULE_KIND: PLAIN +// FILE: box.kt fun box(): String { assertEquals("bar", bar()) return "OK" diff --git a/js/js.translator/testData/box/multiModuleWrappers/umd/moduleWithNonIdentifierName.kt b/js/js.translator/testData/box/multiModuleWrappers/umd/moduleWithNonIdentifierName.kt index e316b2d8d8e..d07e7024aca 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/umd/moduleWithNonIdentifierName.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/umd/moduleWithNonIdentifierName.kt @@ -1,12 +1,12 @@ // EXPECTED_REACHABLE_NODES: 1286 // MODULE: module_1 -// FILE: bar.kt // MODULE_KIND: UMD +// FILE: bar.kt fun bar() = "bar" // MODULE: main(module_1) -// FILE: box.kt // MODULE_KIND: UMD +// FILE: box.kt fun box(): String { assertEquals("bar", bar()) return "OK" diff --git a/js/js.translator/testData/box/multiModuleWrappers/umd/simple.kt b/js/js.translator/testData/box/multiModuleWrappers/umd/simple.kt index 1d64b045a2e..acdc9b333ee 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/umd/simple.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/umd/simple.kt @@ -1,12 +1,12 @@ // EXPECTED_REACHABLE_NODES: 1286 // MODULE: module1 -// FILE: bar.kt // MODULE_KIND: UMD +// FILE: bar.kt fun bar() = "bar" // MODULE: main(module1) -// FILE: box.kt // MODULE_KIND: UMD +// FILE: box.kt fun box(): String { assertEquals("bar", bar()) return "OK" diff --git a/js/js.translator/testData/multiModuleOrder/umd.kt b/js/js.translator/testData/multiModuleOrder/umd.kt index 122f82c1067..f80e4cbb5dc 100644 --- a/js/js.translator/testData/multiModuleOrder/umd.kt +++ b/js/js.translator/testData/multiModuleOrder/umd.kt @@ -1,14 +1,14 @@ // MODULE: lib -// FILE: lib.kt // MODULE_KIND: UMD +// FILE: lib.kt package lib fun bar() = "OK" // MODULE: main(lib) -// FILE: main.kt // MODULE_KIND: UMD +// FILE: main.kt package foo import lib.bar