JS: move expressions test to box tests

js/js.translator/testData/box/expression/equals/customEqualsMethod.kt

@@ -13,12 +13,12 @@ fun callEqualsMethod(v1: Foo?, v2: Foo?): Boolean {
     return v1 == v2
 }
 
-fun box(): Boolean {
+fun box(): String {
     val a = Foo("abc")
     val b = Foo("abc")
     val c = Foo("def")
 
-    if (!callEqualsMethod(a, b)) return false
-    if (callEqualsMethod(a, c)) return false
-    return true
+    if (!callEqualsMethod(a, b)) return "fail1"
+    if (callEqualsMethod(a, c)) return "fail2"
+    return "OK"
 }

js/js.translator/testData/box/expression/equals/customEqualsMethodOnAny.kt

@@ -13,12 +13,12 @@ fun callEqualsMethod(v1: Any?, v2: Any?): Boolean {
     return v1 == v2
 }
 
-fun box(): Boolean {
+fun box(): String {
     val a = Foo("abc")
     val b = Foo("abc")
     val c = Foo("def")
 
-    if (!callEqualsMethod(a, b)) return false
-    if (callEqualsMethod(a, c)) return false
-    return true
+    if (!callEqualsMethod(a, b)) return "fail1"
+    if (callEqualsMethod(a, c)) return "fail2"
+    return "OK"
 }

js/js.translator/testData/box/expression/equals/explicitEqualsMethod.kt

@@ -13,16 +13,16 @@ class Bar() {
 
 }
 
-fun box(): Boolean {
+fun box(): String {
     val a = Foo("abc")
     val b = Foo("abc")
     val c = Foo("def")
 
-    if (!(a.equals(b))) return false
-    if (a.equals(c)) return false
-    if (Bar().equals(Bar())) return false
+    if (!(a.equals(b))) return "fail1"
+    if (a.equals(c)) return "fail2"
+    if (Bar().equals(Bar())) return "fail3"
     val g = Bar()
-    if (!(g.equals(g))) return false
-    if (g.equals(Bar())) return false
-    return true
+    if (!(g.equals(g))) return "fail4"
+    if (g.equals(Bar())) return "fail5"
+    return "OK"
 }

js/js.translator/testData/box/expression/equals/explicitEqualsMethodForPrimitives.kt

@@ -0,0 +1,21 @@
+package foo
+
+fun box(): String {
+    val a = 2
+    if (!(a.equals(a))) return "fail1"
+    if (!(a.equals(2))) return "fail2"
+    if (!(a.equals(2.0))) return "fail3"
+    val c = "a"
+    if (!("a".equals(c))) return "fail4"
+    if (!((null as Any?)?.equals(null) ?: true)) return "fail5"
+    val d = 5.6
+    if (!(d.toShort().equals(5.toShort()))) return "fail6"
+    if (!(d.toByte().equals(5.toByte()))) return "fail7"
+    if (!(d.toFloat().equals(5.6.toFloat()))) return "fail8"
+    if (!(d.toInt().equals(5))) return "fail9"
+    if (true.equals(false)) return "fail10"
+
+    val n: Number = 3
+    if (!(n.equals(3.3.toInt()))) return "fail11"
+    return "OK"
+}

js/js.translator/testData/box/expression/equals/kt2370.kt

@@ -2,12 +2,12 @@ package foo
 
 import java.util.*
 
-fun box(): Boolean {
+fun box(): String {
     val data = ArrayList<String>()
     data.add("foo")
     data.add("bar")
     data.add("whatnot")
     val data2 = ArrayList<String>()
     data2.addAll(data)
-    return data.equals(data2)
+    return if (data.equals(data2)) "OK" else "fail"
 }

js/js.translator/testData/box/expression/equals/stringsEqual.kt

@@ -0,0 +1,12 @@
+package foo
+
+fun box(): String {
+    val a = "abc"
+    val b = "abc"
+    val c = "def"
+
+    if (a != b) return "fail1"
+    if (a == c) return "fail2"
+
+    return "OK"
+}

js/js.translator/testData/box/expression/evaluationOrder/2dangerousInExpression.kt

@@ -1,23 +1,23 @@
 package foo
 
-fun box(): Boolean {
+fun box(): String {
     if (f(0) != -3) {
-        return false
+        return "fail1"
     }
     if (f(102) != 201) {
-        return false;
+        return "fail2"
     }
     if (f(103) != 100) {
-        return false
+        return "fail3"
     }
     if (f(-100) != -100) {
-        return false
+        return "fail4"
     }
     if (f(-99) != -201) {
-        return false
+        return "fail5"
     }
 
-    return true
+    return "OK"
 }
 
 fun f(i: Int): Int {

js/js.translator/testData/box/expression/evaluationOrder/dangerousInline.kt

@@ -0,0 +1,9 @@
+package foo
+
+var i = 0
+
+inline fun f() = i * 2
+
+fun box(): String {
+    return if ((++i + f()) == 3) "OK" else "fail"
+}

js/js.translator/testData/box/expression/evaluationOrder/dangerousInsideDangerous.kt

@@ -1,16 +1,16 @@
 package foo
 
-fun box(): Boolean {
+fun box(): String {
     if (f(0) != 201) {
-        return false
+        return "fail1"
     }
     if (f(1) != 104) {
-        return false
+        return "fail2"
     }
     if (f(-2) != -100) {
-        return false
+        return "fail3"
     }
-    return true
+    return "OK"
 }
 
 fun f(i: Int): Int {

js/js.translator/testData/box/expression/evaluationOrder/evaluationOrder1.kt

@@ -7,11 +7,11 @@ fun f(): Int {
     return d
 }
 
-fun box(): Boolean {
+fun box(): String {
     d = d-- + f() + when(d) {
-        -100 -> return true
+        -100 -> return "OK"
         1 -> 1
-        else -> return false
+        else -> return "fail1"
     }
-    return false
+    return "fail2"
 }

js/js.translator/testData/box/expression/evaluationOrder/ifAsFunArgument.kt

@@ -0,0 +1,13 @@
+package foo
+
+fun box(): String {
+    var i = 0
+    val c = sum(++i, if (i == 0) return "fail1" else i + 2)
+    if (c != 4) {
+        return "fail2: $c"
+    }
+    return "OK"
+}
+
+
+fun sum(a1: Int, a2: Int) = a1 + a2

js/js.translator/testData/box/expression/evaluationOrder/ifAsPlusArgument.kt

@@ -1,10 +1,10 @@
 package foo
 
-fun box(): Boolean {
+fun box(): String {
     var  i = 0
     var t = ++i + if (i == 0) 0 else 2
     if (t != 3) {
-        return false
+        return "fail: $t"
     }
-    return true
+    return "OK"
 }

js/js.translator/testData/box/expression/evaluationOrder/whenAsMinusArgument.kt

@@ -1,6 +1,6 @@
 package foo
 
-fun box(): Boolean {
+fun box(): String {
     var  i = 0
     var t = ++i + when(i) {
         3 -> 4
@@ -9,7 +9,7 @@ fun box(): Boolean {
         else -> 100
     }
     if (t != 3) {
-        return false
+        return "fail: $t"
     }
-    return true
+    return "OK"
 }

js/js.translator/testData/box/expression/for/forIteratesOverArray.kt

@@ -2,7 +2,7 @@ package foo
 
 val a1 = arrayOfNulls<Int>(10)
 
-fun box(): Boolean {
+fun box(): String {
     var c = 0
     var d = 0
     a1[3] = 3
@@ -30,5 +30,5 @@ fun box(): Boolean {
         sLong += i
     assertEquals(55L, sLong)
 
-    return true
+    return "OK"
 }

js/js.translator/testData/box/expression/for/forOnEmptyArray.kt

@@ -2,9 +2,9 @@ package foo
 
 val a1 = arrayOfNulls<Int>(0)
 
-fun box(): Boolean {
+fun box(): String {
     for (a in a1) {
-        return false;
+        return "fail"
     }
-    return true;
+    return "OK"
 }