JS: move expressions test to box tests

js/js.translator/testData/box/expression/try/multipleCatchBlocks.kt

@@ -0,0 +1,41 @@
+package foo
+
+class UserException() : RuntimeException()
+
+fun bar(e: Exception): String {
+    var s: String = ""
+    var exceptionObject: Exception? = null
+
+    try {
+        throw e
+    }
+    catch (e: UserException) {
+        s = "UserException"
+        exceptionObject = e
+    }
+    catch (e: IllegalArgumentException) {
+        s = "IllegalArgumentException"
+        exceptionObject = e
+    }
+    catch (e: IllegalStateException) {
+        s = "IllegalStateException"
+        exceptionObject = e
+    }
+    catch (e: Exception) {
+        s = "Exception"
+        exceptionObject = e
+    }
+
+    assertEquals(e, exceptionObject, "e == exceptionObject")
+    return s
+}
+
+fun box(): String {
+
+    assertEquals("UserException", bar(UserException()))
+    assertEquals("IllegalArgumentException", bar(IllegalArgumentException()))
+    assertEquals("IllegalStateException", bar(IllegalStateException()))
+    assertEquals("Exception", bar(Exception()))
+
+    return "OK"
+}

js/js.translator/testData/box/expression/try/rethrowExceptionIfNotCaught.kt

@@ -0,0 +1,23 @@
+package foo
+
+fun catchSomeExceptions(e: Exception) {
+
+    try {
+        throw e
+    }
+    catch (e: NullPointerException) { }
+    catch(e: IllegalArgumentException) { }
+
+    fail("should not reach this point")
+}
+
+fun box(): String {
+
+    try {
+        catchSomeExceptions(RuntimeException())
+    } catch(e: RuntimeException) {
+        return "OK"
+    }
+
+    return "Not OK"
+}

js/js.translator/testData/box/expression/try/tryCatchCorrectForSubclasses.kt

@@ -0,0 +1,24 @@
+package foo
+
+open class Ex: Exception()
+
+class Ex1: Ex()
+
+fun box(): String {
+
+    var s: String = ""
+
+    try {
+        throw Ex1()
+    }
+    catch (e: Ex) {
+        s = "Ex"
+    }
+    catch (e: Ex1) {
+        throw Exception("Control flow cannot get here")
+    }
+
+    assertEquals("Ex", s)
+
+    return "OK"
+}

js/js.translator/testData/box/expression/try/tryCatchExpr.kt

@@ -0,0 +1,20 @@
+package foo
+
+fun box(): String {
+    var res = try { 10 } catch(e: Exception) { 20 }
+    assertEquals(10, res)
+
+    res = try { 10 } catch(e: Exception) { 20 } finally { 80 }
+    assertEquals(10, res)
+
+    res = try { 10; throw RuntimeException() } catch(e: Exception) { 20 }
+    assertEquals(20, res)
+
+    res = try { 10; throw RuntimeException() } catch(e: Exception) { 20 } finally { 100 }
+    assertEquals(20, res)
+
+    res = 50 + try { 10 } catch(e: Exception) { 20 }
+    assertEquals(60, res)
+
+    return "OK"
+}

js/js.translator/testData/box/expression/try/tryCatchExpressionWithMessage.kt

@@ -0,0 +1,57 @@
+package foo
+
+fun box(): String {
+
+    var s: String = ""
+
+    try {
+        throw Exception("Exception")
+    } catch (e: Throwable) {
+        s = "Throwable:" + e.message!!
+    }
+    assertEquals("Throwable:Exception", s)
+
+    s = ""
+    try {
+        throw Exception("Exception")
+    } catch (e: Exception) {
+        s = "Exception:" + e.message!!
+    }
+    assertEquals("Exception:Exception", s)
+
+    s = ""
+    try {
+        throw RuntimeException("RuntimeException")
+    } catch (e: Exception) {
+        s = "Exception:" + e.message!!
+    }
+    assertEquals("Exception:RuntimeException", s)
+
+    s = ""
+    try {
+        throw NullPointerException("NullPointerException")
+    } catch (e: Exception) {
+        s = "Exception:" + e.message!!
+    }
+    assertEquals("Exception:NullPointerException", s)
+
+    s = ""
+    try {
+        throw IndexOutOfBoundsException("IndexOutOfBoundsException")
+    } catch (e: NullPointerException) {
+        s = "NullPointerException:" + e.message!!
+    } catch (e: RuntimeException) {
+        s = "RuntimeException:" + e.message!!
+    } catch (e: Exception) {
+        s = "Exception:" + e.message!!
+    }
+    assertEquals("RuntimeException:IndexOutOfBoundsException", s)
+
+    try {
+        throw RuntimeException()
+    } catch (e: Exception) {
+        assertEquals(null, e.message)
+    }
+
+   return "OK"
+}

js/js.translator/testData/box/expression/try/tryCatchThrowable.kt

@@ -0,0 +1,15 @@
+package foo
+
+fun box(): String {
+
+    var s: String = ""
+
+    try {
+        throw Exception()
+    } catch (e: Throwable) {
+        s = "Throwable"
+    }
+    assertEquals("Throwable", s)
+
+    return "OK"
+}

js/js.translator/testData/box/expression/try/tryCatchWithDifferentParameterNames.kt

@@ -0,0 +1,29 @@
+package foo
+
+fun bar(e: Exception): String {
+    var s: String = ""
+    var exceptionObject: Exception? = null
+
+    try {
+        throw e
+    }
+    catch (e1: IllegalArgumentException) {
+        s = "IllegalArgumentException"
+        exceptionObject = e1
+    }
+    catch (e2: Exception) {
+        s = "Exception"
+        exceptionObject = e
+    }
+
+    assertEquals(e, exceptionObject, "e == exceptionObject")
+    return s
+}
+
+fun box(): String {
+
+    assertEquals("IllegalArgumentException", bar(IllegalArgumentException()))
+    assertEquals("Exception", bar(Exception()))
+
+    return "OK"
+}