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
@@ -4,10 +4,10 @@ import kotlin.test.assertEquals
fun box(): String {
val f = J::foo
assertEquals(
listOf(javaClass<J>(), javaClass<IntArray>(), javaClass<Array<Any>>(), javaClass<Integer>()),
listOf(J::class.java, IntArray::class.java, Array<Any>::class.java, Integer::class.java),
f.parameters.map { it.type.javaType }
)
assertEquals(javaClass<String>(), f.returnType.javaType)
assertEquals(String::class.java, f.returnType.javaType)
assertEquals("01A2", f.call(J(0), intArrayOf(1), arrayOf("A"), 2))
@@ -5,7 +5,7 @@ import kotlin.test.*
fun box(): String {
val c = J::class.constructors.single()
assertFalse(c.isAccessible)
assertFailsWith(javaClass<IllegalCallableAccessException>()) { c.call("") }
assertFailsWith(IllegalCallableAccessException::class.java) { c.call("") }
c.isAccessible = true
assertTrue(c.isAccessible)
@@ -13,7 +13,7 @@ fun box(): String {
val m = J::class.members.single { it.name == "getResult" }
assertFalse(m.isAccessible)
assertFailsWith(javaClass<IllegalCallableAccessException>()) { m.call(j)!! }
assertFailsWith(IllegalCallableAccessException::class.java) { m.call(j)!! }
m.isAccessible = true
return m.call(j) as String
@@ -3,8 +3,8 @@ import kotlin.test.assertEquals
fun box(): String {
val f = J::foo
assertEquals(listOf(Integer.TYPE, javaClass<IntArray>(), javaClass<Array<Any>>()), f.parameters.map { it.type.javaType })
assertEquals(javaClass<String>(), f.returnType.javaType)
assertEquals(listOf(Integer.TYPE, IntArray::class.java, Array<Any>::class.java), f.parameters.map { it.type.javaType })
assertEquals(String::class.java, f.returnType.javaType)
assertEquals("01A", f.call(0, intArrayOf(1), arrayOf("A")))
@@ -6,7 +6,7 @@ fun box(): String {
assertEquals(listOf("equals", "hashCode", "member", "staticMethod", "toString"), J::class.functions.map { it.name }.sorted())
assertEquals(listOf("member", "staticMethod"), J::class.declaredFunctions.map { it.name }.sorted())
assertEquals(1, J::class.constructors.size())
assertEquals(1, J::class.constructors.size)
return "OK"
}
@@ -21,7 +21,7 @@ fun box(): String {
if (prop == K::prop) return "Fail J::prop == K::prop (these are different properties)"
val klass = javaClass<J>().kotlin
val klass = J::class.java.kotlin
if (klass.declaredMemberProperties.isNotEmpty()) return "Fail: declaredMemberProperties should be empty"
if (klass.declaredMemberExtensionProperties.isNotEmpty()) return "Fail: declaredMemberExtensionProperties should be empty"