Fix deprecations in testData

This commit is contained in:
Ilya Gorbunov
2016-01-27 16:03:27 +03:00
parent eabac9dcf6
commit d49f5b95b0
15 changed files with 26 additions and 21 deletions
+1 -1
View File
@@ -32,7 +32,7 @@ val fns = arrayOf<Any>(::fn0, ::fn1, ::fn2, ::fn3, ::fn4, ::fn5, ::fn6, ::fn7, :
::fn20, ::fn21, ::fn22)
inline fun asFailsWithCCE(operation: String, crossinline block: () -> Unit) {
assertFailsWith(ClassCastException::class.java, "$operation should throw an exception") {
assertFailsWith(ClassCastException::class, "$operation should throw an exception") {
block()
}
}
@@ -36,7 +36,7 @@ inline fun <reified T> reifiedAsSucceeds(x: Any, operation: String) {
}
inline fun <reified T> reifiedAsFailsWithCCE(x: Any, operation: String) {
assertFailsWith(ClassCastException::class.java, "$operation should throw an exception") {
assertFailsWith(ClassCastException::class, "$operation should throw an exception") {
x as T
}
}
+5 -3
View File
@@ -1,5 +1,7 @@
import java.util.LinkedList
fun ok1(): Boolean {
val queue = linkedListOf(1, 2, 3)
val queue = LinkedList(listOf(1, 2, 3))
while (!queue.isEmpty()) {
queue.poll()
for (y in 1..3) {
@@ -12,7 +14,7 @@ fun ok1(): Boolean {
}
fun ok2(): Boolean {
val queue = linkedListOf(1, 2, 3)
val queue = LinkedList(listOf(1, 2, 3))
val array = arrayOf(1, 2, 3)
while (!queue.isEmpty()) {
queue.poll()
@@ -26,7 +28,7 @@ fun ok2(): Boolean {
}
fun ok3(): Boolean {
val queue = linkedListOf(1, 2, 3)
val queue = LinkedList(listOf(1, 2, 3))
while (!queue.isEmpty()) {
queue.poll()
var x = 0
@@ -7,10 +7,12 @@ World""");
}
fun box() : String {
// NOTE: Also tested in stdlib: LineIteratorTest.useLines
// TODO compiler error
// both these expressions causes java.lang.NoClassDefFoundError: collections/CollectionPackage
val list1 = sample().useLines{it.toArrayList()}
val list2 = sample().useLines<ArrayList<String>>{it.toArrayList()}
val list1 = sample().useLines { it.toList() }
val list2 = sample().useLines<ArrayList<String>>{ it.toCollection(arrayListOf()) }
if(arrayListOf("Hello", "World") != list1) return "fail"
if(arrayListOf("Hello", "World") != list2) return "fail"
@@ -24,7 +24,7 @@ fun box(): String {
return "Fail: no Kotlin function found for static bridge for @JvmStatic method in companion object C::foo"
assertEquals(3, k2.call(C, "ghi"))
assertFailsWith(NullPointerException::class.java) { k2.call(null, "")!! }
assertFailsWith(NullPointerException::class) { k2.call(null, "")!! }
val j2 = k2.javaMethod
assertEquals(j, j2)