From a614419b436a5fe7f5eee6803a5a7840694f952b Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 7 Jun 2017 14:17:35 +0300 Subject: [PATCH] Fix KotlinJpsBuildTest.testHelp on Windows --- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index d8f87476e2e..6dc04e9b1b5 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -21,6 +21,7 @@ import com.intellij.openapi.util.Condition import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName import com.intellij.openapi.util.io.FileUtilRt +import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.vfs.StandardFileSystems import com.intellij.testFramework.LightVirtualFile import com.intellij.testFramework.UsefulTestCase @@ -797,7 +798,8 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { result.assertSuccessful() val warning = result.getMessages(BuildMessage.Kind.WARNING).single() - Assert.assertEquals(Usage.render(K2JVMCompiler(), K2JVMCompilerArguments()), warning.messageText) + val expectedText = StringUtil.convertLineSeparators(Usage.render(K2JVMCompiler(), K2JVMCompilerArguments())) + Assert.assertEquals(expectedText, warning.messageText) } fun testWrongArgument() {