Fix reflection-related codegen tests on JDK 9+

In JDK 9, Class.simpleName changed behavior for local/anonymous Kotlin
classes (see KT-23072), this is why we now check for both variants of
the name in tests. Also, the format of annotation arguments changed a
little, where float parameters no longer have the trailing "f", and
class literals are rendered with ".class" at the end
This commit is contained in:
Alexander Udalov
2019-01-21 19:03:08 +01:00
parent 795f9d83e1
commit 38fd2b9ed6
5 changed files with 24 additions and 14 deletions
@@ -12,10 +12,15 @@ fun test(s: S) {
val localKClass = Local::class val localKClass = Local::class
val localJClass = localKClass.java val localJClass = localKClass.java
assertEquals("test\$Local", localKClass.simpleName) val kName = localKClass.simpleName
// See https://youtrack.jetbrains.com/issue/KT-29413
// assertEquals("Local", kName)
if (kName != "Local" && kName != "test\$Local") throw AssertionError("Fail KClass: $kName")
assertTrue { localJClass.isLocalClass } assertTrue { localJClass.isLocalClass }
assertEquals("test\$Local", localJClass.simpleName)
val jName = localJClass.simpleName
if (jName != "Local" && jName != "test\$Local") throw AssertionError("Fail java.lang.Class: $jName")
} }
fun box(): String { fun box(): String {
@@ -2,6 +2,7 @@
// WITH_REFLECT // WITH_REFLECT
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertTrue
annotation class Anno(@get:JvmName("uglyJvmName") val value: String) annotation class Anno(@get:JvmName("uglyJvmName") val value: String)
@@ -17,11 +18,11 @@ fun bar() {}
fun box(): String { fun box(): String {
val f = Foo::class.annotations.single() val f = Foo::class.annotations.single()
assertEquals("@Anno(uglyJvmName=OK)", f.toString()) assertTrue("@Anno\\(uglyJvmName=\"?OK\"?\\)".toRegex().matches(f.toString()))
assertEquals("OK", (f as Anno).value) assertEquals("OK", (f as Anno).value)
val b = ::bar.annotations.single() val b = ::bar.annotations.single()
assertEquals("@Meta(anno=@Anno(uglyJvmName=OK))", b.toString()) assertEquals("@Meta(anno=$f)", b.toString())
assertEquals("OK", (b as Meta).anno.value) assertEquals("OK", (b as Meta).anno.value)
return "OK" return "OK"
@@ -12,7 +12,7 @@ public @interface Anno {
// FILE: test.kt // FILE: test.kt
import kotlin.test.assertEquals import kotlin.test.assertTrue
class C { class C {
@Anno @Anno
@@ -23,7 +23,7 @@ class C {
} }
fun box(): String { fun box(): String {
assertEquals("[@Anno(value=void)]", C::f1.annotations.toString()) assertTrue("\\[@Anno\\(value=void(\\.class)?\\)\\]".toRegex().matches(C::f1.annotations.toString()))
assertEquals("[@Anno(value=class java.lang.Void)]", C::f2.annotations.toString()) assertTrue("\\[@Anno\\(value=(class )?java.lang.Void(\\.class)?\\)\\]".toRegex().matches(C::f2.annotations.toString()))
return "OK" return "OK"
} }
@@ -7,6 +7,7 @@
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertNotEquals import kotlin.test.assertNotEquals
import kotlin.test.assertTrue
annotation class D(val d: Double) annotation class D(val d: Double)
annotation class F(val f: Float) annotation class F(val f: Float)
@@ -30,11 +31,14 @@ fun fMinusZero() {}
@F(+0.0f) @F(+0.0f)
fun fPlusZero() {} fun fPlusZero() {}
fun check(x: Any, y: Any) { fun check(x: Any, y: Any, regexString: String) {
assertEquals(x, y) assertEquals(x, y)
assertEquals(y, x) assertEquals(y, x)
assertEquals(x.hashCode(), y.hashCode()) assertEquals(x.hashCode(), y.hashCode())
assertEquals(x.toString(), y.toString())
val regex = regexString.toRegex()
assertTrue(regex.matches(x.toString()))
assertTrue(regex.matches(y.toString()))
} }
fun checkNot(x: Any, y: Any) { fun checkNot(x: Any, y: Any) {
@@ -54,10 +58,10 @@ fun box(): String {
val dpz = D::class.constructors.single().call(+0.0) val dpz = D::class.constructors.single().call(+0.0)
val fmz = F::class.constructors.single().call(-0.0f) val fmz = F::class.constructors.single().call(-0.0f)
val fpz = F::class.constructors.single().call(+0.0f) val fpz = F::class.constructors.single().call(+0.0f)
check(::dMinusZero.annotations.single() as D, dmz) check(::dMinusZero.annotations.single() as D, dmz, "@D\\(d=-0.0\\)")
check(::dPlusZero.annotations.single() as D, dpz) check(::dPlusZero.annotations.single() as D, dpz, "@D\\(d=0.0\\)")
check(::fMinusZero.annotations.single() as F, fmz) check(::fMinusZero.annotations.single() as F, fmz, "@F\\(f=-0.0f?\\)")
check(::fPlusZero.annotations.single() as F, fpz) check(::fPlusZero.annotations.single() as F, fpz, "@F\\(f=0.0f?\\)")
checkNot(dmz, dpz) checkNot(dmz, dpz)
checkNot(fmz, fpz) checkNot(fmz, fpz)
@@ -8,7 +8,7 @@ fun box(): String {
class C class C
val name = C::class.java.getSimpleName() val name = C::class.java.getSimpleName()
if (name != "box\$C") return "Fail: $name" if (name != "box\$C" && name != "C") return "Fail: $name"
return "OK" return "OK"
} }