From 9f0e8ca6b0871175af63f8ca35c643fcb8639169 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 6 Jul 2016 13:05:54 +0300 Subject: [PATCH] Read test files with \r removed on Windows --- .../kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt index 3135573e1aa..200a69528cd 100644 --- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt +++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt @@ -26,6 +26,7 @@ import com.intellij.openapi.application.Result import com.intellij.openapi.application.WriteAction import com.intellij.openapi.command.CommandProcessor import com.intellij.openapi.fileEditor.FileDocumentManager +import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiManager @@ -92,7 +93,7 @@ abstract class AbstractKotlinMavenInspectionTest : MavenImportingTestCase() { quickfix.applyFix(problem) - assertEquals(file.readText().trim(), document.text.trim()) + assertEquals(FileUtil.loadFile(file, true).trim(), document.text.trim()) ApplicationManager.getApplication().runWriteAction { document.setText(originalText)