diff --git a/js/js.translator/testFiles/expression/misc/cases/KT-1361-1.kt b/js/js.translator/testFiles/expression/misc/cases/KT-1361-1.kt index c8b1513a002..4db22adc6bf 100644 --- a/js/js.translator/testFiles/expression/misc/cases/KT-1361-1.kt +++ b/js/js.translator/testFiles/expression/misc/cases/KT-1361-1.kt @@ -1,21 +1,21 @@ -//This is not treated correctly when object is created. - package foo class B { - val d = true - fun f() : Boolean { - val c = object { - fun foo() : Boolean { + fun f(): Boolean { + val c = object { + fun foo(): Boolean { return d } + fun boo(): Boolean { + return foo() + } } - return c.foo() + return c.boo() } } -fun box() : Boolean { +fun box(): Boolean { return B().f() } \ No newline at end of file diff --git a/js/js.translator/testFiles/java/arrayList/cases/toArray.kt b/js/js.translator/testFiles/java/arrayList/cases/toArray.kt index 65da1d0d93f..6c5cdd93d45 100644 --- a/js/js.translator/testFiles/java/arrayList/cases/toArray.kt +++ b/js/js.translator/testFiles/java/arrayList/cases/toArray.kt @@ -2,12 +2,16 @@ package foo import java.util.ArrayList -fun box() : Boolean { +fun box(): Boolean { var i = 0 val list = ArrayList() while (i++ < 3) { list.add(i) } + + // test addAt + list.add(1, 500) + val array = list.toArray() - return array[0] == 1 && array[1] == 2 && array[2] == 3 + return array[0] == 1 && array[1] == 500 && array[2] == 2 && array[3] == 3 && JSON.stringify(list) == "[1,500,2,3]"; } \ No newline at end of file diff --git a/js/js.translator/testFiles/object/cases/objectDeclaration.kt b/js/js.translator/testFiles/object/cases/objectDeclaration.kt index fdf1c0fa352..7fc31f790aa 100644 --- a/js/js.translator/testFiles/object/cases/objectDeclaration.kt +++ b/js/js.translator/testFiles/object/cases/objectDeclaration.kt @@ -1,17 +1,28 @@ package foo +class A { + +} + object test { var c = 2; var b = 1; } -fun box() : Boolean { +object aWrapper { + var a = A(); +} + +fun box(): Boolean { if (test.c != 2) return false; if (test.b != 1) return false; test.c += 10 if (test.c != 12) { - return false; + return false; + } + if (aWrapper.a !is A) { + return false } return true; } \ No newline at end of file