From 5f3c3d7e2bd1fc0622c6af86df32e5d85420ae76 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 15 Jun 2012 17:19:17 +0400 Subject: [PATCH] Fix test for Windows by converting internal line separators too --- .../jet/cli/common/messages/MessageCollectorToString.java | 2 +- .../tests/org/jetbrains/jet/repl/ReplInterpreterTest.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageCollectorToString.java b/compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageCollectorToString.java index c2e50476981..3ee9fd1184a 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageCollectorToString.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageCollectorToString.java @@ -36,7 +36,7 @@ public class MessageCollectorToString implements MessageCollector { actualCollector.report(severity, message, location); } - private static Charset UTF8 = Charset.forName("utf-8"); + private static final Charset UTF8 = Charset.forName("utf-8"); @NotNull public String getString() { diff --git a/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTest.java b/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTest.java index 0a3c1e559b6..daf9441c940 100644 --- a/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTest.java +++ b/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTest.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.repl; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.Pair; +import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.CompileCompilerDependenciesTest; import org.jetbrains.jet.cli.jvm.repl.ReplInterpreter; @@ -58,7 +58,8 @@ public class ReplInterpreterTest { ReplSessionTestFile file = ReplSessionTestFile.load(new File("compiler/testData/repl/" + relativePath)); for (ReplSessionTestFile.OneLine t : file.getLines()) { String code = t.getCode(); - String expected = t.getExpected().replaceFirst("\r?\n$", ""); + + String expected = StringUtil.convertLineSeparators(t.getExpected()).replaceFirst("\n$", ""); ReplSessionTestFile.MatchType matchType = t.getMatchType(); ReplInterpreter.LineResult lineResult = repl.eval(code); @@ -69,7 +70,7 @@ public class ReplInterpreterTest { else { actual = lineResult.getErrorText(); } - String actualString = (actual != null ? actual.toString() : "null").replaceFirst("\r?\n$", ""); + String actualString = StringUtil.convertLineSeparators(actual != null ? actual.toString() : "null").replaceFirst("\n$", ""); if (matchType == ReplSessionTestFile.MatchType.EQUALS) { Assert.assertEquals("after evaluation of: " + code, expected, actualString);