From 76214930da3d6dc6548ab0aaed1f0017ba86c0ec Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 10 Aug 2018 18:17:53 +0200 Subject: [PATCH] Update generic signatures in codegen test data The implementation of toString for generic types in Java reflection has been changed in 8u162 (https://bugs.openjdk.java.net/browse/JDK-8054213) --- .../genericSignature/signatureOfDeepGenericInner.kt | 5 +++-- .../box/reflection/genericSignature/signatureOfDeepInner.kt | 5 +++-- .../genericSignature/signatureOfDeepInnerLastGeneric.kt | 5 +++-- .../genericSignature/signatureOfGenericInnerGenericOuter.kt | 5 +++-- .../genericSignature/signatureOfGenericInnerSimpleOuter.kt | 5 +++-- compiler/testData/codegen/boxAgainstJava/sam/kt11519.kt | 2 +- .../codegen/boxAgainstJava/sam/kt11519Constructor.kt | 2 +- .../boxAgainstJava/sam/samConstructorGenericSignature.kt | 2 +- 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepGenericInner.kt b/compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepGenericInner.kt index 8fb43f52973..d0c53c9b7a5 100644 --- a/compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepGenericInner.kt +++ b/compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepGenericInner.kt @@ -17,8 +17,9 @@ abstract class Outer { fun box(): String { kotlin.test.assertEquals( - "Outer\$FirstInner.Outer\$FirstInner\$SecondInner.ThirdInnner.FourthInner", - Outer.FirstInner.SecondInner.ThirdInnner::class.java.declaredMethods.single().genericReturnType.toString()) + "Outer\$FirstInner\$SecondInner\$ThirdInnner\$FourthInner", + Outer.FirstInner.SecondInner.ThirdInnner::class.java.declaredMethods.single().genericReturnType.toString() + ) return "OK" } diff --git a/compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepInner.kt b/compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepInner.kt index 71f30f4bd6d..203262c67d4 100644 --- a/compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepInner.kt +++ b/compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepInner.kt @@ -17,7 +17,8 @@ abstract class Outer { fun box(): String { kotlin.test.assertEquals( - "Outer\$FirstInner.Outer\$FirstInner\$SecondInner.ThirdInnner.FourthInner", - Outer.FirstInner.SecondInner.ThirdInnner::class.java.declaredMethods.single().genericReturnType.toString()) + "Outer\$FirstInner\$SecondInner\$ThirdInnner\$FourthInner", + Outer.FirstInner.SecondInner.ThirdInnner::class.java.declaredMethods.single().genericReturnType.toString() + ) return "OK" } diff --git a/compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepInnerLastGeneric.kt b/compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepInnerLastGeneric.kt index 01fc17a1799..bb7a56afc82 100644 --- a/compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepInnerLastGeneric.kt +++ b/compiler/testData/codegen/box/reflection/genericSignature/signatureOfDeepInnerLastGeneric.kt @@ -17,8 +17,9 @@ abstract class Outer { fun box(): String { kotlin.test.assertEquals( - "Outer\$FirstInner\$SecondInner\$ThirdInnner.Outer\$FirstInner\$SecondInner\$ThirdInnner\$FourthInner", - Outer.FirstInner.SecondInner.ThirdInnner::class.java.declaredMethods.single().genericReturnType.toString()) + "Outer\$FirstInner\$SecondInner\$ThirdInnner\$FourthInner", + Outer.FirstInner.SecondInner.ThirdInnner::class.java.declaredMethods.single().genericReturnType.toString() + ) return "OK" } diff --git a/compiler/testData/codegen/box/reflection/genericSignature/signatureOfGenericInnerGenericOuter.kt b/compiler/testData/codegen/box/reflection/genericSignature/signatureOfGenericInnerGenericOuter.kt index edcfab4190f..4632a99ba25 100644 --- a/compiler/testData/codegen/box/reflection/genericSignature/signatureOfGenericInnerGenericOuter.kt +++ b/compiler/testData/codegen/box/reflection/genericSignature/signatureOfGenericInnerGenericOuter.kt @@ -9,8 +9,9 @@ abstract class Outer { fun box(): String { kotlin.test.assertEquals( - "Outer.Inner", - Outer::class.java.declaredMethods.single().genericReturnType.toString()) + "Outer\$Inner", + Outer::class.java.declaredMethods.single().genericReturnType.toString() + ) return "OK" } \ No newline at end of file diff --git a/compiler/testData/codegen/box/reflection/genericSignature/signatureOfGenericInnerSimpleOuter.kt b/compiler/testData/codegen/box/reflection/genericSignature/signatureOfGenericInnerSimpleOuter.kt index 4c7251128c1..91c8e5fbf6a 100644 --- a/compiler/testData/codegen/box/reflection/genericSignature/signatureOfGenericInnerSimpleOuter.kt +++ b/compiler/testData/codegen/box/reflection/genericSignature/signatureOfGenericInnerSimpleOuter.kt @@ -9,8 +9,9 @@ abstract class Outer { fun box(): String { kotlin.test.assertEquals( - "Outer.Outer\$Inner", - Outer::class.java.declaredMethods.single().genericReturnType.toString()) + "Outer\$Inner", + Outer::class.java.declaredMethods.single().genericReturnType.toString() + ) return "OK" } \ No newline at end of file diff --git a/compiler/testData/codegen/boxAgainstJava/sam/kt11519.kt b/compiler/testData/codegen/boxAgainstJava/sam/kt11519.kt index f2fa11cb6a9..26d513e9c46 100644 --- a/compiler/testData/codegen/boxAgainstJava/sam/kt11519.kt +++ b/compiler/testData/codegen/boxAgainstJava/sam/kt11519.kt @@ -32,7 +32,7 @@ fun box(): String { } val superInterfaces = Arrays.toString((Class.forName("_1Kt\$box$1")).genericInterfaces) - if (superInterfaces != "[Custom.Custom\$MBiConsumer]") { + if (superInterfaces != "[Custom\$MBiConsumer]") { return "fail: $superInterfaces" } diff --git a/compiler/testData/codegen/boxAgainstJava/sam/kt11519Constructor.kt b/compiler/testData/codegen/boxAgainstJava/sam/kt11519Constructor.kt index de01819407e..78bcddb3b07 100644 --- a/compiler/testData/codegen/boxAgainstJava/sam/kt11519Constructor.kt +++ b/compiler/testData/codegen/boxAgainstJava/sam/kt11519Constructor.kt @@ -32,7 +32,7 @@ fun box(): String { }) val superInterfaces = Arrays.toString((Class.forName("_1Kt\$box$1")).genericInterfaces) - if (superInterfaces != "[Custom.Custom\$MBiConsumer]") { + if (superInterfaces != "[Custom\$MBiConsumer]") { return "fail: $superInterfaces" } diff --git a/compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt b/compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt index e9325ceecfc..11266290356 100644 --- a/compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt +++ b/compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt @@ -18,6 +18,6 @@ import java.util.Arrays fun box(): String { val r: JavaClass.Computable = JavaClass.Computable { "OK" } val supertypes = Arrays.toString(r.javaClass.getGenericInterfaces()) - if (supertypes != "[JavaClass.JavaClass\$Computable]") return "Fail: $supertypes" + if (supertypes != "[JavaClass\$Computable]") return "Fail: $supertypes" return JavaClass.compute(r)!! }