JS backend: _commonFiles/ for common kotlin files in testData/ and every test dir

js/js.translator/testData/closure/cases/closureGenericTypeValue.kt

@@ -6,10 +6,6 @@ class A<T>(val a: T) {
 
 fun <T> T.bar() = { this }
 
-fun assertEquals(expected: String, actual: String) {
-    if (expected != actual) throw Exception("Expected: $expected, actual: $actual")
-}
-
 fun box(): String {
     assertEquals("ok", A("ok").foo())
     assertEquals("a42", "a42".bar()())

js/js.translator/testData/closure/cases/closureInNestedFunctionsInMethod.kt

@@ -2,47 +2,38 @@ package foo
 
 fun run<T>(f: () -> T) = f()
 
-class Fail(val message: String) : RuntimeException(message) {
-    val isFail = true // workaround for exception handling
-}
-
-
 class A {
-    var testName = ""
-    fun assertEquals(actual: Int, expected: Int, message: String) =
-            if (actual != expected) throw Fail("$message in $testName test.")
-
     val a = 12
     var b = 1
 
     fun boo(c: Int) = c
 
     fun litlit() {
-        testName = "litlit"
+        val testName = "litlit"
         run {
             run {
-                assertEquals(a, 12, "a != 12")
+                assertEquals(12, a, testName)
 
-                assertEquals(b, 1, "b != 1")
+                assertEquals(1, b, testName)
                 b = 23
-                assertEquals(b, 23, "b != 23")
+                assertEquals(23, b, testName)
 
-                assertEquals(boo(34), 34, "boo(34) != 34")
+                assertEquals(34, boo(34), testName)
             }
         }
     }
 
     fun funfun() {
-        testName = "funfun"
+        val testName = "funfun"
         fun foo() {
             fun bar() {
-                assertEquals(a, 12, "a != 12")
+                assertEquals(12, a, testName)
 
-                assertEquals(b, 1, "b != 1")
+                assertEquals(1, b, testName)
                 b = 23
-                assertEquals(b, 23, "b != 23")
+                assertEquals(23, b, testName)
 
-                assertEquals(boo(34), 34, "boo(34) != 34")
+                assertEquals(34, boo(34), testName)
             }
             bar()
         }
@@ -50,32 +41,32 @@ class A {
     }
 
     fun litfun() {
-        testName = "litfun"
+        val testName = "litfun"
         run {
             fun bar() {
-                assertEquals(a, 12, "a != 12")
+                assertEquals(12, a, testName)
 
-                assertEquals(b, 1, "b != 1")
+                assertEquals(1, b, testName)
                 b = 23
-                assertEquals(b, 23, "b != 23")
+                assertEquals(23, b, testName)
 
-                assertEquals(boo(34), 34, "boo(34) != 34")
+                assertEquals(34, boo(34), testName)
             }
             bar()
         }
     }
 
     fun funlit() {
-        testName = "funlit"
+        val testName = "funlit"
         fun foo() {
             run {
-                assertEquals(a, 12, "a != 12")
+                assertEquals(12, a, testName)
 
-                assertEquals(b, 1, "b != 1")
+                assertEquals(1, b, testName)
                 b = 23
-                assertEquals(b, 23, "b != 23")
+                assertEquals(23, b, testName)
 
-                assertEquals(boo(34), 34, "boo(34) != 34")
+                assertEquals(34, boo(34), testName)
             }
         }
         foo()
@@ -83,16 +74,10 @@ class A {
 }
 
 fun box(): String {
-    try {
-        A().litlit()
-        A().funfun()
-        A().litfun()
-        A().funlit()
-    }
-    catch(f: Fail) {
-        if (!f.isFail) throw f
-        return f.message
-    }
+    A().litlit()
+    A().funfun()
+    A().litfun()
+    A().funlit()
 
     return "OK"
 }

js/js.translator/testData/closure/cases/closureLambdaVarInLambda.kt

@@ -2,10 +2,6 @@
 
 package foo
 
-fun assertEquals<T>(expected: T, actual: T) {
-    if (expected != actual) throw Exception("expected = $expected, actual = $actual")
-}
-
 fun box(): String {
     var foo = { 1 }
     var bar = 1

js/js.translator/testData/closure/cases/closureReceiverInLocalExtFunByLocalExtFun.kt

@@ -1,9 +1,5 @@
 package foo
 
-fun assertEquals<T>(expected: T, actual: T, message: String) {
-    if (expected != actual) throw Exception("Failed when $message, expected = $expected, actual = $actual")
-}
-
 // workaround for Rhino
 var n = 0
 class A {

js/js.translator/testData/closure/cases/closureThisAndReceiver.kt

@@ -17,10 +17,6 @@ class A(val a: String) {
     }
 }
 
-fun assertEquals(expected: String, actual: String) {
-    if (expected != actual) throw Exception("Expected: $expected, actual: $actual")
-}
-
 fun box(): String {
     val a = A("a")
     val b = A("b")

js/js.translator/testData/closure/cases/closureThisByUsingMethodFromParentClass.kt

@@ -48,10 +48,6 @@ fun box(): String {
 
 // Helpers
 
-fun assertEquals<T>(expected: T, actual: T) {
-    if (expected != actual) throw Exception("expected: $expected, actual: $actual");
-}
-
 native
 fun String.replace(regexp: RegExp, replacement: String): String = noImpl
 

js/js.translator/testData/closure/cases/recursiveExtFunction.kt

@@ -8,10 +8,6 @@ fun Int.foo(a: Int): Int {
     return a
 }
 
-fun assertEquals<T>(expected: T, actual: T) {
-    if (expected != actual) throw Exception("expected: $expected, actual, $actual")
-}
-
 fun box(): String {
     assertEquals(34, 23.foo(0))