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 94a2634836a..a3cdf2040dc 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 @@ -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 = filesToTransform.mapToSet { it.packageFqName } val oldToNewPackageNameMapping: Map = 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, val expectActualLinker: Boolean, val generatedSourcesDir: File, - val effectivePackageName: PackageFQN + val nominalPackageName: 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 cc69914d3f0..c177b54b55e 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 @@ -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(