From 3e1563d46e0706553e0741fd535c8b30ead13d91 Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Sun, 5 Sep 2021 16:00:35 +0300 Subject: [PATCH] [JS TESTS] Rename `JS_TESTS` module to `main` --- .../src/org/jetbrains/kotlin/ir/backend/js/compilerWithIC.kt | 2 +- .../box/esModules/inline/inlinedObjectLiteralIsCheck.kt | 2 +- .../testData/box/esModules/jsExport/dataClass.mjs | 2 +- .../testData/box/esModules/jsExport/exportedDefaultStub.mjs | 2 +- .../testData/box/esModules/jsExport/jsExportInClass.mjs | 2 +- .../testData/box/esModules/jsExport/recursiveExport.mjs | 2 +- .../testData/box/esModules/native/inheritanceInNativeClass.kt | 2 +- .../testData/box/expression/cast/explicitUpcast.js | 2 +- js/js.translator/testData/box/jsExport/dataClass.js | 2 +- js/js.translator/testData/box/jsExport/exportedDefaultStub.js | 2 +- js/js.translator/testData/box/jsExport/jsExportInClass.js | 4 ++-- js/js.translator/testData/box/jsExport/recursiveExport.js | 4 ++-- js/js.translator/testData/box/jsName/classes.kt | 4 ++-- js/js.translator/testData/box/jsName/privateMethod.kt | 2 +- js/js.translator/testData/box/jsName/secondaryConstructor.kt | 2 +- js/js.translator/testData/box/native/eval.kt | 2 +- .../testData/box/native/inheritanceInNativeClass.js | 4 ++-- .../testData/box/propertyAccess/accessorsWithJsName.kt | 2 +- .../testData/box/propertyAccess/staticAccessorsWithJsName.kt | 2 +- .../box/propertyAccess/subclassAccessorsWithJsNameInSuper.kt | 2 +- .../testData/box/reflection/kClassToAndFromJsClass.kt | 2 +- 21 files changed, 25 insertions(+), 25 deletions(-) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compilerWithIC.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compilerWithIC.kt index d0fd57c969a..19e6932b23b 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compilerWithIC.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compilerWithIC.kt @@ -116,5 +116,5 @@ fun generateJsFromAst( ): CompilerResult { val deserializer = JsIrAstDeserializer() val fragments = caches.values.map { it.asts.values.mapNotNull { it.ast?.let { deserializer.deserialize(ByteArrayInputStream(it))} } } - return CompilerResult(generateWrappedModuleBody("JS_TESTS", ModuleKind.PLAIN, fragments), null) + return CompilerResult(generateWrappedModuleBody("main", ModuleKind.PLAIN, fragments), null) } \ No newline at end of file diff --git a/js/js.translator/testData/box/esModules/inline/inlinedObjectLiteralIsCheck.kt b/js/js.translator/testData/box/esModules/inline/inlinedObjectLiteralIsCheck.kt index a045b6b1f9d..17b599a0b27 100644 --- a/js/js.translator/testData/box/esModules/inline/inlinedObjectLiteralIsCheck.kt +++ b/js/js.translator/testData/box/esModules/inline/inlinedObjectLiteralIsCheck.kt @@ -30,6 +30,6 @@ fun testOk(ok: Any): String { // FILE: entry.mjs // ENTRY_ES_MODULE -import { convolutedOk, testOk } from "./JS_TESTS/index.js"; +import { convolutedOk, testOk } from "./main/index.js"; console.assert(testOk(convolutedOk()) == "OK"); diff --git a/js/js.translator/testData/box/esModules/jsExport/dataClass.mjs b/js/js.translator/testData/box/esModules/jsExport/dataClass.mjs index 395af68d4cb..c769ab47c73 100644 --- a/js/js.translator/testData/box/esModules/jsExport/dataClass.mjs +++ b/js/js.translator/testData/box/esModules/jsExport/dataClass.mjs @@ -1,4 +1,4 @@ -import { Point } from "./JS_TESTS/index.js"; +import { Point } from "./main/index.js"; export default function() { var p = new Point(3, 7); diff --git a/js/js.translator/testData/box/esModules/jsExport/exportedDefaultStub.mjs b/js/js.translator/testData/box/esModules/jsExport/exportedDefaultStub.mjs index 9298790992a..1120bb10486 100644 --- a/js/js.translator/testData/box/esModules/jsExport/exportedDefaultStub.mjs +++ b/js/js.translator/testData/box/esModules/jsExport/exportedDefaultStub.mjs @@ -1,4 +1,4 @@ -import * as api from "./JS_TESTS/index.js"; +import * as api from "./main/index.js"; export default function() { var ping = api.ping; diff --git a/js/js.translator/testData/box/esModules/jsExport/jsExportInClass.mjs b/js/js.translator/testData/box/esModules/jsExport/jsExportInClass.mjs index 9a175cb67c4..588071f4959 100644 --- a/js/js.translator/testData/box/esModules/jsExport/jsExportInClass.mjs +++ b/js/js.translator/testData/box/esModules/jsExport/jsExportInClass.mjs @@ -1,4 +1,4 @@ -import { A, B } from "./JS_TESTS/index.js"; +import { A, B } from "./main/index.js"; export default function() { return { diff --git a/js/js.translator/testData/box/esModules/jsExport/recursiveExport.mjs b/js/js.translator/testData/box/esModules/jsExport/recursiveExport.mjs index 121b5333623..ab4c7d895fa 100644 --- a/js/js.translator/testData/box/esModules/jsExport/recursiveExport.mjs +++ b/js/js.translator/testData/box/esModules/jsExport/recursiveExport.mjs @@ -1,4 +1,4 @@ -import { ping, Something } from "./JS_TESTS/index.js" +import { ping, Something } from "./main/index.js" export default function() { return { diff --git a/js/js.translator/testData/box/esModules/native/inheritanceInNativeClass.kt b/js/js.translator/testData/box/esModules/native/inheritanceInNativeClass.kt index a5e8fab9678..c81dde79f04 100644 --- a/js/js.translator/testData/box/esModules/native/inheritanceInNativeClass.kt +++ b/js/js.translator/testData/box/esModules/native/inheritanceInNativeClass.kt @@ -24,7 +24,7 @@ open class B { // FILE: entry.mjs // ENTRY_ES_MODULE -import { A, B } from "./JS_TESTS/index.js"; +import { A, B } from "./main/index.js"; function createA() { function ADerived() { diff --git a/js/js.translator/testData/box/expression/cast/explicitUpcast.js b/js/js.translator/testData/box/expression/cast/explicitUpcast.js index 7c7e97cb46c..0e19aadbf68 100644 --- a/js/js.translator/testData/box/expression/cast/explicitUpcast.js +++ b/js/js.translator/testData/box/expression/cast/explicitUpcast.js @@ -1,3 +1,3 @@ function createWrongObject() { - return new (JS_TESTS.C); + return new (main.C); } \ No newline at end of file diff --git a/js/js.translator/testData/box/jsExport/dataClass.js b/js/js.translator/testData/box/jsExport/dataClass.js index 0b7067f625c..25be9e23ca4 100644 --- a/js/js.translator/testData/box/jsExport/dataClass.js +++ b/js/js.translator/testData/box/jsExport/dataClass.js @@ -1,7 +1,7 @@ $kotlin_test_internal$.beginModule(); module.exports = function() { - var Point = require("JS_TESTS").api.Point; + var Point = require("main").api.Point; var p = new Point(3, 7); return { diff --git a/js/js.translator/testData/box/jsExport/exportedDefaultStub.js b/js/js.translator/testData/box/jsExport/exportedDefaultStub.js index 73b4e6c2db0..a7336df34d5 100644 --- a/js/js.translator/testData/box/jsExport/exportedDefaultStub.js +++ b/js/js.translator/testData/box/jsExport/exportedDefaultStub.js @@ -1,7 +1,7 @@ $kotlin_test_internal$.beginModule(); module.exports = function() { - var api = require("JS_TESTS").api; + var api = require("main").api; var ping = api.ping; var pong = api.pong; var transform = api.transform; diff --git a/js/js.translator/testData/box/jsExport/jsExportInClass.js b/js/js.translator/testData/box/jsExport/jsExportInClass.js index 1836b97c6ad..b380edb8424 100644 --- a/js/js.translator/testData/box/jsExport/jsExportInClass.js +++ b/js/js.translator/testData/box/jsExport/jsExportInClass.js @@ -1,8 +1,8 @@ $kotlin_test_internal$.beginModule(); module.exports = function() { - var A = require("JS_TESTS").api.A; - var B = require("JS_TESTS").api.B; + var A = require("main").api.A; + var B = require("main").api.B; return { "res": (new A().ping()) + (new B().pong()) diff --git a/js/js.translator/testData/box/jsExport/recursiveExport.js b/js/js.translator/testData/box/jsExport/recursiveExport.js index 41ec29165c2..780c4a29884 100644 --- a/js/js.translator/testData/box/jsExport/recursiveExport.js +++ b/js/js.translator/testData/box/jsExport/recursiveExport.js @@ -1,8 +1,8 @@ $kotlin_test_internal$.beginModule(); module.exports = function() { - var ping = require("JS_TESTS").api.ping; - var Something = require("JS_TESTS").api.Something; + var ping = require("main").api.ping; + var Something = require("main").api.Something; return { "pingCall": function() { diff --git a/js/js.translator/testData/box/jsName/classes.kt b/js/js.translator/testData/box/jsName/classes.kt index 6cc3320dfda..6de0e210ac1 100644 --- a/js/js.translator/testData/box/jsName/classes.kt +++ b/js/js.translator/testData/box/jsName/classes.kt @@ -11,12 +11,12 @@ } fun testA() = js(""" -var a = JS_TESTS.AA; +var a = main.AA; return a.foo(); """) fun testB() = js(""" -var b = new JS_TESTS.BB(); +var b = new main.BB(); return b.foo(); """) diff --git a/js/js.translator/testData/box/jsName/privateMethod.kt b/js/js.translator/testData/box/jsName/privateMethod.kt index 58467b22e54..0450b862421 100644 --- a/js/js.translator/testData/box/jsName/privateMethod.kt +++ b/js/js.translator/testData/box/jsName/privateMethod.kt @@ -7,7 +7,7 @@ object A { } fun test() = js(""" -return JS_TESTS.A.js_f(23); +return main.A.js_f(23); """) fun box(): String { diff --git a/js/js.translator/testData/box/jsName/secondaryConstructor.kt b/js/js.translator/testData/box/jsName/secondaryConstructor.kt index 6d270c1fd3d..ed6d381f799 100644 --- a/js/js.translator/testData/box/jsName/secondaryConstructor.kt +++ b/js/js.translator/testData/box/jsName/secondaryConstructor.kt @@ -7,7 +7,7 @@ class A(val x: String) { } fun test() = js(""" -return JS_TESTS.A_int(23).x; +return main.A_int(23).x; """) fun box(): String { diff --git a/js/js.translator/testData/box/native/eval.kt b/js/js.translator/testData/box/native/eval.kt index a119f735195..97a9e94eb91 100644 --- a/js/js.translator/testData/box/native/eval.kt +++ b/js/js.translator/testData/box/native/eval.kt @@ -10,7 +10,7 @@ fun box(): String { assertEquals(5, eval("3 + 2")) if (testUtils.isLegacyBackend()) { - val PACKAGE = "JS_TESTS" + val PACKAGE = "main" assertEquals(top, eval("$PACKAGE.top")) } diff --git a/js/js.translator/testData/box/native/inheritanceInNativeClass.js b/js/js.translator/testData/box/native/inheritanceInNativeClass.js index d454fe0c948..c52d147a6e0 100644 --- a/js/js.translator/testData/box/native/inheritanceInNativeClass.js +++ b/js/js.translator/testData/box/native/inheritanceInNativeClass.js @@ -1,7 +1,7 @@ function createA() { function ADerived() { } - ADerived.prototype = Object.create(JS_TESTS.A.prototype); + ADerived.prototype = Object.create(main.A.prototype); ADerived.prototype.foo = function(n) { return 24; }; @@ -11,7 +11,7 @@ function createA() { function createB() { function BDerived() { } - BDerived.prototype = Object.create(JS_TESTS.B.prototype); + BDerived.prototype = Object.create(main.B.prototype); BDerived.prototype.bar = function(n) { return this.foo(n); }; diff --git a/js/js.translator/testData/box/propertyAccess/accessorsWithJsName.kt b/js/js.translator/testData/box/propertyAccess/accessorsWithJsName.kt index 9f4830b044e..4ab4deb90dc 100644 --- a/js/js.translator/testData/box/propertyAccess/accessorsWithJsName.kt +++ b/js/js.translator/testData/box/propertyAccess/accessorsWithJsName.kt @@ -16,7 +16,7 @@ class A { val A.z: Int @JsName("getZ_") get() = 42 -fun getPackage() = js("return JS_TESTS") +fun getPackage() = js("return main") fun box(): String { val a = A() diff --git a/js/js.translator/testData/box/propertyAccess/staticAccessorsWithJsName.kt b/js/js.translator/testData/box/propertyAccess/staticAccessorsWithJsName.kt index b6b11b5251f..ff16fc26a40 100644 --- a/js/js.translator/testData/box/propertyAccess/staticAccessorsWithJsName.kt +++ b/js/js.translator/testData/box/propertyAccess/staticAccessorsWithJsName.kt @@ -14,7 +14,7 @@ var y: Int = 0 } -fun getPackage() = js("return JS_TESTS") +fun getPackage() = js("return main") fun box(): String { assertEquals(23, x) diff --git a/js/js.translator/testData/box/propertyAccess/subclassAccessorsWithJsNameInSuper.kt b/js/js.translator/testData/box/propertyAccess/subclassAccessorsWithJsNameInSuper.kt index f5d5c71b241..673e26708d3 100644 --- a/js/js.translator/testData/box/propertyAccess/subclassAccessorsWithJsNameInSuper.kt +++ b/js/js.translator/testData/box/propertyAccess/subclassAccessorsWithJsNameInSuper.kt @@ -28,7 +28,7 @@ class B : A(), C { override val z = 55 } -fun getPackage() = js("JS_TESTS") +fun getPackage() = js("main") fun box(): String { val a = B() diff --git a/js/js.translator/testData/box/reflection/kClassToAndFromJsClass.kt b/js/js.translator/testData/box/reflection/kClassToAndFromJsClass.kt index f23760d9724..22a22dcb8be 100644 --- a/js/js.translator/testData/box/reflection/kClassToAndFromJsClass.kt +++ b/js/js.translator/testData/box/reflection/kClassToAndFromJsClass.kt @@ -15,7 +15,7 @@ fun check(k: KClass<*>, j: JsClass<*>) { assertSame(k, k.js.kotlin) } -fun jsClassbyName(name: String) = js("JS_TESTS").foo[name] +fun jsClassbyName(name: String) = js("main").foo[name] fun box(): String { check(A::class, jsClassbyName("A"))