[JS TESTS] Rename JS_TESTS module to main

This commit is contained in:
Ivan Kylchik
2021-09-05 16:00:35 +03:00
parent 32e6d3908d
commit 3e1563d46e
21 changed files with 25 additions and 25 deletions
@@ -116,5 +116,5 @@ fun generateJsFromAst(
): CompilerResult { ): CompilerResult {
val deserializer = JsIrAstDeserializer() val deserializer = JsIrAstDeserializer()
val fragments = caches.values.map { it.asts.values.mapNotNull { it.ast?.let { deserializer.deserialize(ByteArrayInputStream(it))} } } 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)
} }
@@ -30,6 +30,6 @@ fun testOk(ok: Any): String {
// FILE: entry.mjs // FILE: entry.mjs
// ENTRY_ES_MODULE // ENTRY_ES_MODULE
import { convolutedOk, testOk } from "./JS_TESTS/index.js"; import { convolutedOk, testOk } from "./main/index.js";
console.assert(testOk(convolutedOk()) == "OK"); console.assert(testOk(convolutedOk()) == "OK");
@@ -1,4 +1,4 @@
import { Point } from "./JS_TESTS/index.js"; import { Point } from "./main/index.js";
export default function() { export default function() {
var p = new Point(3, 7); var p = new Point(3, 7);
@@ -1,4 +1,4 @@
import * as api from "./JS_TESTS/index.js"; import * as api from "./main/index.js";
export default function() { export default function() {
var ping = api.ping; var ping = api.ping;
@@ -1,4 +1,4 @@
import { A, B } from "./JS_TESTS/index.js"; import { A, B } from "./main/index.js";
export default function() { export default function() {
return { return {
@@ -1,4 +1,4 @@
import { ping, Something } from "./JS_TESTS/index.js" import { ping, Something } from "./main/index.js"
export default function() { export default function() {
return { return {
@@ -24,7 +24,7 @@ open class B {
// FILE: entry.mjs // FILE: entry.mjs
// ENTRY_ES_MODULE // ENTRY_ES_MODULE
import { A, B } from "./JS_TESTS/index.js"; import { A, B } from "./main/index.js";
function createA() { function createA() {
function ADerived() { function ADerived() {
@@ -1,3 +1,3 @@
function createWrongObject() { function createWrongObject() {
return new (JS_TESTS.C); return new (main.C);
} }
+1 -1
View File
@@ -1,7 +1,7 @@
$kotlin_test_internal$.beginModule(); $kotlin_test_internal$.beginModule();
module.exports = function() { module.exports = function() {
var Point = require("JS_TESTS").api.Point; var Point = require("main").api.Point;
var p = new Point(3, 7); var p = new Point(3, 7);
return { return {
@@ -1,7 +1,7 @@
$kotlin_test_internal$.beginModule(); $kotlin_test_internal$.beginModule();
module.exports = function() { module.exports = function() {
var api = require("JS_TESTS").api; var api = require("main").api;
var ping = api.ping; var ping = api.ping;
var pong = api.pong; var pong = api.pong;
var transform = api.transform; var transform = api.transform;
+2 -2
View File
@@ -1,8 +1,8 @@
$kotlin_test_internal$.beginModule(); $kotlin_test_internal$.beginModule();
module.exports = function() { module.exports = function() {
var A = require("JS_TESTS").api.A; var A = require("main").api.A;
var B = require("JS_TESTS").api.B; var B = require("main").api.B;
return { return {
"res": (new A().ping()) + (new B().pong()) "res": (new A().ping()) + (new B().pong())
+2 -2
View File
@@ -1,8 +1,8 @@
$kotlin_test_internal$.beginModule(); $kotlin_test_internal$.beginModule();
module.exports = function() { module.exports = function() {
var ping = require("JS_TESTS").api.ping; var ping = require("main").api.ping;
var Something = require("JS_TESTS").api.Something; var Something = require("main").api.Something;
return { return {
"pingCall": function() { "pingCall": function() {
+2 -2
View File
@@ -11,12 +11,12 @@
} }
fun testA() = js(""" fun testA() = js("""
var a = JS_TESTS.AA; var a = main.AA;
return a.foo(); return a.foo();
""") """)
fun testB() = js(""" fun testB() = js("""
var b = new JS_TESTS.BB(); var b = new main.BB();
return b.foo(); return b.foo();
""") """)
+1 -1
View File
@@ -7,7 +7,7 @@ object A {
} }
fun test() = js(""" fun test() = js("""
return JS_TESTS.A.js_f(23); return main.A.js_f(23);
""") """)
fun box(): String { fun box(): String {
@@ -7,7 +7,7 @@ class A(val x: String) {
} }
fun test() = js(""" fun test() = js("""
return JS_TESTS.A_int(23).x; return main.A_int(23).x;
""") """)
fun box(): String { fun box(): String {
+1 -1
View File
@@ -10,7 +10,7 @@ fun box(): String {
assertEquals(5, eval("3 + 2")) assertEquals(5, eval("3 + 2"))
if (testUtils.isLegacyBackend()) { if (testUtils.isLegacyBackend()) {
val PACKAGE = "JS_TESTS" val PACKAGE = "main"
assertEquals(top, eval("$PACKAGE.top")) assertEquals(top, eval("$PACKAGE.top"))
} }
@@ -1,7 +1,7 @@
function createA() { function createA() {
function ADerived() { function ADerived() {
} }
ADerived.prototype = Object.create(JS_TESTS.A.prototype); ADerived.prototype = Object.create(main.A.prototype);
ADerived.prototype.foo = function(n) { ADerived.prototype.foo = function(n) {
return 24; return 24;
}; };
@@ -11,7 +11,7 @@ function createA() {
function createB() { function createB() {
function BDerived() { function BDerived() {
} }
BDerived.prototype = Object.create(JS_TESTS.B.prototype); BDerived.prototype = Object.create(main.B.prototype);
BDerived.prototype.bar = function(n) { BDerived.prototype.bar = function(n) {
return this.foo(n); return this.foo(n);
}; };
@@ -16,7 +16,7 @@ class A {
val A.z: Int val A.z: Int
@JsName("getZ_") get() = 42 @JsName("getZ_") get() = 42
fun getPackage() = js("return JS_TESTS") fun getPackage() = js("return main")
fun box(): String { fun box(): String {
val a = A() val a = A()
@@ -14,7 +14,7 @@ var y: Int = 0
} }
fun getPackage() = js("return JS_TESTS") fun getPackage() = js("return main")
fun box(): String { fun box(): String {
assertEquals(23, x) assertEquals(23, x)
@@ -28,7 +28,7 @@ class B : A(), C {
override val z = 55 override val z = 55
} }
fun getPackage() = js("JS_TESTS") fun getPackage() = js("main")
fun box(): String { fun box(): String {
val a = B() val a = B()
@@ -15,7 +15,7 @@ fun check(k: KClass<*>, j: JsClass<*>) {
assertSame(k, k.js.kotlin) 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 { fun box(): String {
check(A::class, jsClassbyName("A")) check(A::class, jsClassbyName("A"))