JS: move more test to box tests

js/js.translator/testData/box/examples/enclosed.kt

@@ -18,7 +18,7 @@ open class N() : M(), K {
 
     override var y = 200
 
-    open class C() : K {
+    inner open class C() : K {
         fun test1() = x()
         fun test2() = super<M>@N.x()
         fun test3() = super<K>@N.x()

js/js.translator/testData/box/examples/initializerBlockDImpl.kt

@@ -2,10 +2,10 @@ import java.util.*
 import java.io.*
 
 class World() {
-    public val items: ArrayList<Item> = ArrayList<Item>
+    public val items: ArrayList<Item> = ArrayList<Item>()
 
-    class Item() {
-        {
+    inner class Item() {
+        init {
             items.add(this)
         }
     }
@@ -13,7 +13,7 @@ class World() {
     val foo = Item()
 }
 
-fun box(): String {
+fun box() : String {
     val w = World()
     if (w.items.size != 1) return "fail"
     return "OK"

js/js.translator/testData/box/examples/innerClass.kt

@@ -1,5 +1,5 @@
 class Outer(val foo: StringBuilder) {
-    class Inner() {
+    inner class Inner() {
         fun len(): Int {
             return foo.length
         }

js/js.translator/testData/box/examples/propertyInInitializer.kt

@@ -1,10 +1,10 @@
 class Outer() {
     val s = "xyzzy"
 
-    open class InnerBase(public val name: String) {
+    open inner class InnerBase(public val name: String) {
     }
 
-    class InnerDerived() : InnerBase(s) {
+    inner class InnerDerived() : InnerBase(s) {
     }
 
     val x = InnerDerived()

js/js.translator/testData/box/java/arrayList/access.kt

@@ -0,0 +1,14 @@
+package foo
+
+import java.util.ArrayList;
+
+fun box(): String {
+    val a = ArrayList<Int>();
+    a.add(1)
+    a.add(2)
+    if (a.size != 2) return "fail1: ${a.size}"
+    if (a.get(1) != 2) return "fail2"
+    if (a.get(0) != 1) return "fail3"
+
+    return "OK"
+}

js/js.translator/testData/box/java/arrayList/arrayAccess.kt

@@ -0,0 +1,15 @@
+package foo
+
+import java.util.ArrayList;
+
+fun box(): String {
+    val a = ArrayList<Int>();
+    a.add(1)
+    a.add(2)
+    a[1] = 100
+    if (a.size != 2) return "fail1: ${a.size}"
+    if (a[1] != 100) return "fail2"
+    if (a[0] != 1) return "fail3"
+
+    return "OK"
+}

js/js.translator/testData/box/java/arrayList/constructWithCapacity.kt

@@ -0,0 +1,8 @@
+package foo
+
+import java.util.ArrayList
+
+fun box(): String {
+    val al = ArrayList<Int>(10)
+    return if (al.size == 0) "OK" else "fail: ${al.size}"
+}

js/js.translator/testData/box/java/arrayList/constructWithSideEffectParam.kt

@@ -8,7 +8,10 @@ fun withSideEffect(v: Int): Int {
     return v
 }
 
-fun box(): Boolean {
+fun box(): String {
     val al = ArrayList<Int>(withSideEffect(2))
-    return al.size == 0 && baz == 2
+    if (al.size != 0) return "fail1: ${al.size}"
+    if (baz != 2) return "fail2: $baz"
+
+    return "OK"
 }

js/js.translator/testData/box/java/arrayList/emptyList.kt

@@ -0,0 +1,8 @@
+package foo
+
+import java.util.ArrayList;
+
+fun box(): String {
+    val a = ArrayList<Int>();
+    return if (a.size == 0) "OK" else "fail: ${a.size}"
+}

js/js.translator/testData/box/java/arrayList/indexOOB.kt

@@ -0,0 +1,18 @@
+package foo
+
+import java.util.ArrayList;
+
+fun box(): String {
+    val arr = ArrayList<Int>();
+    var i = 0;
+    while (i++ < 10) {
+        arr.add(i);
+    }
+    try {
+        if (arr[10] == 11) return "fail1"
+    }
+    catch (e: Exception) {
+        return "OK"
+    }
+    return "fail2"
+}

js/js.translator/testData/box/java/arrayList/isEmpty.kt

@@ -0,0 +1,11 @@
+package foo
+
+import java.util.ArrayList;
+
+fun box(): String {
+    val a = ArrayList<Int>();
+    a.add(3)
+    if (a.isEmpty()) return "fail1"
+    if (!ArrayList<Int>().isEmpty()) return "fail2"
+    return "OK"
+}

js/js.translator/testData/box/java/arrayList/iterate.kt

@@ -2,7 +2,7 @@ package foo
 
 import java.util.ArrayList;
 
-fun box(): Boolean {
+fun box(): String {
     var i = 0
     val arr = ArrayList<Int>();
     while (i++ < 10) {
@@ -12,5 +12,8 @@ fun box(): Boolean {
     for (a in arr) {
         sum += a;
     }
-    return (sum == 55) && (arr.size == 10)
+    if (sum != 55) return "fail1: $sum"
+    if (arr.size != 10) return "fail2: ${arr.size}"
+
+    return "OK"
 }

js/js.translator/testData/box/java/arrayList/misc.kt

@@ -2,7 +2,7 @@ package foo
 
 import java.util.ArrayList
 
-fun box(): Boolean {
+fun box(): String {
     var i = 0
     val list = ArrayList<Int>()
     while (i++ < 3) {
@@ -15,7 +15,7 @@ fun box(): Boolean {
     list.add(1, 500)
     // test contains, addAll
     if (!list.contains(500) || list.contains(600) || list.addAll(ArrayList<Int>())) {
-        return false;
+        return "fail1"
     }
 
     val a = ArrayList<Int>()
@@ -25,11 +25,11 @@ fun box(): Boolean {
     b.add(4)
     a.addAll(b)
     if (a[0] != 3 || a[1] != 4) {
-        return false
+        return "fail2"
     }
 
     if (a.isEmpty() || !ArrayList<Int>().isEmpty()) {
-        return false
+        return "fail2"
     }
 
     assertNotEquals(a, b, "a != b")
@@ -45,5 +45,6 @@ fun box(): Boolean {
     assertArrayEquals(arrayOf(1, 500, 2, 3), list.toTypedArray(), "list.toTypedArray()")
     assertEquals("[1,500,2,3]", JSON.stringify(list), "JSON.stringify(list)")
     assertEquals("[1, 500, 2, 3]", list.toString(), "list.toString()")
-    return true;
+
+    return "OK"
 }

js/js.translator/testData/box/java/arrayList/remove.kt

@@ -0,0 +1,22 @@
+package foo
+
+import java.util.ArrayList
+
+fun box(): String {
+    val arr = ArrayList<Int>()
+    for (i in 0..5) {
+        arr.add(i)
+    }
+
+    val removedElement = arr.removeAt(2)
+    val removed = arr.remove(4)
+    if (arr.size != 4) return "fail1: ${arr.size}"
+    if (removedElement != 2) return "fail2: ${removedElement}"
+    if (!removed) return "fail3"
+    if (arr[0] != 0) return "fail4: ${arr[0]}"
+    if (arr[1] != 1) return "fail5: ${arr[1]}"
+    if (arr[2] != 3) return "fail6: ${arr[2]}"
+    if (arr[3] != 5) return "fail7: ${arr[3]}"
+
+    return "OK"
+}

js/js.translator/testData/box/java/arrayList/removeWithIndexOutOfBounds.kt

@@ -2,7 +2,7 @@ package foo
 
 import java.util.ArrayList
 
-fun box(): Boolean {
+fun box(): String {
     var threwForEmptyList = false
 
     val arr = ArrayList<Int>()
@@ -26,5 +26,5 @@ fun box(): Boolean {
         threwForFilled = true
     }
 
-    return threwForEmptyList && threwForFilled
+    return if (threwForEmptyList && threwForFilled) "OK" else "fail"
 }

js/js.translator/testData/box/java/arrayList/toArray.kt

@@ -2,7 +2,7 @@ package foo
 
 import java.util.ArrayList
 
-fun box(): Boolean {
+fun box(): String {
     var i = 0
     val list = ArrayList<Int>()
     while (i++ < 3) {
@@ -13,5 +13,6 @@ fun box(): Boolean {
     list.add(1, 500)
 
     val array = list.toTypedArray()
-    return array[0] == 1 && array[1] == 500 && array[2] == 2 && array[3] == 3 && JSON.stringify(list) == "[1,500,2,3]";
+
+    return if (array[0] == 1 && array[1] == 500 && array[2] == 2 && array[3] == 3 && JSON.stringify(list) == "[1,500,2,3]") "OK" else "fail"
 }

js/js.translator/testData/java/arrayList/cases/access.kt

@@ -1,10 +0,0 @@
-package foo
-
-import java.util.ArrayList;
-
-fun box(): Boolean {
-    val a = ArrayList<Int>();
-    a.add(1)
-    a.add(2)
-    return (a.size == 2) && (a.get(1) == 2) && (a.get(0) == 1);
-}

js/js.translator/testData/java/arrayList/cases/arrayAccess.kt

@@ -1,11 +0,0 @@
-package foo
-
-import java.util.ArrayList;
-
-fun box(): Boolean {
-    val a = ArrayList<Int>();
-    a.add(1)
-    a.add(2)
-    a[1] = 100
-    return (a.size == 2) && (a[1] == 100) && (a[0] == 1);
-}

js/js.translator/testData/java/arrayList/cases/constructWithCapacity.kt

@@ -1,8 +0,0 @@
-package foo
-
-import java.util.ArrayList
-
-fun box(): Boolean {
-    val al = ArrayList<Int>(10)
-    return al.size == 0
-}

js/js.translator/testData/java/arrayList/cases/emptyList.kt

@@ -1,8 +0,0 @@
-package foo
-
-import java.util.ArrayList;
-
-fun box(): Boolean {
-    val a = ArrayList<Int>();
-    return a.size == 0;
-}

js/js.translator/testData/java/arrayList/cases/indexOOB.kt

@@ -1,12 +0,0 @@
-package foo
-
-import java.util.ArrayList;
-
-fun box(): Boolean {
-    val arr = ArrayList<Int>();
-    var i = 0;
-    while (i++ < 10) {
-        arr.add(i);
-    }
-    return (arr[10] == 11)
-}

js/js.translator/testData/java/arrayList/cases/isEmpty.kt

@@ -1,9 +0,0 @@
-package foo
-
-import java.util.ArrayList;
-
-fun box(): Boolean {
-    val a = ArrayList<Int>();
-    a.add(3)
-    return !(a.isEmpty()) && (ArrayList<Int>().isEmpty());
-}

js/js.translator/testData/java/arrayList/cases/remove.kt

@@ -1,14 +0,0 @@
-package foo
-
-import java.util.ArrayList
-
-fun box(): Boolean {
-    val arr = ArrayList<Int>()
-    for (i in 0..5) {
-        arr.add(i)
-    }
-
-    val removedElement = arr.removeAt(2)
-    val removed = arr.remove(4)
-    return arr.size == 4 && removedElement == 2 && removed && arr[0] == 0 && arr[1] == 1 && arr[2] == 3 && arr[3] == 5
-}