From dd2a87dbf721407753696c4e2461493c105bc738 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Wed, 19 Jul 2017 13:18:15 +0300
Subject: [PATCH] Rewrite test class to make it work on Windows

Stop using dummy file and assert result with assertEqualsToFile().

Previous version didn't work on Windows because of `\r`.
---
 ...AbstractConcatenatedStringGeneratorTest.kt | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractConcatenatedStringGeneratorTest.kt b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractConcatenatedStringGeneratorTest.kt
index 30a48d3a20f..ffb5718b5a4 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractConcatenatedStringGeneratorTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractConcatenatedStringGeneratorTest.kt
@@ -16,36 +16,27 @@
 
 package org.jetbrains.kotlin.idea.intentions
 
-import com.intellij.openapi.fileEditor.FileDocumentManager
-import com.intellij.openapi.vfs.LocalFileSystem
-import com.intellij.psi.PsiDocumentManager
 import junit.framework.TestCase
 import org.jetbrains.kotlin.idea.intentions.copyConcatenatedStringToClipboard.ConcatenatedStringGenerator
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.psi.KtBinaryExpression
-import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import java.io.File
 
 /**
- * Compare xxx.kt.result file with the result of ConcatenatedStringGenerator().create(KtBinaryExpression) where KtBinaryExpression is the last KtBinaryExpression of xxx.kt file
+ * Compare xxx.kt.result file with the result of ConcatenatedStringGenerator().create(KtBinaryExpression) where KtBinaryExpression is
+ * the last KtBinaryExpression of xxx.kt file
  */
 abstract class AbstractConcatenatedStringGeneratorTest : KotlinLightCodeInsightFixtureTestCase() {
     @Throws(Exception::class)
     protected fun doTest(path: String) {
-        val mainFile = File(path)
-        val fileText = mainFile.readText()
-        val resultFile = File("$path.result")
-        val expectedText = resultFile.readText()
-
-        val vFile = LocalFileSystem.getInstance().findFileByPath(path) ?: return
-        val document = FileDocumentManager.getInstance().getDocument(vFile) ?: return
-        val psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document) ?: return
-
-        val ktFile = KtPsiFactory(project).createAnalyzableFile("dummy.kt", fileText, psiFile)
-        val expression = ktFile.collectDescendantsOfType<KtBinaryExpression>().lastOrNull()
+        myFixture.configureByFile(path)
+        val expression = myFixture.file.collectDescendantsOfType<KtBinaryExpression>().lastOrNull()
         TestCase.assertNotNull("No binary expression found: $path", expression)
+
         val generatedString = ConcatenatedStringGenerator().create(expression!!)
-        TestCase.assertEquals("mismatch '$expectedText' - '$generatedString'", expectedText, generatedString)
+
+        KotlinTestUtils.assertEqualsToFile(File("$path.result"), generatedString)
     }
 }