Minor, do not use ".java.kotlin" on KClass instances

This commit is contained in:
Alexander Udalov
2017-08-18 14:32:47 +03:00
parent ac1c7d9a6a
commit 593d6b7a95
9 changed files with 13 additions and 15 deletions
@@ -14,10 +14,10 @@ class A {
}
fun box(): String {
val p = A::class.java.kotlin.memberExtensionProperties.single()
val p = A::class.memberExtensionProperties.single()
return if ("$p" == "var A.(kotlin.String.)id: kotlin.String") "OK" else "Fail $p"
val q = A::class.java.kotlin.declaredFunctions.single()
val q = A::class.declaredFunctions.single()
if ("$q" != "fun A.(kotlin.Int.)foo(): kotlin.Double") return "Fail q $q"
return "OK"
@@ -9,7 +9,7 @@ import kotlin.reflect.jvm.*
class K(private val value: String)
fun box(): String {
val p = K::class.java.kotlin.memberProperties.single() as KProperty1<K, String>
val p = K::class.memberProperties.single() as KProperty1<K, String>
try {
return p.get(K("Fail: private property should not be accessible by default"))
@@ -11,10 +11,10 @@ open class Super(val r: String)
class Sub(r: String) : Super(r)
fun box(): String {
val props = Sub::class.java.kotlin.declaredMemberProperties
val props = Sub::class.declaredMemberProperties
if (!props.isEmpty()) return "Fail $props"
val allProps = Sub::class.java.kotlin.memberProperties
val allProps = Sub::class.memberProperties
assertEquals(listOf("r"), allProps.map { it.name })
return allProps.single().get(Sub("OK")) as String
}
@@ -17,7 +17,7 @@ class A {
}
fun box(): String {
val props = A::class.java.kotlin.memberExtensionProperties
val props = A::class.memberExtensionProperties
val readonly = props.single { it.name == "readonly" }
assert(readonly !is KMutableProperty2<A, *, *>) { "Fail 1: $readonly" }
val mutable = props.single { it.name == "mutable" }
@@ -10,7 +10,7 @@ class A(val readonly: String) {
}
fun box(): String {
val props = A::class.java.kotlin.memberProperties
val props = A::class.memberProperties
val readonly = props.single { it.name == "readonly" }
assert(readonly !is KMutableProperty1<A, *>) { "Fail 1: $readonly" }
val mutable = props.single { it.name == "mutable" }
@@ -32,7 +32,7 @@ fun box(): String {
if (prop == K::prop) return "Fail J::prop == K::prop (these are different properties)"
val klass = J::class.java.kotlin
val klass = J::class
if (klass.declaredMemberProperties.isNotEmpty()) return "Fail: declaredMemberProperties should be empty"
if (klass.declaredMemberExtensionProperties.isNotEmpty()) return "Fail: declaredMemberExtensionProperties should be empty"
@@ -12,13 +12,13 @@ class A {
fun box(): String {
run {
val foo: KProperty1<A, *> = A::class.java.kotlin.memberProperties.single()
val foo: KProperty1<A, *> = A::class.memberProperties.single()
assert(foo.name == "foo") { "Fail name: $foo (${foo.name})" }
assert(foo.get(A()) == "member") { "Fail value: ${foo.get(A())}" }
}
run {
val foo: KProperty2<A, *, *> = A::class.java.kotlin.memberExtensionProperties.single()
val foo: KProperty2<A, *, *> = A::class.memberExtensionProperties.single()
assert(foo.name == "foo") { "Fail name: $foo (${foo.name})" }
foo as KProperty2<A, Unit, *>
assert(foo.get(A(), Unit) == "extension") { "Fail value: ${foo.get(A(), Unit)}" }
@@ -16,9 +16,7 @@ class A(param: String) {
}
fun box(): String {
val klass = A::class.java.kotlin
val props = klass.memberProperties
val props = A::class.memberProperties
val names = props.map { it.name }.sorted()
assert(names == listOf("anyVar", "int", "string")) { "Fail names: $props" }