From d83a35d898d206955432df3e436d4c7e3718dc7c Mon Sep 17 00:00:00 2001 From: Mikhail Bogdanov Date: Mon, 20 Apr 2020 16:53:06 +0200 Subject: [PATCH] Minor. Update test data to support Corretto JVM 11 --- .../codegen/box/external/jvmStaticExternal.kt | 6 ++++-- .../box/external/jvmStaticExternalPrivate.kt | 2 +- .../codegen/box/external/withDefaultArg.kt | 9 ++++++--- .../fullJdk/native/nativePropertyAccessors.kt | 16 ++++++++-------- .../codegen/box/fullJdk/native/topLevel.kt | 3 ++- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/compiler/testData/codegen/box/external/jvmStaticExternal.kt b/compiler/testData/codegen/box/external/jvmStaticExternal.kt index e3daa4a5f7a..bc22910e993 100644 --- a/compiler/testData/codegen/box/external/jvmStaticExternal.kt +++ b/compiler/testData/codegen/box/external/jvmStaticExternal.kt @@ -24,7 +24,8 @@ fun box(): String { return "Link error expected" } catch (e: java.lang.UnsatisfiedLinkError) { - if (e.message != "foo.WithNative.bar(JLjava/lang/String;)D") return "Fail 1: " + e.message + if (e.message != "foo.WithNative.bar(JLjava/lang/String;)D" && + e.message != "'double foo.WithNative.bar(long, java.lang.String)'") return "Fail 1: " + e.message } try { @@ -32,7 +33,8 @@ fun box(): String { return "Link error expected on object" } catch (e: java.lang.UnsatisfiedLinkError) { - if (e.message != "foo.ObjWithNative.bar(JLjava/lang/String;)D") return "Fail 2: " + e.message + if (e.message != "foo.ObjWithNative.bar(JLjava/lang/String;)D" && + e.message != "'double foo.ObjWithNative.bar(long, java.lang.String)'") return "Fail 2: " + e.message } return "OK" } diff --git a/compiler/testData/codegen/box/external/jvmStaticExternalPrivate.kt b/compiler/testData/codegen/box/external/jvmStaticExternalPrivate.kt index 58f8dd2d9bd..0e7273e2d07 100644 --- a/compiler/testData/codegen/box/external/jvmStaticExternalPrivate.kt +++ b/compiler/testData/codegen/box/external/jvmStaticExternalPrivate.kt @@ -21,7 +21,7 @@ fun box(): String { return "Link error expected" } catch (e: java.lang.UnsatisfiedLinkError) { - if (e.message != "C.foo()V") return "Fail 1: " + e.message + if (e.message != "C.foo()V" && e.message != "'void C.foo()'") return "Fail 1: " + e.message } return "OK" diff --git a/compiler/testData/codegen/box/external/withDefaultArg.kt b/compiler/testData/codegen/box/external/withDefaultArg.kt index e806d8a624a..8292dea4ff7 100644 --- a/compiler/testData/codegen/box/external/withDefaultArg.kt +++ b/compiler/testData/codegen/box/external/withDefaultArg.kt @@ -22,7 +22,8 @@ fun box(): String { return "Link error expected on object" } catch (e: java.lang.UnsatisfiedLinkError) { - if (e.message != "foo.ObjWithNative.bar(JLjava/lang/String;)D") return "Fail 1: " + e.message + if (e.message != "foo.ObjWithNative.bar(JLjava/lang/String;)D" && + e.message != "'double foo.ObjWithNative.bar(long, java.lang.String)'") return "Fail 1: " + e.message } try { @@ -30,7 +31,8 @@ fun box(): String { return "Link error expected on object" } catch (e: java.lang.UnsatisfiedLinkError) { - if (e.message != "foo.ObjWithNative.foo(I)D") return "Fail 2: " + e.message + if (e.message != "foo.ObjWithNative.foo(I)D" && + e.message != "'double foo.ObjWithNative.foo(int)'") return "Fail 2: " + e.message } try { @@ -38,7 +40,8 @@ fun box(): String { return "Link error expected on object" } catch (e: java.lang.UnsatisfiedLinkError) { - if (e.message != "foo.WithDefaultArgKt.topLevel(I)D") return "Fail 3: " + e.message + if (e.message != "foo.WithDefaultArgKt.topLevel(I)D" && + e.message != "'double foo.WithDefaultArgKt.topLevel(int)'") return "Fail 3: " + e.message } return "OK" } diff --git a/compiler/testData/codegen/box/fullJdk/native/nativePropertyAccessors.kt b/compiler/testData/codegen/box/fullJdk/native/nativePropertyAccessors.kt index 3892e060b42..efe6d0c7ff6 100644 --- a/compiler/testData/codegen/box/fullJdk/native/nativePropertyAccessors.kt +++ b/compiler/testData/codegen/box/fullJdk/native/nativePropertyAccessors.kt @@ -29,27 +29,27 @@ var defaultSetter: Int = 1 external get external set -fun check(body: () -> Unit, signature: String): String? { +fun check(body: () -> Unit, signature: String, jdk11Signature: String): String? { try { body() return "Link error expected" } catch (e: java.lang.UnsatisfiedLinkError) { - if (e.message != signature) return "Fail $signature: " + e.message + if (e.message != signature && e.message != jdk11Signature) return "Fail $signature: " + e.message } return null } fun box(): String { - return check({defaultGetter}, "NativePropertyAccessorsKt.getDefaultGetter()I") - ?: check({defaultSetter = 1}, "NativePropertyAccessorsKt.setDefaultSetter(I)V") + return check({defaultGetter}, "NativePropertyAccessorsKt.getDefaultGetter()I", "'int NativePropertyAccessorsKt.getDefaultGetter()'") + ?: check({defaultSetter = 1}, "NativePropertyAccessorsKt.setDefaultSetter(I)V", "'void NativePropertyAccessorsKt.setDefaultSetter(int)'") - ?: check({C.defaultGetter}, "C\$Companion.getDefaultGetter()I") - ?: check({C.defaultSetter = 1}, "C\$Companion.setDefaultSetter(I)V") + ?: check({C.defaultGetter}, "C\$Companion.getDefaultGetter()I", "'int C\$Companion.getDefaultGetter()'") + ?: check({C.defaultSetter = 1}, "C\$Companion.setDefaultSetter(I)V", "'void C\$Companion.setDefaultSetter(int)'") - ?: check({C().defaultGetter}, "C.getDefaultGetter()I") - ?: check({C().defaultSetter = 1}, "C.setDefaultSetter(I)V") + ?: check({C().defaultGetter}, "C.getDefaultGetter()I", "'int C.getDefaultGetter()'") + ?: check({C().defaultSetter = 1}, "C.setDefaultSetter(I)V", "'void C.setDefaultSetter(int)'") ?: "OK" } diff --git a/compiler/testData/codegen/box/fullJdk/native/topLevel.kt b/compiler/testData/codegen/box/fullJdk/native/topLevel.kt index 8ca5223ada7..0e8d67b7914 100644 --- a/compiler/testData/codegen/box/fullJdk/native/topLevel.kt +++ b/compiler/testData/codegen/box/fullJdk/native/topLevel.kt @@ -15,7 +15,8 @@ fun box(): String { return "Link error expected on object" } catch (e: java.lang.UnsatisfiedLinkError) { - if (e.message != "foo.TopLevelKt.bar(JLjava/lang/String;)D") return "Fail 1: " + e.message + if (e.message != "foo.TopLevelKt.bar(JLjava/lang/String;)D" && + e.message != "'double foo.TopLevelKt.bar(long, java.lang.String)'") return "Fail 1: " + e.message } return "OK"