JS: move more test to box tests

js/js.translator/testData/arrayThrowsExceptionOnOOBaccess.kt

@@ -6,4 +6,4 @@ class A() {
 val a1 = Array<Int>(3)
 val a2 = Array<A>(2)
 
-fun box() = (a1[4] == null)
+fun box() = if (a1[4] == null) "OK" else "fail"

js/js.translator/testData/box/safeCall/safeAccess.kt

@@ -4,15 +4,19 @@ class A() {
     var c = 3
 }
 
-fun box(): Boolean {
+fun box(): String {
     var a1: A? = A()
     var a2: A? = null
     a1?.c = 4
     a2?.c = 5
     if (a1?.c != 4) {
-        return false;
+        return "fail1"
     }
     a2 = a1
     a2?.c = 5
-    return (a2?.c == 5) && (a1?.c == 5)
+
+    if (a2?.c != 5) return "fail2"
+    if (a1?.c != 5) return "fail3"
+
+    return "OK"
 }

js/js.translator/testData/box/safeCall/safeCall.kt

@@ -5,8 +5,8 @@ class A() {
     }
 }
 
-fun box(): Boolean {
+fun box(): String {
     var a: A? = null;
     a?.doSomething()
-    return true;
+    return "OK"
 }

js/js.translator/testData/box/safeCall/safeCallReturnsNullIfFails.kt

@@ -0,0 +1,10 @@
+package foo
+
+class A() {
+    val x = 4
+}
+
+fun box(): String {
+    var a: A? = null;
+    return if (a?.x == null) "OK" else "fail"
+}

js/js.translator/testData/box/simple/assign.kt

@@ -6,4 +6,4 @@ fun f(): Int {
     return x
 }
 
-fun box() = f() == 2
+fun box() = if (f() == 2) "OK" else "fail"

js/js.translator/testData/box/simple/breakDoWhile.kt

@@ -1,6 +1,6 @@
 package foo
 
-fun box(): Boolean {
+fun box(): String {
     var i = 0
     do {
         if (i == 3) {
@@ -8,7 +8,7 @@ fun box(): Boolean {
         }
         ++i;
     }
-    while ( i < 100)
+    while (i < 100)
 
-    return i == 3
+    return if (i == 3) "OK" else "fail: $i"
 }

js/js.translator/testData/box/simple/breakWhile.kt

@@ -1,13 +1,13 @@
 package foo
 
-fun box(): Boolean {
+fun box(): String {
     var i = 0
-    while ( i < 100) {
+    while (i < 100) {
         if (i == 3) {
             break;
         }
         ++i;
     }
 
-    return i == 3
+    return if (i == 3) "OK" else "fail: $i"
 }

js/js.translator/testData/box/simple/classInstantiation.kt

@@ -3,7 +3,7 @@ package foo
 class Test() {
 }
 
-fun box(): Boolean {
+fun box(): String {
     var test = Test()
-    return true
+    return "OK"
 }

js/js.translator/testData/box/simple/comparison.kt

@@ -1,9 +1,9 @@
 package foo
 
-fun box(): Boolean {
+fun box(): String {
     val a = 2;
     val b = 3;
     var c = 4;
-    return (a < c)
+    return if (a < c) "OK" else "fail"
 }
 

js/js.translator/testData/box/simple/complexExpressionAsConstructorParameter.kt

@@ -5,7 +5,10 @@ class Test(a: Int, b: Int) {
     val d = b
 }
 
-fun box(): Boolean {
+fun box(): String {
     val test = Test(1 + 6 * 3, 10 % 2)
-    return (test.c == 19) && (test.d == 0)
+    if (test.c != 19) return "fail1"
+    if (test.d != 0) return "fail2"
+
+    return "OK"
 }

js/js.translator/testData/box/simple/constructorWithParameter.kt

@@ -4,7 +4,7 @@ class Test(a: Int) {
     val b = a
 }
 
-fun box(): Boolean {
+fun box(): String {
     var test = Test(1)
-    return (test.b == 1)
+    return if (test.b == 1) "OK" else "fail"
 }

js/js.translator/testData/box/simple/constructorWithPropertiesAsParameters.kt

@@ -4,9 +4,9 @@ class A(var b: Int, var a: String) {
 
 }
 
-fun box(): Boolean {
+fun box(): String {
     val c = A(1, "1")
     c.b = 2
     c.a = "2"
-    return (c.b == 2 && c.a == "2")
+    return if (c.b == 2 && c.a == "2") "OK" else "fail"
 }

js/js.translator/testData/box/simple/continueDoWhile.kt

@@ -1,6 +1,6 @@
 package foo
 
-fun box(): Boolean {
+fun box(): String {
     var i = 0
     var b = true
     do {
@@ -12,5 +12,5 @@ fun box(): Boolean {
     }
     while (i < 100)
 
-    return b
+    return if (b) "OK" else "fail"
 }

js/js.translator/testData/box/simple/continueWhile.kt

@@ -1,6 +1,6 @@
 package foo
 
-fun box(): Boolean {
+fun box(): String {
     var i = 0
     var b = true
     while (i < 100) {
@@ -11,5 +11,5 @@ fun box(): Boolean {
         b = false;
     }
 
-    return b
+    return if (b) "OK" else "fail"
 }

js/js.translator/testData/box/simple/doWhile.kt

@@ -1,6 +1,6 @@
 package foo
 
-fun box(): Boolean {
+fun box(): String {
 
     val a = 50;
     var b = 0;
@@ -11,8 +11,8 @@ fun box(): Boolean {
     }
     while (b < a)
     if (c == 100) {
-        return true;
+        return "OK"
     }
-    return false;
+    return "fail: $c"
 }
 

js/js.translator/testData/box/simple/doWhile2.kt

@@ -1,14 +1,14 @@
 package foo
 
-fun box(): Boolean {
+fun box(): String {
     var x = 2;
     do {
         x = 1;
     }
     while (3 < 2)
     if (x == 1) {
-        return true;
+        return "OK"
     }
-    return false;
+    return "fail: $x"
 }
 

js/js.translator/testData/box/simple/elseif.kt

@@ -18,4 +18,4 @@ fun bor(): Int {
     }
 }
 
-fun box() = bor() == 5
+fun box() = if (bor() == 5) "OK" else "fail"

js/js.translator/testData/box/simple/if.kt

@@ -18,5 +18,5 @@ fun bol(): Int {
     }
 }
 
-fun box() = bol() == 5
+fun box() = if (bol() == 5) "OK" else "fail"
 

js/js.translator/testData/box/simple/ifElseAsExpression.kt

@@ -0,0 +1,6 @@
+package foo
+
+fun box(): String {
+    val a = 2;
+    return if (a == 2) "OK" else "fail"
+}

js/js.translator/testData/box/simple/methodDeclarationAndCall.kt

@@ -1,12 +1,12 @@
 package foo
 
 class Test() {
-    fun method(): Boolean {
-        return true;
+    fun method(): String {
+        return "OK"
     }
 }
 
-fun box(): Boolean {
+fun box(): String {
     var test = Test()
     return test.method()
 }

js/js.translator/testData/box/simple/minusAssignOnProperty.kt

@@ -0,0 +1,10 @@
+package foo
+
+var a = 3
+
+fun box(): String {
+    a -= 10
+
+    return if (a == -7) "OK" else "fail"
+
+}

js/js.translator/testData/box/simple/notBoolean.kt

@@ -0,0 +1,5 @@
+package foo
+
+fun box(): String {
+    return if (!false) "OK" else "fail"
+}

js/js.translator/testData/box/simple/plusAssign.kt

@@ -0,0 +1,8 @@
+package foo
+
+
+fun box(): String {
+    var a = 3
+    a += 3
+    return if (a == 6) "OK" else "fail"
+}

js/js.translator/testData/box/simple/positiveAndNegativeNumbers.kt

@@ -0,0 +1,7 @@
+package foo
+
+fun box(): String {
+    val b = -3
+    val c = +3
+    return if ((c - b) == 6) "OK" else "fail"
+}

js/js.translator/testData/box/simple/postfixIntOperations.kt

@@ -0,0 +1,10 @@
+package foo
+
+fun box(): String {
+    var a = 3;
+    val b = a++;
+    a--;
+    a--;
+    return if ((a++ == 2) && (b == 3)) "OK" else "fail"
+}
+

js/js.translator/testData/box/simple/prefixIntOperations.kt

@@ -0,0 +1,10 @@
+package foo
+
+fun box(): String {
+    var a = 3;
+    val b = ++a;
+    --a;
+    --a;
+    return if ((--a == 1) && (b == 4)) "OK" else "fail"
+}
+

js/js.translator/testData/box/simple/propertiesAsParametersInitialized.kt

@@ -4,7 +4,7 @@ class A(var b: Int, var a: String) {
 
 }
 
-fun box(): Boolean {
+fun box(): String {
     val c = A(2, "2")
-    return (c.b == 2 && c.a == "2")
+    return if (c.b == 2 && c.a == "2") "OK" else "fail"
 }

js/js.translator/testData/box/simple/propertyAccess.kt

@@ -1,9 +1,9 @@
 package foo
 
 class Test() {
-    val p = true
+    val p = "OK"
 }
 
-fun box(): Boolean {
+fun box(): String {
     return Test().p
 }

js/js.translator/testData/box/simple/simpleInitializer.kt

@@ -7,6 +7,6 @@ class Test() {
     }
 }
 
-fun box(): Boolean {
-    return (Test().a == 3);
+fun box(): String {
+    return if (Test().a == 3) "OK" else "fail"
 }

js/js.translator/testData/box/simple/while.kt

@@ -1,6 +1,6 @@
 package foo
 
-fun box(): Boolean {
+fun box(): String {
 
     val a = 50;
     var b = 0;
@@ -10,8 +10,8 @@ fun box(): Boolean {
         c = c + 2;
     }
     if (c == 100) {
-        return true;
+        return "OK"
     }
-    return false;
+    return "fail: $c"
 }
 

js/js.translator/testData/box/simple/while2.kt

@@ -0,0 +1,10 @@
+package foo
+
+fun box(): String {
+
+    while (2 < 1) {
+        return "fail"
+    }
+    return "OK"
+}
+

js/js.translator/testData/box/standardClasses/array.kt

@@ -0,0 +1,9 @@
+package foo
+
+fun box(): String {
+
+    val a = arrayOfNulls<Int>(2)
+    a.set(1, 2)
+    return if (a.get(1) == 2) "OK" else "fail"
+}
+

js/js.translator/testData/box/standardClasses/arrayAccess.kt

@@ -0,0 +1,8 @@
+package foo
+
+fun box(): String {
+    val a = arrayOfNulls<Int>(4)
+    a[1] = 2
+    a[2] = 3
+    return if ((a[1] == 2) && (a[2] == 3)) "OK" else "fail"
+}

js/js.translator/testData/box/standardClasses/arrayFunctionConstructor.kt

@@ -0,0 +1,7 @@
+package foo
+
+val f = { i: Int -> i + 1 }
+
+val a = Array(3, f)
+
+fun box() = if (a[0] == 1 && a[2] == 3 && a[1] == 2) "OK" else "fail"

js/js.translator/testData/box/standardClasses/arrayIsFilledWithNulls.kt

@@ -0,0 +1,5 @@
+package foo
+
+val a = arrayOfNulls<Int>(3)
+
+fun box() = if (a[0] == null && a[1] == null && a[2] == null) "OK" else "fail"

js/js.translator/testData/box/standardClasses/arraySize.kt

@@ -6,4 +6,4 @@ class A() {
 val a1 = arrayOfNulls<Int>(3)
 val a2 = arrayOfNulls<A>(2)
 
-fun box() = (a1.size == 3 && a2.size == 2)
+fun box() = if (a1.size == 3 && a2.size == 2) "OK" else "fail"

js/js.translator/testData/box/standardClasses/arraysIterator.kt

@@ -0,0 +1,16 @@
+package foo
+
+val a1 = Array<Int>(3, { i: Int -> i })
+
+fun box(): String {
+    val i = a1.iterator()
+    if (i.hasNext() != true) return "fail1"
+    if (i.next() != 0) return "fail2"
+    if (i.hasNext() != true) return "fail3"
+    if (i.next() != 1) return "fail4"
+    if (i.hasNext() != true) return "fail5"
+    if (i.next() != 2) return "fail6"
+    if (i.hasNext() != false) return "fail7"
+
+    return "OK"
+}

js/js.translator/testData/safeCall/cases/safeCallReturnsNullIfFails.kt

@@ -1,10 +0,0 @@
-package foo
-
-class A() {
-    val x = 4
-}
-
-fun box(): Boolean {
-    var a: A? = null;
-    return (a?.x == null);
-}

js/js.translator/testData/simple/cases/ifElseAsExpression.kt

@@ -1,6 +0,0 @@
-package foo
-
-fun box(): Boolean {
-    val a = 2;
-    return if (a == 2) true else false;
-}

js/js.translator/testData/simple/cases/minusAssignOnProperty.kt

@@ -1,10 +0,0 @@
-package foo
-
-var a = 3
-
-fun box(): Boolean {
-    a -= 10
-
-    return (a == -7)
-
-}

js/js.translator/testData/simple/cases/notBoolean.kt

@@ -1,5 +0,0 @@
-package foo
-
-fun box(): Boolean {
-    return !false;
-}

js/js.translator/testData/simple/cases/plusAssign.kt

@@ -1,8 +0,0 @@
-package foo
-
-
-fun box(): Boolean {
-    var a = 3
-    a += 3
-    return (a == 6)
-}

js/js.translator/testData/simple/cases/positiveAndNegativeNumbers.kt

@@ -1,7 +0,0 @@
-package foo
-
-fun box(): Boolean {
-    val b = -3
-    val c = +3
-    return (c - b) == 6
-}

js/js.translator/testData/simple/cases/postfixIntOperations.kt

@@ -1,10 +0,0 @@
-package foo
-
-fun box(): Boolean {
-    var a = 3;
-    val b = a++;
-    a--;
-    a--;
-    return (a++ == 2) && (b == 3)
-}
-

js/js.translator/testData/simple/cases/prefixIntOperations.kt

@@ -1,10 +0,0 @@
-package foo
-
-fun box(): Boolean {
-    var a = 3;
-    val b = ++a;
-    --a;
-    --a;
-    return (--a == 1) && (b == 4)
-}
-

js/js.translator/testData/simple/cases/while2.kt

@@ -1,10 +0,0 @@
-package foo
-
-fun box(): Boolean {
-
-    while (2 < 1) {
-        return false;
-    }
-    return true;
-}
-

js/js.translator/testData/standardClasses/cases/array.kt

@@ -1,9 +0,0 @@
-package foo
-
-fun box(): Boolean {
-
-    val a = arrayOfNulls<Int>(2)
-    a.set(1, 2)
-    return a.get(1) == 2
-}
-

js/js.translator/testData/standardClasses/cases/arrayAccess.kt

@@ -1,8 +0,0 @@
-package foo
-
-fun box(): Boolean {
-    val a = arrayOfNulls<Int>(4)
-    a[1] = 2
-    a[2] = 3
-    return (a[1] == 2) && (a[2] == 3)
-}

js/js.translator/testData/standardClasses/cases/arrayFunctionConstructor.kt

@@ -1,7 +0,0 @@
-package foo
-
-val f = { i: Int -> i + 1 }
-
-val a = Array(3, f)
-
-fun box() = (a[0] == 1 && a[2] == 3 && a[1] == 2)

js/js.translator/testData/standardClasses/cases/arrayIsFilledWithNulls.kt

@@ -1,5 +0,0 @@
-package foo
-
-val a = arrayOfNulls<Int>(3)
-
-fun box() = (a[0] == null && a[1] == null && a[2] == null)

js/js.translator/testData/standardClasses/cases/arraysIterator.kt

@@ -1,11 +0,0 @@
-package foo
-
-val a1 = Array<Int>(3, { i: Int -> i })
-
-fun box(): Boolean {
-    val i = a1.iterator()
-    return ((i.hasNext() == true) && (i.next() == 0) &&
-    (i.hasNext() == true) && (i.next() == 1) &&
-    (i.hasNext() == true) && (i.next() == 2) &&
-    (i.hasNext() == false));
-}