Fix KCallable#callBy to JvmStatic companion object members
#KT-12915 Fixed
This commit is contained in:
@@ -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"
|
||||
}
|
||||
+34
@@ -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"
|
||||
}
|
||||
@@ -11259,6 +11259,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
||||
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection/callBy"), Pattern.compile("^(.+)\\.kt$"), true);
|
||||
}
|
||||
|
||||
@TestMetadata("companionObject.kt")
|
||||
public void testCompanionObject() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/callBy/companionObject.kt");
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("defaultAndNonDefaultIntertwined.kt")
|
||||
public void testDefaultAndNonDefaultIntertwined() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/callBy/defaultAndNonDefaultIntertwined.kt");
|
||||
@@ -11271,6 +11277,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("jvmStaticInCompanionObject.kt")
|
||||
public void testJvmStaticInCompanionObject() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/callBy/jvmStaticInCompanionObject.kt");
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("jvmStaticInObject.kt")
|
||||
public void testJvmStaticInObject() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/callBy/jvmStaticInObject.kt");
|
||||
|
||||
Reference in New Issue
Block a user