From ca3dfdf0084c6a3c3913c0cd55e040baa1a8c79f Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 28 May 2015 19:42:13 +0300 Subject: [PATCH] Fixed AbstractQuickFixMultiFileTest badly broken sometime ago --- .../idea/quickfix/AbstractQuickFixMultiFileTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java index a5acd1868e1..497bc76969c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java @@ -186,12 +186,14 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer checkResultByFile(testFullPath.replace(".before.Main.", ".after.")); PsiFile mainFile = myFile; - String extraFileNamePrefix = mainFile.getName().replace(".Main.kt", ".data.Sample."); + String mainFileName = mainFile.getName(); + String extraFileNamePrefix = mainFileName.replace(".Main.kt", "."); for (PsiFile file : mainFile.getContainingDirectory().getFiles()) { - if (!file.getName().startsWith(extraFileNamePrefix)) continue; + String fileName = file.getName(); + if (fileName.equals(mainFileName) || !fileName.startsWith(extraFileNamePrefix)) continue; myFile = file; - String extraFileFullPath = testFullPath.replace(mainFile.getName(), file.getName()); + String extraFileFullPath = testFullPath.replace(mainFileName, fileName); try { checkResultByFile(extraFileFullPath.replace(".before.", ".after.")); }