From 191ae630cee0bbc22ecf6cf112021b87b03fd476 Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Thu, 10 Jul 2025 12:47:55 +0200 Subject: [PATCH] kotlin: better diagnostics in tests GitOrigin-RevId: 8434b60093f7972d3a4d86e10d43466cb7e1f17a --- .../idea/refactoring/AbstractMultifileRefactoringTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/AbstractMultifileRefactoringTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/AbstractMultifileRefactoringTest.kt index 490e1862d90b..2e21b0c18f32 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/AbstractMultifileRefactoringTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/AbstractMultifileRefactoringTest.kt @@ -99,10 +99,10 @@ fun runRefactoringTest( ) { val mainFilePath = config.getNullableString("mainFile") ?: config.getAsJsonArray("filesToMove").first().asString - val conflictFile = alternativeConflicts + val conflictFile = (alternativeConflicts ?.let { File(File(path).parentFile, alternativeConflicts) }?.takeIf { it.exists() } ?: File(File(path).parentFile, "conflicts.k2.txt").takeIf { KotlinPluginModeProvider.isK2Mode() && it.exists() } - ?: File(File(path).parentFile, "conflicts.txt") + ?: File(File(path).parentFile, "conflicts.txt")).normalize() val mainFile = rootDir.findFileByRelativePath(mainFilePath)!! val mainPsiFile = PsiManager.getInstance(project).findFile(mainFile)!! @@ -121,7 +121,7 @@ fun runRefactoringTest( try { action.runRefactoring(rootDir, mainPsiFile, elementsAtCaret, config) - assert(!conflictFile.exists()) + assert(!conflictFile.exists()) { "Conflict file $conflictFile should not exist" } } catch (e: BaseRefactoringProcessor.ConflictsInTestsException) { KotlinTestUtils.assertEqualsToFile(conflictFile, e.messages.sorted().joinToString("\n"))