From b64ab10e89e49ac83b8194fed5b1becf8a4a2f76 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 9 Oct 2017 19:04:39 +0300 Subject: [PATCH] Fix MavenUpdateConfigurationQuickFixTest tests on Windows agents --- .../kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt index 73b2f09ad5a..5089be789d0 100644 --- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt +++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.maven import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.fileEditor.impl.LoadTextUtil import com.intellij.openapi.roots.ModuleRootManager +import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.vfs.VirtualFile import com.intellij.rt.execution.junit.FileComparisonFailure import com.intellij.testFramework.fixtures.CodeInsightTestFixture @@ -87,7 +88,7 @@ class MavenUpdateConfigurationQuickFixTest : MavenImportingTestCase() { private fun checkResult(file: VirtualFile) { val expectedPath = File(getTestDataPath(), "pom.xml.after") - val expectedContent = expectedPath.readText() + val expectedContent = FileUtil.loadFile(expectedPath, true) val actualContent = LoadTextUtil.loadText(file).toString() if (actualContent != expectedContent) { throw FileComparisonFailure("pom.xml doesn't match", expectedContent, actualContent, expectedPath.path)