From 445156f2fc18640d8f7f26068d08bbb9e03c4290 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 18 Nov 2021 18:24:21 +0300 Subject: [PATCH] [Native][tests] Minor. Rename `PackageName` to `PackageFQN` --- .../kotlin/konan/blackboxtest/support/TestCase.kt | 4 ++-- .../kotlin/konan/blackboxtest/support/TestCompiler.kt | 4 ++-- .../kotlin/konan/blackboxtest/support/TestExecutable.kt | 2 +- .../support/group/ExtTestCaseGroupProvider.kt | 2 +- .../support/group/StandardTestCaseGroupProvider.kt | 2 +- .../konan/blackboxtest/support/util/PackageNames.kt | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestCase.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestCase.kt index d6ab72620b0..797b95df2fd 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestCase.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestCase.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail import java.io.File -internal typealias PackageName = String +internal typealias PackageFQN = String /** * Helps to track the origin of every [TestCase], [TestCompilation] or [TestExecutable]. Used for issue reporting purposes. @@ -153,7 +153,7 @@ internal class TestCase( val modules: Set, val freeCompilerArgs: TestCompilerArgs, val origin: TestOrigin.SingleTestDataFile, - val nominalPackageName: PackageName, + val nominalPackageName: PackageFQN, val expectedOutputDataFile: File?, val extras: StandaloneNoTestRunnerExtras? = null ) { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestCompiler.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestCompiler.kt index 3bbb06c5802..e7b3c901a5e 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestCompiler.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestCompiler.kt @@ -107,7 +107,7 @@ internal class TestCompilationFactory(private val environment: TestEnvironment) private fun multiModuleArtifactFile(modules: Collection, extension: String): File { var filesCount = 0 var hash = 0 - val uniquePackageNames = hashSetOf() + val uniquePackageNames = hashSetOf() modules.forEach { module -> module.files.forEach { file -> @@ -137,7 +137,7 @@ internal class TestCompilationFactory(private val environment: TestEnvironment) return artifactDirForPackageName(commonPackageName).resolve(artifactFileName) } - private fun artifactDirForPackageName(packageName: PackageName?): File { + private fun artifactDirForPackageName(packageName: PackageFQN?): File { val baseDir = environment.testBinariesDir val outputDir = if (packageName != null) baseDir.resolve(packageName.replace('.', '_')) else baseDir diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestExecutable.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestExecutable.kt index bee78f5555b..1fed0e8316d 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestExecutable.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/TestExecutable.kt @@ -31,7 +31,7 @@ internal sealed interface TestRunParameter { } } - class WithPackageFilter(private val packageFQN: PackageName) : WithFilter() { + class WithPackageFilter(private val packageFQN: PackageFQN) : WithFilter() { override val wildcard get() = "$packageFQN.*" override fun testMatches(testName: String) = testName.startsWith("$packageFQN.") } diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt index bbd379ebe36..94a2634836a 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt @@ -633,7 +633,7 @@ private class ExtTestDataFileSettings( val optInsForCompiler: Set, val expectActualLinker: Boolean, val generatedSourcesDir: File, - val effectivePackageName: PackageName + val effectivePackageName: PackageFQN ) private typealias SharedModuleGenerator = (sharedModulesDir: File) -> TestModule.Shared? diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/StandardTestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/StandardTestCaseGroupProvider.kt index 09d1784a0ee..cc69914d3f0 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/StandardTestCaseGroupProvider.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/StandardTestCaseGroupProvider.kt @@ -210,7 +210,7 @@ internal class StandardTestCaseGroupProvider(private val environment: TestEnviro private fun fixPackageDeclaration( testFile: TestFile, - packageName: PackageName, + packageName: PackageFQN, testDataFile: File ) = testFile.update { text -> var existingPackageDeclarationLine: String? = null 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 2883abaa516..6b6fe6b9866 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 @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.konan.blackboxtest.support.util -import org.jetbrains.kotlin.konan.blackboxtest.support.PackageName +import org.jetbrains.kotlin.konan.blackboxtest.support.PackageFQN import org.jetbrains.kotlin.renderer.KeywordStringsGenerated.KEYWORDS import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue import java.io.File @@ -13,7 +13,7 @@ import java.nio.file.Path import kotlin.io.path.name import kotlin.math.min -internal fun computePackageName(testDataBaseDir: File, testDataFile: File): PackageName { +internal fun computePackageName(testDataBaseDir: File, testDataFile: File): PackageFQN { assertTrue(testDataFile.startsWith(testDataBaseDir)) { """ The file is outside of the directory. @@ -48,10 +48,10 @@ internal fun computePackageName(testDataBaseDir: File, testDataFile: File): Pack } } -internal fun Set.findCommonPackageName(): PackageName? = when (size) { +internal fun Set.findCommonPackageName(): PackageFQN? = when (size) { 0 -> null 1 -> first() - else -> map { packageName: PackageName -> + else -> map { packageName: PackageFQN -> packageName.split('.') }.reduce { commonPackageNameParts: List, packageNameParts: List -> ArrayList(min(commonPackageNameParts.size, packageNameParts.size)).apply {