diff --git a/js/js.translator/testData/box/jsModule/externalPackage.js b/js/js.translator/testData/box/jsModule/externalPackage.js index 6cf28680393..f166d9d531e 100644 --- a/js/js.translator/testData/box/jsModule/externalPackage.js +++ b/js/js.translator/testData/box/jsModule/externalPackage.js @@ -23,6 +23,7 @@ define("lib", [], function() { A: A, B: B, foo: foo, - bar: bar + bar: bar, + mbar: -1 }; }); \ No newline at end of file diff --git a/js/js.translator/testData/box/jsModule/externalPackage.kt b/js/js.translator/testData/box/jsModule/externalPackage.kt index 7105e89e9d4..559dfabaf67 100644 --- a/js/js.translator/testData/box/jsModule/externalPackage.kt +++ b/js/js.translator/testData/box/jsModule/externalPackage.kt @@ -16,6 +16,8 @@ package foo @native val bar: Int = noImpl +@native var mbar: Int = noImpl + fun box(): String { val a = A(23) assertEquals(23, a.x) @@ -27,5 +29,8 @@ fun box(): String { assertEquals(365, foo(42)) assertEquals(423, bar) + mbar = 523 + assertEquals(523, mbar) + return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/box/jsModule/externalPackageInDifferentFile.js b/js/js.translator/testData/box/jsModule/externalPackageInDifferentFile.js index e945b85304b..2200abdc0b8 100644 --- a/js/js.translator/testData/box/jsModule/externalPackageInDifferentFile.js +++ b/js/js.translator/testData/box/jsModule/externalPackageInDifferentFile.js @@ -23,7 +23,8 @@ define("lib", [], function() { A: A, B: B, foo: foo, - bar: bar + bar: bar, + mbar: -1 }; }); diff --git a/js/js.translator/testData/box/jsModule/externalPackageInDifferentFile.kt b/js/js.translator/testData/box/jsModule/externalPackageInDifferentFile.kt index 4fd2f572a98..728e5f12479 100644 --- a/js/js.translator/testData/box/jsModule/externalPackageInDifferentFile.kt +++ b/js/js.translator/testData/box/jsModule/externalPackageInDifferentFile.kt @@ -17,6 +17,8 @@ package foo @native val bar: Int = noImpl +@native var mbar: Int = noImpl + // FILE: lib2.kt package foo @@ -40,5 +42,8 @@ fun box(): String { assertEquals(12345, C.f()) + mbar = 523 + assertEquals(523, mbar) + return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.js b/js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.js index 296a54aa94f..eaccc3b1a5f 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.js +++ b/js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.js @@ -23,6 +23,7 @@ define("native-lib", [], function() { A: A, B: B, foo: foo, - bar: bar + bar: bar, + mbar: -1 }; }); \ 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 ac1b8930e94..074e80bb2b5 100644 --- a/js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.kt +++ b/js/js.translator/testData/box/multiModuleWrappers/amd/jsModuleOnPackage.kt @@ -18,6 +18,7 @@ package foo @native val bar: Int = noImpl +@native var mbar: Int = noImpl // MODULE: main(lib) // FILE: main.kt @@ -35,5 +36,8 @@ fun box(): String { assertEquals(365, foo(42)) assertEquals(423, bar) + mbar = 523 + assertEquals(523, mbar) + return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/jsModule/cases/externalPackage/externalPackage.kt b/js/js.translator/testData/jsModule/cases/externalPackageInDifferentFile/externalPackageInDifferentFile.a.kt similarity index 55% rename from js/js.translator/testData/jsModule/cases/externalPackage/externalPackage.kt rename to js/js.translator/testData/jsModule/cases/externalPackageInDifferentFile/externalPackageInDifferentFile.a.kt index 9c29cb801a9..f176045a82c 100644 --- a/js/js.translator/testData/jsModule/cases/externalPackage/externalPackage.kt +++ b/js/js.translator/testData/jsModule/cases/externalPackageInDifferentFile/externalPackageInDifferentFile.a.kt @@ -15,16 +15,4 @@ package foo @native val bar: Int = noImpl -fun box(): String { - val a = A(23) - assertEquals(23, a.x) - assertEquals(65, a.foo(42)) - - assertEquals(123, B.x) - assertEquals(265, B.foo(142)) - - assertEquals(365, foo(42)) - assertEquals(423, bar) - - return "OK" -} \ No newline at end of file +@native var mbar: Int = noImpl \ No newline at end of file diff --git a/js/js.translator/testData/jsModule/cases/externalPackageInDifferentFile/externalPackageInDifferentFile.b.kt b/js/js.translator/testData/jsModule/cases/externalPackageInDifferentFile/externalPackageInDifferentFile.b.kt index 88862b028d5..94d0a1a08d5 100644 --- a/js/js.translator/testData/jsModule/cases/externalPackageInDifferentFile/externalPackageInDifferentFile.b.kt +++ b/js/js.translator/testData/jsModule/cases/externalPackageInDifferentFile/externalPackageInDifferentFile.b.kt @@ -13,5 +13,8 @@ fun box(): String { assertEquals(12345, C.f()) + mbar = 523 + assertEquals(523, mbar) + return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/multiModuleWrappers/cases/jsModuleOnPackage/lib/lib.kt b/js/js.translator/testData/multiModuleWrappers/cases/jsModuleOnPackage/lib/lib.kt index 81629dba835..11ae90a290e 100644 --- a/js/js.translator/testData/multiModuleWrappers/cases/jsModuleOnPackage/lib/lib.kt +++ b/js/js.translator/testData/multiModuleWrappers/cases/jsModuleOnPackage/lib/lib.kt @@ -13,4 +13,6 @@ package foo @native fun foo(y: Int): Int = noImpl -@native val bar: Int = noImpl \ No newline at end of file +@native val bar: Int = noImpl + +@native var mbar: Int = noImpl \ No newline at end of file diff --git a/js/js.translator/testData/multiModuleWrappers/cases/jsModuleOnPackage/main/main.kt b/js/js.translator/testData/multiModuleWrappers/cases/jsModuleOnPackage/main/main.kt index a2a43c1f503..9e3fbbb8fc0 100644 --- a/js/js.translator/testData/multiModuleWrappers/cases/jsModuleOnPackage/main/main.kt +++ b/js/js.translator/testData/multiModuleWrappers/cases/jsModuleOnPackage/main/main.kt @@ -11,5 +11,8 @@ fun box(): String { assertEquals(365, foo(42)) assertEquals(423, bar) + mbar = 523 + assertEquals(523, mbar) + return "OK" } \ No newline at end of file