From 2a0076d9bd99efbba5ab7861451118be31187ec4 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 12 Aug 2016 20:21:35 +0300 Subject: [PATCH] Test data: replace Exception with Throwable (in those tests where particular exception type is not crucial in order not to rename tests to have runtime dependency added with exception typealiases). --- idea/testData/checker/FunctionReturnTypes.kt | 4 ++-- idea/testData/checker/ResolveToJava.kt | 2 +- idea/testData/checker/regression/DoubleDefine.kt | 6 +++--- idea/testData/highlighter/deprecated/RangeTo.kt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/idea/testData/checker/FunctionReturnTypes.kt b/idea/testData/checker/FunctionReturnTypes.kt index d116011232f..30e0e43b9a9 100644 --- a/idea/testData/checker/FunctionReturnTypes.kt +++ b/idea/testData/checker/FunctionReturnTypes.kt @@ -16,8 +16,8 @@ fun bbb() { fun foo(expr: StringBuilder): Int { val c = 'a' when(c) { - 0.toChar() -> throw Exception("zero") - else -> throw Exception("nonzero" + c) + 0.toChar() -> throw Throwable("zero") + else -> throw Throwable("nonzero" + c) } } diff --git a/idea/testData/checker/ResolveToJava.kt b/idea/testData/checker/ResolveToJava.kt index aa52f8b1cd9..7a4a76e7c07 100644 --- a/idea/testData/checker/ResolveToJava.kt +++ b/idea/testData/checker/ResolveToJava.kt @@ -34,7 +34,7 @@ fun test(l : List) { try { // ... } - catch(e: Exception) { + catch(e: Throwable) { System.out.println(e.message) } diff --git a/idea/testData/checker/regression/DoubleDefine.kt b/idea/testData/checker/regression/DoubleDefine.kt index df54af39bdc..6055272972a 100644 --- a/idea/testData/checker/regression/DoubleDefine.kt +++ b/idea/testData/checker/regression/DoubleDefine.kt @@ -9,15 +9,15 @@ fun takeFirst(expr: StringBuilder): Char { } fun evaluateArg(expr: CharSequence, numbers: ArrayList): Int { - if (expr.length == 0) throw Exception("Syntax error: Character expected"); + if (expr.length == 0) throw Throwable("Syntax error: Character expected"); val c = takeFirst(expr) if (c >= '0' && c <= '9') { val n = c - '0' - if (!numbers.contains(n)) throw Exception("You used incorrect number: " + n) + if (!numbers.contains(n)) throw Throwable("You used incorrect number: " + n) numbers.remove(n) return n } - throw Exception("Syntax error: Unrecognized character " + c) + throw Throwable("Syntax error: Unrecognized character " + c) } fun evaluateAdd(expr: StringBuilder, numbers: ArrayList): Int { diff --git a/idea/testData/highlighter/deprecated/RangeTo.kt b/idea/testData/highlighter/deprecated/RangeTo.kt index 500917c9e41..f346196f0de 100644 --- a/idea/testData/highlighter/deprecated/RangeTo.kt +++ b/idea/testData/highlighter/deprecated/RangeTo.kt @@ -4,7 +4,7 @@ class MyClass { @Deprecated("Use A instead") operator fun MyClass.rangeTo(i: MyClass): Iterable { i.i - throw Exception() + throw Throwable() } fun test() {