Minor. Revert workarounds for problem on KClass from annotation

See KT-9453 for clarification
This commit is contained in:
Denis Zharkov
2017-03-09 14:37:52 +03:00
parent 82d7a269ed
commit 52d11eb22b
4 changed files with 4 additions and 5 deletions
@@ -10,7 +10,7 @@ annotation class Anno(val klasses: Array<KClass<*>> = arrayOf(String::class, Int
fun box(): String {
val anno = Anno::class.constructors.single().callBy(emptyMap())
assertEquals(listOf(String::class, Int::class), (anno.klasses as Array<KClass<*>>).toList() /* TODO: KT-9453 */)
assertEquals(listOf(String::class, Int::class), anno.klasses.toList())
assertEquals("@Anno(klasses=[class java.lang.String, int])", anno.toString())
return "OK"
}
@@ -42,7 +42,7 @@ fun box(): String {
assertFails { create<TwoParamsOneDefault>(mapOf("s" to "Fail", "x" to "Fail")) }
val t5 = create<TwoParamsOneDefaultKClass>(mapOf("string" to "OK"))
assertEquals(Number::class, t5.klass as KClass<*> /* TODO: KT-9453 */)
assertEquals(Number::class, t5.klass)
assertFails("KClass (not Class) instances should be passed as arguments") {
create<TwoNonDefaults>(mapOf("klass" to String::class.java, "string" to "Fail"))
@@ -32,7 +32,7 @@ fun box(): String {
}
val k = create<TwoNonDefaults>("OK", Int::class)
assertEquals(Int::class, k.klass as KClass<*> /* TODO: KT-9453 */)
assertEquals(Int::class, k.klass)
return k.string
}