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

Fix test for Windows by converting internal line separators too

Browse Source
This commit is contained in:
Nikolay Krasko
2012-06-15 17:19:17 +04:00
parent b940c1efc1
commit 5f3c3d7e2b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageCollectorToString.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class MessageCollectorToString implements MessageCollector {
actualCollector.report(severity, message, location); actualCollector.report(severity, message, location);
} }
private static Charset UTF8 = Charset.forName("utf-8"); private static final Charset UTF8 = Charset.forName("utf-8");
@NotNull @NotNull
public String getString() { public String getString() {
compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTest.java
+4 -3
View File
@@ -18,7 +18,7 @@ package org.jetbrains.jet.repl;
import com.intellij.openapi.Disposable; import com.intellij.openapi.Disposable;
import com.intellij.openapi.util.Disposer; 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.annotations.NotNull;
import org.jetbrains.jet.CompileCompilerDependenciesTest; import org.jetbrains.jet.CompileCompilerDependenciesTest;
import org.jetbrains.jet.cli.jvm.repl.ReplInterpreter; 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)); ReplSessionTestFile file = ReplSessionTestFile.load(new File("compiler/testData/repl/" + relativePath));
for (ReplSessionTestFile.OneLine t : file.getLines()) { for (ReplSessionTestFile.OneLine t : file.getLines()) {
String code = t.getCode(); String code = t.getCode();
String expected = t.getExpected().replaceFirst("\r?\n$", "");
String expected = StringUtil.convertLineSeparators(t.getExpected()).replaceFirst("\n$", "");
ReplSessionTestFile.MatchType matchType = t.getMatchType(); ReplSessionTestFile.MatchType matchType = t.getMatchType();
ReplInterpreter.LineResult lineResult = repl.eval(code); ReplInterpreter.LineResult lineResult = repl.eval(code);
@@ -69,7 +70,7 @@ public class ReplInterpreterTest {
else { else {
actual = lineResult.getErrorText(); 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) { if (matchType == ReplSessionTestFile.MatchType.EQUALS) {
Assert.assertEquals("after evaluation of: " + code, expected, actualString); Assert.assertEquals("after evaluation of: " + code, expected, actualString);