diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeBlackBoxTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeBlackBoxTest.kt index efe2e648bdd..8d400354aa9 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeBlackBoxTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeBlackBoxTest.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.konan.blackboxtest.support.* import org.jetbrains.kotlin.konan.blackboxtest.support.util.TreeNode import org.jetbrains.kotlin.konan.blackboxtest.support.util.getAbsoluteFile import org.jetbrains.kotlin.konan.blackboxtest.support.util.joinPackageNames +import org.jetbrains.kotlin.konan.blackboxtest.support.util.prependPackageName import org.junit.jupiter.api.DynamicNode import org.junit.jupiter.api.DynamicTest.dynamicTest import org.junit.jupiter.api.extension.ExtendWith @@ -71,10 +72,7 @@ abstract class AbstractNativeBlackBoxTest { fun TreeNode.processItems(parentPackageSegment: String) { val ownPackageSegment = joinPackageNames(parentPackageSegment, packageSegment) items.mapTo(this@buildList) { testRun -> - val displayName = if (ownPackageSegment.isNotEmpty()) - "$ownPackageSegment.${testRun.displayName}" - else - testRun.displayName + val displayName = testRun.displayName.prependPackageName(ownPackageSegment) dynamicTest(displayName) { runTest(testRun) } } diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/PackageNames.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/PackageNames.kt index 27a3db0f13d..3ac1e19dd52 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/PackageNames.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/PackageNames.kt @@ -71,3 +71,6 @@ internal fun joinPackageNames(a: PackageFQN, b: PackageFQN): PackageFQN = when { b.isEmpty() -> a else -> "$a.$b" } + +internal fun String.prependPackageName(packageName: PackageFQN): String = + if (packageName.isEmpty()) this else "$packageName.$this"