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

[Native][tests] Minor. Rename effectivePackageName to nominalPackageName

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-11-18 23:12:22 +03:00
parent 3fa5363434
commit 7ea66076eb
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt
+5 -5
View File
@@ -146,7 +146,7 @@ private class ExtTestDataFile(
testDataFile = testDataFile,
generatedSourcesBaseDir = environment.testSourcesDir
),
effectivePackageName = computePackageName(
nominalPackageName = computePackageName(
testDataBaseDir = environment.testRoots.baseDir,
testDataFile = testDataFile
)
@@ -262,7 +262,7 @@ private class ExtTestDataFile(
private fun patchPackageNames(isStandaloneTest: Boolean) = with(structure) {
if (isStandaloneTest) return // Don't patch packages for standalone tests.
val basePackageName = FqName(settings.effectivePackageName)
val basePackageName = FqName(settings.nominalPackageName)
val oldPackageNames: Set<FqName> = filesToTransform.mapToSet { it.packageFqName }
val oldToNewPackageNameMapping: Map<FqName, FqName> = oldPackageNames.associateWith { oldPackageName ->
@@ -538,7 +538,7 @@ private class ExtTestDataFile(
}
if (!isStandaloneTest) {
append("package ").appendLine(settings.effectivePackageName)
append("package ").appendLine(settings.nominalPackageName)
appendLine()
}
@@ -575,7 +575,7 @@ private class ExtTestDataFile(
modules = modules,
freeCompilerArgs = assembleFreeCompilerArgs(),
origin = TestOrigin.SingleTestDataFile(testDataFile),
nominalPackageName = settings.effectivePackageName,
nominalPackageName = settings.nominalPackageName,
expectedOutputDataFile = null,
extras = null
)
@@ -633,7 +633,7 @@ private class ExtTestDataFileSettings(
val optInsForCompiler: Set<String>,
val expectActualLinker: Boolean,
val generatedSourcesDir: File,
val effectivePackageName: PackageFQN
val nominalPackageName: PackageFQN
)
private typealias SharedModuleGenerator = (sharedModulesDir: File) -> TestModule.Shared?
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/StandardTestCaseGroupProvider.kt
+3 -3
View File
@@ -45,7 +45,7 @@ internal class StandardTestCaseGroupProvider(private val environment: TestEnviro
generatedSourcesBaseDir = environment.testSourcesDir
)
val effectivePackageName = computePackageName(
val nominalPackageName = computePackageName(
testDataBaseDir = environment.testRoots.baseDir,
testDataFile = testDataFile
)
@@ -178,7 +178,7 @@ internal class StandardTestCaseGroupProvider(private val environment: TestEnviro
if (testKind == TestKind.REGULAR) {
// Fix package declarations to avoid unintended conflicts between symbols with the same name in different test cases.
testModules.values.forEach { testModule ->
testModule.files.forEach { testFile -> fixPackageDeclaration(testFile, effectivePackageName, testDataFile) }
testModule.files.forEach { testFile -> fixPackageDeclaration(testFile, nominalPackageName, testDataFile) }
}
}
@@ -187,7 +187,7 @@ internal class StandardTestCaseGroupProvider(private val environment: TestEnviro
modules = testModules.values.toSet(),
freeCompilerArgs = freeCompilerArgs,
origin = TestOrigin.SingleTestDataFile(testDataFile),
nominalPackageName = effectivePackageName,
nominalPackageName = nominalPackageName,
expectedOutputDataFile = expectedOutputDataFile,
extras = if (testKind == TestKind.STANDALONE_NO_TR) {
TestCase.StandaloneNoTestRunnerExtras(