From 64a28dd5429f6734742b8900c6a1dec7b946104f Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Tue, 24 Apr 2018 16:25:41 +0200
Subject: [PATCH] QuickFixMultiModuleTest: fix test code

Adjust test data
---
 .../js/{impl.kt => js.kt}                             |  0
 .../js/{impl.kt.after => js.kt.after}                 |  0
 .../jvm/{impl.kt => jvm.kt}                           |  0
 .../jvm/{impl.kt.after => jvm.kt.after}               |  0
 .../idea/quickfix/AbstractQuickFixMultiModuleTest.kt  | 11 ++++-------
 5 files changed, 4 insertions(+), 7 deletions(-)
 rename idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/js/{impl.kt => js.kt} (100%)
 rename idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/js/{impl.kt.after => js.kt.after} (100%)
 rename idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/jvm/{impl.kt => jvm.kt} (100%)
 rename idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/jvm/{impl.kt.after => jvm.kt.after} (100%)

diff --git a/idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/js/impl.kt b/idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/js/js.kt
similarity index 100%
rename from idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/js/impl.kt
rename to idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/js/js.kt
diff --git a/idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/js/impl.kt.after b/idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/js/js.kt.after
similarity index 100%
rename from idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/js/impl.kt.after
rename to idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/js/js.kt.after
diff --git a/idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/jvm/impl.kt b/idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/jvm/jvm.kt
similarity index 100%
rename from idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/jvm/impl.kt
rename to idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/jvm/jvm.kt
diff --git a/idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/jvm/impl.kt.after b/idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/jvm/jvm.kt.after
similarity index 100%
rename from idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/jvm/impl.kt.after
rename to idea/testData/multiModuleQuickFix/convertExpectSealedClassToEnum/jvm/jvm.kt.after
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt
index b390cf9f189..2ad84a156fd 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.idea.stubs.AbstractMultiModuleTest
 import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.idea.test.allKotlinFiles
+import org.jetbrains.kotlin.idea.test.findFileWithCaret
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.KotlinTestUtils
@@ -32,11 +33,7 @@ abstract class AbstractQuickFixMultiModuleTest : AbstractMultiModuleTest() {
     }
 
     private fun doQuickFixTest() {
-        val allFilesInProject = project.allKotlinFiles()
-        val actionFile = allFilesInProject.single { file ->
-            file.text.contains("// \"")
-        }
-
+        val actionFile = project.findFileWithCaret()
         configureByExistingFile(actionFile.virtualFile!!)
 
         val actionFileText = actionFile.text
@@ -80,8 +77,8 @@ abstract class AbstractQuickFixMultiModuleTest : AbstractMultiModuleTest() {
         val afterFiles = projectDirectory.walkTopDown().filter { it.path.endsWith(".after") }.toList()
 
         for (editedFile in project.allKotlinFiles()) {
-            val afterFileInTmpProject = editedFile.containingDirectory?.findFile(file.name + ".after") ?: continue
-            val afterFileInTestData = afterFiles.single {
+            val afterFileInTmpProject = editedFile.containingDirectory?.findFile(editedFile.name + ".after") ?: continue
+            val afterFileInTestData = afterFiles.filter { it.name == afterFileInTmpProject.name } .single {
                 it.readText() == File(afterFileInTmpProject.virtualFile.path).readText()
             }