Fix codegen box tests for language version 1.4
Since API version 1.4, NullPointerException is thrown for casts of null to any type instead of TypeCastException.
This commit is contained in:
+2
-2
@@ -17,14 +17,14 @@ fun box(): String {
|
||||
try {
|
||||
val (index, i) = JImpl().arrayOfNotNull().withIndex().first()
|
||||
return "Fail: should throw on get()"
|
||||
} catch (e: IllegalStateException) {}
|
||||
} catch (e: NullPointerException) {}
|
||||
|
||||
try {
|
||||
for ((index, i) in JImpl().arrayOfNotNull().withIndex()) {
|
||||
return "Fail: should throw on get() in loop header"
|
||||
}
|
||||
}
|
||||
catch (e: IllegalStateException) {}
|
||||
catch (e: NullPointerException) {}
|
||||
return "OK"
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -18,14 +18,14 @@ fun box(): String {
|
||||
try {
|
||||
val (index, i) = J.listOfNotNull().withIndex().first()
|
||||
return "Fail: should throw on get()"
|
||||
} catch (e: IllegalStateException) {}
|
||||
} catch (e: NullPointerException) {}
|
||||
|
||||
try {
|
||||
for ((index, i) in J.listOfNotNull().withIndex()) {
|
||||
return "Fail: should throw on get() in loop header"
|
||||
}
|
||||
}
|
||||
catch (e: IllegalStateException) {}
|
||||
catch (e: NullPointerException) {}
|
||||
return "OK"
|
||||
}
|
||||
|
||||
|
||||
compiler/testData/codegen/box/ranges/javaInterop/withIndex/javaIteratorOfNotNullWithIndexFailFast.kt
Vendored
+2
-2
@@ -18,14 +18,14 @@ fun box(): String {
|
||||
try {
|
||||
val (index, i) = J.iteratorOfNotNull().withIndex().next()
|
||||
return "Fail: should throw on get()"
|
||||
} catch (e: IllegalStateException) {}
|
||||
} catch (e: NullPointerException) {}
|
||||
|
||||
try {
|
||||
for ((index, i) in J.iteratorOfNotNull().withIndex()) {
|
||||
return "Fail: should throw on get() in loop header"
|
||||
}
|
||||
}
|
||||
catch (e: IllegalStateException) {}
|
||||
catch (e: NullPointerException) {}
|
||||
return "OK"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user