From 8890ae10d4d988b0335a0b49e4dc0f5bc1ebc9e7 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Fri, 10 Jul 2020 20:01:22 +0700 Subject: [PATCH] Add test on signatures with nullable abbreviated types Currently test fails, see KT-40199 --- .../commonized/common/package_root.kt | 5 +++++ .../commonized/js/package_root.kt | 3 +++ .../commonized/jvm/package_root.kt | 3 +++ .../original/js/package_root.kt | 5 +++++ .../original/jvm/package_root.kt | 5 +++++ .../commonizer/FunctionCommonizationFromSourcesTest.kt | 2 ++ 6 files changed, 23 insertions(+) create mode 100644 native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/commonized/common/package_root.kt create mode 100644 native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/commonized/js/package_root.kt create mode 100644 native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/commonized/jvm/package_root.kt create mode 100644 native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/original/js/package_root.kt create mode 100644 native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/original/jvm/package_root.kt diff --git a/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/commonized/common/package_root.kt b/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/commonized/common/package_root.kt new file mode 100644 index 00000000000..c4efae94909 --- /dev/null +++ b/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/commonized/common/package_root.kt @@ -0,0 +1,5 @@ +expect class Foo() + +typealias TypeAlias = Foo + +expect fun bar(x: TypeAlias?) \ No newline at end of file diff --git a/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/commonized/js/package_root.kt b/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/commonized/js/package_root.kt new file mode 100644 index 00000000000..eab6a1203c8 --- /dev/null +++ b/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/commonized/js/package_root.kt @@ -0,0 +1,3 @@ +actual class Foo actual constructor() + +actual fun bar(x: TypeAlias?) { } \ No newline at end of file diff --git a/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/commonized/jvm/package_root.kt b/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/commonized/jvm/package_root.kt new file mode 100644 index 00000000000..eab6a1203c8 --- /dev/null +++ b/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/commonized/jvm/package_root.kt @@ -0,0 +1,3 @@ +actual class Foo actual constructor() + +actual fun bar(x: TypeAlias?) { } \ No newline at end of file diff --git a/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/original/js/package_root.kt b/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/original/js/package_root.kt new file mode 100644 index 00000000000..99ff5d3cd74 --- /dev/null +++ b/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/original/js/package_root.kt @@ -0,0 +1,5 @@ +class Foo + +typealias TypeAlias = Foo + +fun bar(x: TypeAlias?) { } \ No newline at end of file diff --git a/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/original/jvm/package_root.kt b/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/original/jvm/package_root.kt new file mode 100644 index 00000000000..99ff5d3cd74 --- /dev/null +++ b/native/commonizer/testData/functionCommonization/signaturesWithNullableTypealiases/original/jvm/package_root.kt @@ -0,0 +1,5 @@ +class Foo + +typealias TypeAlias = Foo + +fun bar(x: TypeAlias?) { } \ No newline at end of file diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/FunctionCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/FunctionCommonizationFromSourcesTest.kt index a3469857839..5cf962495e2 100644 --- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/FunctionCommonizationFromSourcesTest.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/FunctionCommonizationFromSourcesTest.kt @@ -15,4 +15,6 @@ class FunctionCommonizationFromSourcesTest : AbstractCommonizationFromSourcesTes fun testAnnotations() = doTestSuccessfulCommonization() fun testSpecifics() = doTestSuccessfulCommonization() + + fun testSignaturesWithNullableTypealiases() = doTestSuccessfulCommonization() }