azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MavenUpdateConfigurationQuickFixTest tests on Windows agents

Browse Source
This commit is contained in:
Nikolay Krasko
2017-10-09 19:04:39 +03:00
parent d4d7946e6a
commit b64ab10e89
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenUpdateConfigurationQuickFixTest.kt
+2 -1
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.maven
import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.fileEditor.FileDocumentManager
import com.intellij.openapi.fileEditor.impl.LoadTextUtil import com.intellij.openapi.fileEditor.impl.LoadTextUtil
import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.ModuleRootManager
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import com.intellij.rt.execution.junit.FileComparisonFailure import com.intellij.rt.execution.junit.FileComparisonFailure
import com.intellij.testFramework.fixtures.CodeInsightTestFixture import com.intellij.testFramework.fixtures.CodeInsightTestFixture
@@ -87,7 +88,7 @@ class MavenUpdateConfigurationQuickFixTest : MavenImportingTestCase() {
private fun checkResult(file: VirtualFile) { private fun checkResult(file: VirtualFile) {
val expectedPath = File(getTestDataPath(), "pom.xml.after") val expectedPath = File(getTestDataPath(), "pom.xml.after")
val expectedContent = expectedPath.readText() val expectedContent = FileUtil.loadFile(expectedPath, true)
val actualContent = LoadTextUtil.loadText(file).toString() val actualContent = LoadTextUtil.loadText(file).toString()
if (actualContent != expectedContent) { if (actualContent != expectedContent) {
throw FileComparisonFailure("pom.xml doesn't match", expectedContent, actualContent, expectedPath.path) throw FileComparisonFailure("pom.xml doesn't match", expectedContent, actualContent, expectedPath.path)