azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Native][tests] Simplify condition in AbstractNativeBlackBoxTest.buildJUnitDynamicNodes()

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-11-24 18:05:47 +03:00
parent 2f2e340e63
commit 7e92e3c57f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeBlackBoxTest.kt
+2 -4
View File
@@ -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.TreeNode
import org.jetbrains.kotlin.konan.blackboxtest.support.util.getAbsoluteFile 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.joinPackageNames
import org.jetbrains.kotlin.konan.blackboxtest.support.util.prependPackageName
import org.junit.jupiter.api.DynamicNode import org.junit.jupiter.api.DynamicNode
import org.junit.jupiter.api.DynamicTest.dynamicTest import org.junit.jupiter.api.DynamicTest.dynamicTest
import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.ExtendWith
@@ -71,10 +72,7 @@ abstract class AbstractNativeBlackBoxTest {
fun TreeNode<TestRun>.processItems(parentPackageSegment: String) { fun TreeNode<TestRun>.processItems(parentPackageSegment: String) {
val ownPackageSegment = joinPackageNames(parentPackageSegment, packageSegment) val ownPackageSegment = joinPackageNames(parentPackageSegment, packageSegment)
items.mapTo(this@buildList) { testRun -> items.mapTo(this@buildList) { testRun ->
val displayName = if (ownPackageSegment.isNotEmpty()) val displayName = testRun.displayName.prependPackageName(ownPackageSegment)
"$ownPackageSegment.${testRun.displayName}"
else
testRun.displayName
dynamicTest(displayName) { runTest(testRun) } dynamicTest(displayName) { runTest(testRun) }
} }
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/util/PackageNames.kt
+3
View File
@@ -71,3 +71,6 @@ internal fun joinPackageNames(a: PackageFQN, b: PackageFQN): PackageFQN = when {
b.isEmpty() -> a b.isEmpty() -> a
else -> "$a.$b" else -> "$a.$b"
} }
internal fun String.prependPackageName(packageName: PackageFQN): String =
if (packageName.isEmpty()) this else "$packageName.$this"