From 64867a16279d8908863fbb36706d62dea905cb99 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Fri, 2 Sep 2022 17:07:24 +0200 Subject: [PATCH] [IR][tests] Rename top-level declarations in visibility-related tests to distinguish them from nested declarations --- .../testData/klibABI/changeFunctionVisibility/lib1/l1.kt | 4 ++-- .../klibABI/changeFunctionVisibility/lib1/l1.kt.1 | 4 ++-- .../testData/klibABI/changeFunctionVisibility/main/m.kt | 4 ++-- .../testData/klibABI/changePropertyVisibility/lib1/l1.kt | 8 ++++---- .../klibABI/changePropertyVisibility/lib1/l1.kt.1 | 8 ++++---- .../testData/klibABI/changePropertyVisibility/main/m.kt | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt b/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt index 92b69222523..c3341bc5fdf 100644 --- a/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt +++ b/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt @@ -1,5 +1,5 @@ -public fun publicToInternalFunction() = 42 -public fun publicToPrivateFunction() = 42 +public fun publicToInternalTopLevelFunction() = 42 +public fun publicToPrivateTopLevelFunction() = 42 open class Container { public fun publicToProtectedFunction() = 42 diff --git a/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt.1 b/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt.1 index 168fe22ba66..8e0f2556113 100644 --- a/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt.1 +++ b/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt.1 @@ -1,5 +1,5 @@ -internal fun publicToInternalFunction() = 42 -private fun publicToPrivateFunction() = 42 +internal fun publicToInternalTopLevelFunction() = 42 +private fun publicToPrivateTopLevelFunction() = 42 open class Container { protected fun publicToProtectedFunction() = 42 diff --git a/compiler/testData/klibABI/changeFunctionVisibility/main/m.kt b/compiler/testData/klibABI/changeFunctionVisibility/main/m.kt index e53ac863a77..30807445c97 100644 --- a/compiler/testData/klibABI/changeFunctionVisibility/main/m.kt +++ b/compiler/testData/klibABI/changeFunctionVisibility/main/m.kt @@ -2,8 +2,8 @@ import abitestutils.abiTest fun box() = abiTest { val c = ContainerImpl() - expectSuccess(42) { publicToInternalFunction() } - expectFailure(prefixed("function publicToPrivateFunction can not be called")) { publicToPrivateFunction() } + expectSuccess(42) { publicToInternalTopLevelFunction() } + expectFailure(prefixed("function publicToPrivateTopLevelFunction can not be called")) { publicToPrivateTopLevelFunction() } expectSuccess(42) { c.publicToProtectedFunction() } expectFailure(prefixed("function publicToInternalFunction can not be called")) { c.publicToInternalFunction() } expectFailure(prefixed("function publicToPrivateFunction can not be called")) { c.publicToPrivateFunction() } diff --git a/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt b/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt index 99bbb9e4e5d..a4e55966614 100644 --- a/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt +++ b/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt @@ -1,7 +1,7 @@ -public val publicToInternalProperty1 = 42 -public val publicToInternalProperty2 get() = 42 -public val publicToPrivateProperty1 = 42 -public val publicToPrivateProperty2 get() = 42 +public val publicToInternalTopLevelProperty1 = 42 +public val publicToInternalTopLevelProperty2 get() = 42 +public val publicToPrivateTopLevelProperty1 = 42 +public val publicToPrivateTopLevelProperty2 get() = 42 open class Container { public val publicToProtectedProperty1 = 42 diff --git a/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt.1 b/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt.1 index bb5e646d009..de03c234668 100644 --- a/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt.1 +++ b/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt.1 @@ -1,7 +1,7 @@ -internal val publicToInternalProperty1 = 42 -internal val publicToInternalProperty2 get() = 42 -private val publicToPrivateProperty1 = 42 -private val publicToPrivateProperty2 get() = 42 +internal val publicToInternalTopLevelProperty1 = 42 +internal val publicToInternalTopLevelProperty2 get() = 42 +private val publicToPrivateTopLevelProperty1 = 42 +private val publicToPrivateTopLevelProperty2 get() = 42 open class Container { protected val publicToProtectedProperty1 = 42 diff --git a/compiler/testData/klibABI/changePropertyVisibility/main/m.kt b/compiler/testData/klibABI/changePropertyVisibility/main/m.kt index 9f9e52468cc..1a944182faf 100644 --- a/compiler/testData/klibABI/changePropertyVisibility/main/m.kt +++ b/compiler/testData/klibABI/changePropertyVisibility/main/m.kt @@ -2,10 +2,10 @@ import abitestutils.abiTest fun box() = abiTest { val c = ContainerImpl() - expectSuccess(42) { publicToInternalProperty1 } - expectSuccess(42) { publicToInternalProperty2 } - expectFailure(prefixed("property accessor publicToPrivateProperty1. can not be called")) { publicToPrivateProperty1 } - expectFailure(prefixed("property accessor publicToPrivateProperty2. can not be called")) { publicToPrivateProperty2 } + expectSuccess(42) { publicToInternalTopLevelProperty1 } + expectSuccess(42) { publicToInternalTopLevelProperty2 } + expectFailure(prefixed("property accessor publicToPrivateTopLevelProperty1. can not be called")) { publicToPrivateTopLevelProperty1 } + expectFailure(prefixed("property accessor publicToPrivateTopLevelProperty2. can not be called")) { publicToPrivateTopLevelProperty2 } expectSuccess(42) { c.publicToProtectedProperty1 } expectSuccess(42) { c.publicToProtectedProperty2 } expectFailure(prefixed("property accessor publicToInternalProperty1. can not be called")) { c.publicToInternalProperty1 }