From 01f072bb7d9706ab26c2f2a7b34ba007853d83fd Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 14 Nov 2023 12:15:40 +0100 Subject: [PATCH] [KLIB] API 4 ABI: Add tests for public members of EEC --- .../klib/dump-abi/content/classifiers.kt | 19 ++++++++++++++++--- .../klib/dump-abi/content/classifiers.v1.txt | 4 +++- .../klib/dump-abi/content/classifiers.v2.txt | 4 +++- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/compiler/testData/klib/dump-abi/content/classifiers.kt b/compiler/testData/klib/dump-abi/content/classifiers.kt index 141ca2b16b2..943069d66df 100644 --- a/compiler/testData/klib/dump-abi/content/classifiers.kt +++ b/compiler/testData/klib/dump-abi/content/classifiers.kt @@ -38,11 +38,24 @@ enum class EnumClassWithoutEntryClasses { } enum class EnumClassWithEntryClasses { - FOO_HAS_CLASS { override fun function() = "" }, + FOO_HAS_CLASS { + override val overriddenProperty get() = "" + override fun overriddenFunction() = "" + val fooOwnProperty get() = "" + fun fooOwnFunction() = "" + inner class FooInner + }, BAR_NO_CLASS, - BAZ_HAS_CLASS { override fun function() = "" }; + BAZ_HAS_CLASS { + override val overriddenProperty get() = "" + override fun overriddenFunction() = "" + val bazOwnProperty get() = "" + fun bazOwnFunction() = "" + inner class BazInner + }; - open fun function(): String = "" + open val overriddenProperty: String get() = "" + open fun overriddenFunction(): String = "" } class CompanionHolder1 { diff --git a/compiler/testData/klib/dump-abi/content/classifiers.v1.txt b/compiler/testData/klib/dump-abi/content/classifiers.v1.txt index 02db7dcc412..bb901322428 100644 --- a/compiler/testData/klib/dump-abi/content/classifiers.v1.txt +++ b/compiler/testData/klib/dump-abi/content/classifiers.v1.txt @@ -39,7 +39,9 @@ final class classifiers.test/DataClass { // classifiers.test/DataClass|null[0] open enum class classifiers.test/EnumClassWithEntryClasses : kotlin/Enum { // classifiers.test/EnumClassWithEntryClasses|null[0] final val entries // classifiers.test/EnumClassWithEntryClasses.entries|-5134227801081826149[0] final fun (): kotlin.enums/EnumEntries // classifiers.test/EnumClassWithEntryClasses.entries.|-6068527377476727729[0] - open fun function(): kotlin/String // classifiers.test/EnumClassWithEntryClasses.function|-3322893411126713785[0] + open val overriddenProperty // classifiers.test/EnumClassWithEntryClasses.overriddenProperty|-1390063372067425061[0] + open fun (): kotlin/String // classifiers.test/EnumClassWithEntryClasses.overriddenProperty.|-1250606083650652899[0] + open fun overriddenFunction(): kotlin/String // classifiers.test/EnumClassWithEntryClasses.overriddenFunction|6590605551359912218[0] final fun valueOf(kotlin/String): classifiers.test/EnumClassWithEntryClasses // classifiers.test/EnumClassWithEntryClasses.valueOf|-4683474617854611729[0] final fun values(): kotlin/Array // classifiers.test/EnumClassWithEntryClasses.values|-8715569000920726747[0] enum entry BAR_NO_CLASS // classifiers.test/EnumClassWithEntryClasses.BAR_NO_CLASS|null[0] diff --git a/compiler/testData/klib/dump-abi/content/classifiers.v2.txt b/compiler/testData/klib/dump-abi/content/classifiers.v2.txt index 5f5afd2884b..f0b1be88789 100644 --- a/compiler/testData/klib/dump-abi/content/classifiers.v2.txt +++ b/compiler/testData/klib/dump-abi/content/classifiers.v2.txt @@ -39,7 +39,9 @@ final class classifiers.test/DataClass { // classifiers.test/DataClass|null[0] open enum class classifiers.test/EnumClassWithEntryClasses : kotlin/Enum { // classifiers.test/EnumClassWithEntryClasses|null[0] final val entries // classifiers.test/EnumClassWithEntryClasses.entries|#static{}entries[0] final fun (): kotlin.enums/EnumEntries // classifiers.test/EnumClassWithEntryClasses.entries.|#static(){}[0] - open fun function(): kotlin/String // classifiers.test/EnumClassWithEntryClasses.function|function(){}[0] + open val overriddenProperty // classifiers.test/EnumClassWithEntryClasses.overriddenProperty|(){}[0] + open fun (): kotlin/String // classifiers.test/EnumClassWithEntryClasses.overriddenProperty.|(){}[0] + open fun overriddenFunction(): kotlin/String // classifiers.test/EnumClassWithEntryClasses.overriddenFunction|overriddenFunction(){}[0] final fun valueOf(kotlin/String): classifiers.test/EnumClassWithEntryClasses // classifiers.test/EnumClassWithEntryClasses.valueOf|valueOf#static(kotlin.String){}[0] final fun values(): kotlin/Array // classifiers.test/EnumClassWithEntryClasses.values|values#static(){}[0] enum entry BAR_NO_CLASS // classifiers.test/EnumClassWithEntryClasses.BAR_NO_CLASS|null[0]