From 31840fa328e13186440c59d6bcd0d3732fe3b184 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 19 Jul 2017 13:56:00 +0200 Subject: [PATCH] Fix GradleLanguageFeatureQuickFixTest on Windows --- .../codeInsight/gradle/GradleLanguageFeatureQuickFixTest.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleLanguageFeatureQuickFixTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleLanguageFeatureQuickFixTest.kt index 3f04032b6a6..cb60bccf9bb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleLanguageFeatureQuickFixTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleLanguageFeatureQuickFixTest.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight.gradle import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.fileEditor.impl.LoadTextUtil +import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.vfs.VirtualFile import com.intellij.rt.execution.junit.FileComparisonFailure import com.intellij.testFramework.fixtures.CodeInsightTestFixture @@ -75,8 +76,8 @@ class GradleLanguageFeatureQuickFixTest : GradleImportingTestCase() { private fun checkResult(file: VirtualFile) { val expectedPath = File(getTestDataPath(), "build.gradle.after") - val expectedContent = expectedPath.readText() - val actualContent = LoadTextUtil.loadText(file).toString() + val expectedContent = StringUtil.convertLineSeparators(expectedPath.readText()) + val actualContent = StringUtil.convertLineSeparators(LoadTextUtil.loadText(file).toString()) if (actualContent != expectedContent) { throw FileComparisonFailure("build.gradle doesn't match", expectedContent, actualContent, expectedPath.path) }