Cleanup deprecated symbol usages in testData

This commit is contained in:
Ilya Gorbunov
2016-01-16 20:10:40 +03:00
parent eefbd72a64
commit 25c4453dc5
403 changed files with 933 additions and 921 deletions
@@ -10,7 +10,7 @@ class Project {
}
}
inline operator fun <reified T : Any> Project.getValue(t: Any?, p: KProperty<*>): T = getInstance(javaClass<T>())
inline operator fun <reified T : Any> Project.getValue(t: Any?, p: KProperty<*>): T = getInstance(T::class.java)
val project = Project()
val x1: Int by project
@@ -7,7 +7,7 @@ abstract class A {
inline fun<reified T : Any> foo(): A {
return object : A() {
override fun f(): String {
return javaClass<T>().getName()
return T::class.java.getName()
}
}
}
@@ -12,14 +12,14 @@ inline fun doWorkInline(block: () -> String) = block()
fun box(): String {
val x = object {
inline fun <reified T : Any> bar1(): A = object : A {
override fun f1(): String = javaClass<T>().getName()
override fun f2(): String = doWork { javaClass<T>().getName() }
override fun f3(): String = doWorkInline { javaClass<T>().getName() }
override fun f1(): String = T::class.java.getName()
override fun f2(): String = doWork { T::class.java.getName() }
override fun f3(): String = doWorkInline { T::class.java.getName() }
}
inline fun <reified T : Any> bar2() = javaClass<T>().getName()
inline fun <reified T : Any> bar3() = doWork { javaClass<T>().getName() }
inline fun <reified T : Any> bar4() = doWorkInline { javaClass<T>().getName() }
inline fun <reified T : Any> bar2() = T::class.java.getName()
inline fun <reified T : Any> bar3() = doWork { T::class.java.getName() }
inline fun <reified T : Any> bar4() = doWorkInline { T::class.java.getName() }
}
val y: A = x.bar1<String>()
@@ -1,6 +1,6 @@
import kotlin.test.assertEquals
inline fun <reified T : Any> foo(x: Class<T> = javaClass<T>()): String = x.getName()
inline fun <reified T : Any> foo(x: Class<T> = T::class.java): String = x.getName()
inline fun <reified R : Any> bar(x: R): String = foo<R>()
@@ -1,7 +1,7 @@
import kotlin.test.assertEquals
inline fun<reified T : Any> javaClassName(): String {
return javaClass<T>().getName()
return T::class.java.getName()
}
fun box(): String {
@@ -3,7 +3,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> = arrayOf(
javaClass<T1>().getName(), javaClass<T>().getName(), javaClass<R>().getName()
T1::class.java.getName(), T::class.java.getName(), R::class.java.getName()
)
fun f1() = bar<T, R>()
fun f2() = bar<R, T>()
@@ -2,10 +2,10 @@ import kotlin.test.assertEquals
fun foo(block: () -> String) = block()
inline fun<reified T : Any> bar1(x: T): String = foo() {
javaClass<T>().getName()
T::class.java.getName()
}
inline fun<reified T : Any> bar2(x: T, y: String): String = foo() {
javaClass<T>().getName() + "#" + y
T::class.java.getName() + "#" + y
}
fun box(): String {
@@ -3,10 +3,10 @@ import kotlin.test.assertEquals
fun foo(block: () -> String) = block()
inline fun<reified T : Any> bar1(): String = foo() {
javaClass<T>().getName()
T::class.java.getName()
}
inline fun<reified T : Any> bar2(y: String): String = foo() {
javaClass<T>().getName() + "#" + y
T::class.java.getName() + "#" + y
}
inline fun<T1, T2, reified R1 : Any, reified R2 : Any> bar3(y: String) =
@@ -9,7 +9,7 @@ interface A {
fun box(): String {
val x: A = object : A {
private inline fun <reified T : Any> localClassName(): String = javaClass<T>().getName()
private inline fun <reified T : Any> localClassName(): String = T::class.java.getName()
override fun f(): String = foo { localClassName<String>() }
override fun g(): String = foo { localClassName<Int>() }
}
@@ -2,7 +2,7 @@ import kotlin.test.assertEquals
fun foo(block: () -> String) = block()
inline fun <reified T : Any> className(): String = javaClass<T>().getName()
inline fun <reified T : Any> className(): String = T::class.java.getName()
inline fun <reified T : Any> lambdaShouldBeReified(): String = foo { className<T>() }
@@ -2,7 +2,7 @@ import kotlin.test.assertEquals
fun foo(block: () -> String) = block()
inline fun<reified T : Any> className(): String = javaClass<T>().getName()
inline fun<reified T : Any> className(): String = T::class.java.getName()
interface A {
fun f(): String
+1 -1
View File
@@ -1,6 +1,6 @@
import kotlin.test.assertEquals
fun <T> foo(vararg a: T) = a.size()
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()))
+2 -2
View File
@@ -1,6 +1,6 @@
import kotlin.test.assertEquals
fun <T> foo(vararg a: T) = a.size()
fun <T> foo(vararg a: T) = a.size
inline fun <reified T> bar(block: () -> T): Array<T> {
assertEquals(2, foo(block(), block()))
@@ -20,7 +20,7 @@ fun box(): String {
assertEquals("234", b.map { it.toString() }.joinToString(""))
val c: Array<String> = empty()
assertEquals(0, c.size())
assertEquals(0, c.size)
return "OK"
}