azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update generic signatures in codegen test data

Browse Source 
The implementation of toString for generic types in Java reflection has
been changed in 8u162 (https://bugs.openjdk.java.net/browse/JDK-8054213)
This commit is contained in:
Alexander Udalov
2018-08-10 18:17:53 +02:00
parent 9071b5cfa8
commit 76214930da
8 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepGenericInner.kt
Vendored
+3 -2
View File
@@ -17,8 +17,9 @@ abstract class Outer {
fun box(): String { fun box(): String {
kotlin.test.assertEquals( kotlin.test.assertEquals(
"Outer\$FirstInner.Outer\$FirstInner\$SecondInner<A>.ThirdInnner.FourthInner<C>", "Outer\$FirstInner\$SecondInner<A>\$ThirdInnner\$FourthInner<C>",
Outer.FirstInner.SecondInner.ThirdInnner::class.java.declaredMethods.single().genericReturnType.toString()) Outer.FirstInner.SecondInner.ThirdInnner::class.java.declaredMethods.single().genericReturnType.toString()
)
return "OK" return "OK"
} }
compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepInner.kt
Vendored
+3 -2
View File
@@ -17,7 +17,8 @@ abstract class Outer {
fun box(): String { fun box(): String {
kotlin.test.assertEquals( kotlin.test.assertEquals(
"Outer\$FirstInner.Outer\$FirstInner\$SecondInner<A>.ThirdInnner.FourthInner", "Outer\$FirstInner\$SecondInner<A>\$ThirdInnner\$FourthInner",
Outer.FirstInner.SecondInner.ThirdInnner::class.java.declaredMethods.single().genericReturnType.toString()) Outer.FirstInner.SecondInner.ThirdInnner::class.java.declaredMethods.single().genericReturnType.toString()
)
return "OK" return "OK"
} }
compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepInnerLastGeneric.kt
Vendored
+3 -2
View File
@@ -17,8 +17,9 @@ abstract class Outer {
fun box(): String { fun box(): String {
kotlin.test.assertEquals( kotlin.test.assertEquals(
"Outer\$FirstInner\$SecondInner\$ThirdInnner.Outer\$FirstInner\$SecondInner\$ThirdInnner\$FourthInner<B>", "Outer\$FirstInner\$SecondInner\$ThirdInnner\$FourthInner<B>",
Outer.FirstInner.SecondInner.ThirdInnner::class.java.declaredMethods.single().genericReturnType.toString()) Outer.FirstInner.SecondInner.ThirdInnner::class.java.declaredMethods.single().genericReturnType.toString()
)
return "OK" return "OK"
} }
compiler/testData/codegen/box/reflection/genericSignature/signatureOfGenericInnerGenericOuter.kt
Vendored
+3 -2
View File
@@ -9,8 +9,9 @@ abstract class Outer<S> {
fun box(): String { fun box(): String {
kotlin.test.assertEquals( kotlin.test.assertEquals(
"Outer<S>.Inner<R>", "Outer<S>\$Inner<R>",
Outer::class.java.declaredMethods.single().genericReturnType.toString()) Outer::class.java.declaredMethods.single().genericReturnType.toString()
)
return "OK" return "OK"
} }
compiler/testData/codegen/box/reflection/genericSignature/signatureOfGenericInnerSimpleOuter.kt
Vendored
+3 -2
View File
@@ -9,8 +9,9 @@ abstract class Outer {
fun box(): String { fun box(): String {
kotlin.test.assertEquals( kotlin.test.assertEquals(
"Outer.Outer\$Inner<R>", "Outer\$Inner<R>",
Outer::class.java.declaredMethods.single().genericReturnType.toString()) Outer::class.java.declaredMethods.single().genericReturnType.toString()
)
return "OK" return "OK"
} }
compiler/testData/codegen/boxAgainstJava/sam/kt11519.kt
Vendored
+1 -1
View File
@@ -32,7 +32,7 @@ fun box(): String {
} }
val superInterfaces = Arrays.toString((Class.forName("_1Kt\$box$1")).genericInterfaces) val superInterfaces = Arrays.toString((Class.forName("_1Kt\$box$1")).genericInterfaces)
if (superInterfaces != "[Custom.Custom\$MBiConsumer<java.lang.String, java.lang.String>]") { if (superInterfaces != "[Custom\$MBiConsumer<java.lang.String, java.lang.String>]") {
return "fail: $superInterfaces" return "fail: $superInterfaces"
} }
compiler/testData/codegen/boxAgainstJava/sam/kt11519Constructor.kt
Vendored
+1 -1
View File
@@ -32,7 +32,7 @@ fun box(): String {
}) })
val superInterfaces = Arrays.toString((Class.forName("_1Kt\$box$1")).genericInterfaces) val superInterfaces = Arrays.toString((Class.forName("_1Kt\$box$1")).genericInterfaces)
if (superInterfaces != "[Custom.Custom\$MBiConsumer<java.lang.String, java.lang.String>]") { if (superInterfaces != "[Custom\$MBiConsumer<java.lang.String, java.lang.String>]") {
return "fail: $superInterfaces" return "fail: $superInterfaces"
} }
compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt
Vendored
+1 -1
View File
@@ -18,6 +18,6 @@ import java.util.Arrays
fun box(): String { fun box(): String {
val r: JavaClass.Computable<String> = JavaClass.Computable { "OK" } val r: JavaClass.Computable<String> = JavaClass.Computable { "OK" }
val supertypes = Arrays.toString(r.javaClass.getGenericInterfaces()) val supertypes = Arrays.toString(r.javaClass.getGenericInterfaces())
if (supertypes != "[JavaClass.JavaClass\$Computable<java.lang.String>]") return "Fail: $supertypes" if (supertypes != "[JavaClass\$Computable<java.lang.String>]") return "Fail: $supertypes"
return JavaClass.compute(r)!! return JavaClass.compute(r)!!
} }