Fix KCallable#callBy to JvmStatic companion object members

#KT-12915 Fixed
This commit is contained in:
Alexander Udalov
2016-06-30 18:07:15 +03:00
parent e2bcdf8b9c
commit c07d0d48d3
4 changed files with 83 additions and 1 deletions
@@ -0,0 +1,31 @@
// WITH_REFLECT
import kotlin.test.assertEquals
class C {
companion object {
fun foo(a: String, b: String = "b") = a + b
}
}
fun box(): String {
val f = C.Companion::class.members.single { it.name == "foo" }
// Any object method currently requires the object instance passed
try {
f.callBy(mapOf(
f.parameters.single { it.name == "a" } to "a"
))
return "Fail: IllegalArgumentException should have been thrown"
}
catch (e: IllegalArgumentException) {
// OK
}
assertEquals("ab", f.callBy(mapOf(
f.parameters.first() to C,
f.parameters.single { it.name == "a" } to "a"
)))
return "OK"
}
@@ -0,0 +1,34 @@
// WITH_REFLECT
// KT-12915 IAE on callBy of JvmStatic function with default arguments
import kotlin.test.assertEquals
class C {
companion object {
@JvmStatic
fun foo(a: String, b: String = "b") = a + b
}
}
fun box(): String {
val f = C.Companion::class.members.single { it.name == "foo" }
// Any object method currently requires the object instance passed
try {
f.callBy(mapOf(
f.parameters.single { it.name == "a" } to "a"
))
return "Fail: IllegalArgumentException should have been thrown"
}
catch (e: IllegalArgumentException) {
// OK
}
assertEquals("ab", f.callBy(mapOf(
f.parameters.first() to C,
f.parameters.single { it.name == "a" } to "a"
)))
return "OK"
}