Fix deprecations in testData: BlackBoxWithStdLibCodegenTest

This commit is contained in:
Ilya Gorbunov
2015-09-15 18:28:32 +03:00
parent 74e1dbff76
commit 9c974b6c5c
36 changed files with 109 additions and 109 deletions
@@ -1,7 +1,7 @@
import kotlin.test.assertEquals
inline fun <reified T> copy(c: Collection<T>): Array<T> {
return c.copyToArray()
return c.toTypedArray()
}
fun box(): String {
@@ -5,7 +5,7 @@ inline fun<reified T> Array<Any>.filterIsInstance(): List<T> {
}
fun box(): String {
val src: Array<Any> = array(1,2,3.toDouble(), "abc", "cde")
val src: Array<Any> = arrayOf(1,2,3.toDouble(), "abc", "cde")
assertEquals(arrayListOf(1,2), src.filterIsInstance<Int>())
assertEquals(arrayListOf(3.0), src.filterIsInstance<Double>())
@@ -2,7 +2,7 @@ import kotlin.test.assertEquals
inline fun <reified T : Any, reified R : Any> foo(): Array<String> {
val x = object {
inline fun <reified T1 : Any, reified T : Any> bar(): Array<String> = array(
inline fun <reified T1 : Any, reified T : Any> bar(): Array<String> = arrayOf(
javaClass<T1>().getName(), javaClass<T>().getName(), javaClass<R>().getName()
)
fun f1() = bar<T, R>()
@@ -16,7 +16,7 @@ inline fun <reified T : Any, reified R : Any> foo(): Array<String> {
val x3 = x.f3()
val x4 = x.f4()
return array(
return arrayOf(
x1[0], x1[1], x1[2],
x2[0], x2[1], x2[2],
x3[0], x3[1], x3[2],
@@ -27,7 +27,7 @@ inline fun <reified T : Any, reified R : Any> foo(): Array<String> {
fun box(): String {
val result = foo<Double, Int>()
val expected = array(
val expected = arrayOf(
"java.lang.Double", "java.lang.Integer", "java.lang.Integer",
"java.lang.Integer", "java.lang.Double", "java.lang.Integer",
"java.lang.Boolean", "java.lang.Double", "java.lang.Integer",
@@ -11,13 +11,13 @@ inline fun <reified T, reified R> foo(): Array<A<*,*,*>> {
fun f4() = bar<T, Boolean>()
}
return array(x.f1(), x.f2(), x.f3(), x.f4())
return arrayOf(x.f1(), x.f2(), x.f3(), x.f4())
}
fun box(): String {
val result = foo<Double, Int>()
val expected = array(
val expected = arrayOf(
Triple("java.lang.Double", "java.lang.Integer", "java.lang.Integer"),
Triple("java.lang.Integer", "java.lang.Double", "java.lang.Integer"),
Triple("java.lang.Boolean", "java.lang.Double", "java.lang.Integer"),
+4 -4
View File
@@ -5,19 +5,19 @@ fun <T> foo(vararg a: T) = a.size()
inline fun <reified T> bar(a: Array<T>, block: () -> T): Array<T> {
assertEquals(4, foo(*a, block(), block()))
return array(*a, block(), block())
return arrayOf(*a, block(), block())
}
inline fun <reified T> empty() = array<T>()
inline fun <reified T> empty() = arrayOf<T>()
fun box(): String {
var i = 0
val a: Array<String> = bar(array("1", "2")) { i++; i.toString() }
val a: Array<String> = bar(arrayOf("1", "2")) { i++; i.toString() }
assertEquals("1234", a.join(""))
i = 0
val b: Array<Int> = bar(array(0, 1)) { i++ }
val b: Array<Int> = bar(arrayOf(0, 1)) { i++ }
assertEquals("0123", b.map { it.toString() }.join(""))
return "OK"
+2 -2
View File
@@ -5,10 +5,10 @@ fun <T> foo(vararg a: T) = a.size()
inline fun <reified T> bar(block: () -> T): Array<T> {
assertEquals(2, foo(block(), block()))
return array(block(), block(), block())
return arrayOf(block(), block(), block())
}
inline fun <reified T> empty() = array<T>()
inline fun <reified T> empty() = arrayOf<T>()
fun box(): String {
var i = 0