diff --git a/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt b/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt index c3341bc5fdf..def626362bc 100644 --- a/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt +++ b/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt @@ -1,12 +1,12 @@ -public fun publicToInternalTopLevelFunction() = 42 -public fun publicToPrivateTopLevelFunction() = 42 +public fun publicToInternalTopLevelFunction() = "publicToInternalTopLevelFunction.v1" +public fun publicToPrivateTopLevelFunction() = "publicToPrivateTopLevelFunction.v1" open class Container { - public fun publicToProtectedFunction() = 42 - public fun publicToInternalFunction() = 42 - public fun publicToPrivateFunction() = 42 + public fun publicToProtectedFunction() = "Container.publicToProtectedFunction.v1" + public fun publicToInternalFunction() = "Container.publicToInternalFunction.v1" + public fun publicToPrivateFunction() = "Container.publicToPrivateFunction.v1" - protected fun protectedToPublicFunction() = 42 - protected fun protectedToInternalFunction() = 42 - protected fun protectedToPrivateFunction() = 42 + protected fun protectedToPublicFunction() = "Container.protectedToPublicFunction.v1" + protected fun protectedToInternalFunction() = "Container.protectedToInternalFunction.v1" + protected fun protectedToPrivateFunction() = "Container.protectedToPrivateFunction.v1" } diff --git a/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt.1 b/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt.1 index 8e0f2556113..d5523a04133 100644 --- a/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt.1 +++ b/compiler/testData/klibABI/changeFunctionVisibility/lib1/l1.kt.1 @@ -1,12 +1,12 @@ -internal fun publicToInternalTopLevelFunction() = 42 -private fun publicToPrivateTopLevelFunction() = 42 +internal fun publicToInternalTopLevelFunction() = "publicToInternalTopLevelFunction.v2" +private fun publicToPrivateTopLevelFunction() = "publicToPrivateTopLevelFunction.v2" open class Container { - protected fun publicToProtectedFunction() = 42 - internal fun publicToInternalFunction() = 42 - private fun publicToPrivateFunction() = 42 + protected fun publicToProtectedFunction() = "Container.publicToProtectedFunction.v2" + internal fun publicToInternalFunction() = "Container.publicToInternalFunction.v2" + private fun publicToPrivateFunction() = "Container.publicToPrivateFunction.v2" - public fun protectedToPublicFunction() = 42 - internal fun protectedToInternalFunction() = 42 - private fun protectedToPrivateFunction() = 42 + public fun protectedToPublicFunction() = "Container.protectedToPublicFunction.v2" + internal fun protectedToInternalFunction() = "Container.protectedToInternalFunction.v2" + private fun protectedToPrivateFunction() = "Container.protectedToPrivateFunction.v2" } diff --git a/compiler/testData/klibABI/changeFunctionVisibility/main/m.kt b/compiler/testData/klibABI/changeFunctionVisibility/main/m.kt index 30807445c97..2b8c036fd4d 100644 --- a/compiler/testData/klibABI/changeFunctionVisibility/main/m.kt +++ b/compiler/testData/klibABI/changeFunctionVisibility/main/m.kt @@ -2,15 +2,15 @@ import abitestutils.abiTest fun box() = abiTest { val c = ContainerImpl() - expectSuccess(42) { publicToInternalTopLevelFunction() } + expectSuccess("publicToInternalTopLevelFunction.v2") { publicToInternalTopLevelFunction() } expectFailure(prefixed("function publicToPrivateTopLevelFunction can not be called")) { publicToPrivateTopLevelFunction() } - expectSuccess(42) { c.publicToProtectedFunction() } + expectSuccess("Container.publicToProtectedFunction.v2") { c.publicToProtectedFunction() } expectFailure(prefixed("function publicToInternalFunction can not be called")) { c.publicToInternalFunction() } expectFailure(prefixed("function publicToPrivateFunction can not be called")) { c.publicToPrivateFunction() } - expectSuccess(42) { c.publicToProtectedFunctionAccess() } + expectSuccess("Container.publicToProtectedFunction.v2") { c.publicToProtectedFunctionAccess() } expectFailure(prefixed("function publicToInternalFunction can not be called")) { c.publicToInternalFunctionAccess() } expectFailure(prefixed("function publicToPrivateFunction can not be called")) { c.publicToPrivateFunctionAccess() } - expectSuccess(42) { c.protectedToPublicFunctionAccess() } + expectSuccess("Container.protectedToPublicFunction.v2") { c.protectedToPublicFunctionAccess() } expectFailure(prefixed("function protectedToInternalFunction can not be called")) { c.protectedToInternalFunctionAccess() } expectFailure(prefixed("function protectedToPrivateFunction can not be called")) { c.protectedToPrivateFunctionAccess() } } diff --git a/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt b/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt index a4e55966614..b77940d4d3d 100644 --- a/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt +++ b/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt @@ -1,20 +1,20 @@ -public val publicToInternalTopLevelProperty1 = 42 -public val publicToInternalTopLevelProperty2 get() = 42 -public val publicToPrivateTopLevelProperty1 = 42 -public val publicToPrivateTopLevelProperty2 get() = 42 +public val publicToInternalTopLevelProperty1 = "publicToInternalTopLevelProperty1.v1" +public val publicToInternalTopLevelProperty2 get() = "publicToInternalTopLevelProperty2.v1" +public val publicToPrivateTopLevelProperty1 = "publicToPrivateTopLevelProperty1.v1" +public val publicToPrivateTopLevelProperty2 get() = "publicToPrivateTopLevelProperty2.v1" open class Container { - public val publicToProtectedProperty1 = 42 - public val publicToProtectedProperty2 get() = 42 - public val publicToInternalProperty1 = 42 - public val publicToInternalProperty2 get() = 42 - public val publicToPrivateProperty1 = 42 - public val publicToPrivateProperty2 get() = 42 + public val publicToProtectedProperty1 = "Container.publicToProtectedProperty1.v1" + public val publicToProtectedProperty2 get() = "Container.publicToProtectedProperty2.v1" + public val publicToInternalProperty1 = "Container.publicToInternalProperty1.v1" + public val publicToInternalProperty2 get() = "Container.publicToInternalProperty2.v1" + public val publicToPrivateProperty1 = "Container.publicToPrivateProperty1.v1" + public val publicToPrivateProperty2 get() = "Container.publicToPrivateProperty2.v1" - protected val protectedToPublicProperty1 = 42 - protected val protectedToPublicProperty2 get() = 42 - protected val protectedToInternalProperty1 = 42 - protected val protectedToInternalProperty2 get() = 42 - protected val protectedToPrivateProperty1 = 42 - protected val protectedToPrivateProperty2 get() = 42 + protected val protectedToPublicProperty1 = "Container.protectedToPublicProperty1.v1" + protected val protectedToPublicProperty2 get() = "Container.protectedToPublicProperty2.v1" + protected val protectedToInternalProperty1 = "Container.protectedToInternalProperty1.v1" + protected val protectedToInternalProperty2 get() = "Container.protectedToInternalProperty2.v1" + protected val protectedToPrivateProperty1 = "Container.protectedToPrivateProperty1.v1" + protected val protectedToPrivateProperty2 get() = "Container.protectedToPrivateProperty2.v1" } diff --git a/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt.1 b/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt.1 index de03c234668..076cd2f424c 100644 --- a/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt.1 +++ b/compiler/testData/klibABI/changePropertyVisibility/lib1/l1.kt.1 @@ -1,20 +1,20 @@ -internal val publicToInternalTopLevelProperty1 = 42 -internal val publicToInternalTopLevelProperty2 get() = 42 -private val publicToPrivateTopLevelProperty1 = 42 -private val publicToPrivateTopLevelProperty2 get() = 42 +internal val publicToInternalTopLevelProperty1 = "publicToInternalTopLevelProperty1.v2" +internal val publicToInternalTopLevelProperty2 get() = "publicToInternalTopLevelProperty2.v2" +private val publicToPrivateTopLevelProperty1 = "publicToPrivateTopLevelProperty1.v2" +private val publicToPrivateTopLevelProperty2 get() = "publicToPrivateTopLevelProperty2.v2" open class Container { - protected val publicToProtectedProperty1 = 42 - protected val publicToProtectedProperty2 get() = 42 - internal val publicToInternalProperty1 = 42 - internal val publicToInternalProperty2 get() = 42 - private val publicToPrivateProperty1 = 42 - private val publicToPrivateProperty2 get() = 42 + protected val publicToProtectedProperty1 = "Container.publicToProtectedProperty1.v2" + protected val publicToProtectedProperty2 get() = "Container.publicToProtectedProperty2.v2" + internal val publicToInternalProperty1 = "Container.publicToInternalProperty1.v2" + internal val publicToInternalProperty2 get() = "Container.publicToInternalProperty2.v2" + private val publicToPrivateProperty1 = "Container.publicToPrivateProperty1.v2" + private val publicToPrivateProperty2 get() = "Container.publicToPrivateProperty2.v2" - public val protectedToPublicProperty1 = 42 - public val protectedToPublicProperty2 get() = 42 - internal val protectedToInternalProperty1 = 42 - internal val protectedToInternalProperty2 get() = 42 - private val protectedToPrivateProperty1 = 42 - private val protectedToPrivateProperty2 get() = 42 + public val protectedToPublicProperty1 = "Container.protectedToPublicProperty1.v2" + public val protectedToPublicProperty2 get() = "Container.protectedToPublicProperty2.v2" + internal val protectedToInternalProperty1 = "Container.protectedToInternalProperty1.v2" + internal val protectedToInternalProperty2 get() = "Container.protectedToInternalProperty2.v2" + private val protectedToPrivateProperty1 = "Container.protectedToPrivateProperty1.v2" + private val protectedToPrivateProperty2 get() = "Container.protectedToPrivateProperty2.v2" } diff --git a/compiler/testData/klibABI/changePropertyVisibility/main/m.kt b/compiler/testData/klibABI/changePropertyVisibility/main/m.kt index 1a944182faf..bd74582acca 100644 --- a/compiler/testData/klibABI/changePropertyVisibility/main/m.kt +++ b/compiler/testData/klibABI/changePropertyVisibility/main/m.kt @@ -2,24 +2,24 @@ import abitestutils.abiTest fun box() = abiTest { val c = ContainerImpl() - expectSuccess(42) { publicToInternalTopLevelProperty1 } - expectSuccess(42) { publicToInternalTopLevelProperty2 } + expectSuccess("publicToInternalTopLevelProperty1.v2") { publicToInternalTopLevelProperty1 } + expectSuccess("publicToInternalTopLevelProperty2.v2") { 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 } + expectSuccess("Container.publicToProtectedProperty1.v2") { c.publicToProtectedProperty1 } + expectSuccess("Container.publicToProtectedProperty2.v2") { c.publicToProtectedProperty2 } expectFailure(prefixed("property accessor publicToInternalProperty1. can not be called")) { c.publicToInternalProperty1 } expectFailure(prefixed("property accessor publicToInternalProperty2. can not be called")) { c.publicToInternalProperty2 } expectFailure(prefixed("property accessor publicToPrivateProperty1. can not be called")) { c.publicToPrivateProperty1 } expectFailure(prefixed("property accessor publicToPrivateProperty2. can not be called")) { c.publicToPrivateProperty2 } - expectSuccess(42) { c.publicToProtectedProperty1Access() } - expectSuccess(42) { c.publicToProtectedProperty2Access() } + expectSuccess("Container.publicToProtectedProperty1.v2") { c.publicToProtectedProperty1Access() } + expectSuccess("Container.publicToProtectedProperty2.v2") { c.publicToProtectedProperty2Access() } expectFailure(prefixed("property accessor publicToInternalProperty1. can not be called")) { c.publicToInternalProperty1Access() } expectFailure(prefixed("property accessor publicToInternalProperty2. can not be called")) { c.publicToInternalProperty2Access() } expectFailure(prefixed("property accessor publicToPrivateProperty1. can not be called")) { c.publicToPrivateProperty1Access() } expectFailure(prefixed("property accessor publicToPrivateProperty2. can not be called")) { c.publicToPrivateProperty2Access() } - expectSuccess(42) { c.protectedToPublicProperty1Access() } - expectSuccess(42) { c.protectedToPublicProperty2Access() } + expectSuccess("Container.protectedToPublicProperty1.v2") { c.protectedToPublicProperty1Access() } + expectSuccess("Container.protectedToPublicProperty2.v2") { c.protectedToPublicProperty2Access() } expectFailure(prefixed("property accessor protectedToInternalProperty1. can not be called")) { c.protectedToInternalProperty1Access() } expectFailure(prefixed("property accessor protectedToInternalProperty2. can not be called")) { c.protectedToInternalProperty2Access() } expectFailure(prefixed("property accessor protectedToPrivateProperty1. can not be called")) { c.protectedToPrivateProperty1Access() }