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

Simplify test code and create expected data file if not present

Browse Source
This commit is contained in:
Andrey Breslav
2013-09-14 22:43:09 +04:00
parent 67b23ceda7
commit 73e45047fd
1 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java
+7 -30
View File
@@ -16,7 +16,6 @@
package org.jetbrains.jet.cli.jvm; package org.jetbrains.jet.cli.jvm;
import com.intellij.openapi.util.io.FileUtil;
import junit.framework.Assert; import junit.framework.Assert;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.JetTestUtils;
@@ -35,7 +34,9 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.TestName; import org.junit.rules.TestName;
import java.io.*; import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
import java.util.Arrays; import java.util.Arrays;
import java.util.LinkedList; import java.util.LinkedList;
@@ -64,37 +65,13 @@ public class CliTest {
} }
private void executeCompilerCompareOutput(@NotNull String[] args) { private void executeCompilerCompareOutput(@NotNull String[] args) {
try { String actual = executeCompilerGrabOutput(args)
String actual = normalize(executeCompilerGrabOutput(args)) .replace(new File("compiler/testData/cli/").getAbsolutePath(), "$TESTDATA_DIR$")
.replace(new File("compiler/testData/cli/").getAbsolutePath(), "$TESTDATA_DIR$") .replace("\\", "/");
.replace("\\", "/");
String expected = normalize(FileUtil.loadFile(new File("compiler/testData/cli/" + testName.getMethodName() + ".out"))); JetTestUtils.assertEqualsToFile(new File("compiler/testData/cli/" + testName.getMethodName() + ".out"), actual);
Assert.assertEquals(expected, actual);
}
catch (Exception e) {
throw ExceptionUtils.rethrow(e);
}
} }
@NotNull
private String normalize(String input) {
try {
StringBuilder sb = new StringBuilder();
BufferedReader reader = new BufferedReader(new StringReader(input));
while (true) {
String line = reader.readLine();
if (line == null) {
return sb.toString();
}
sb.append(line + "\n");
}
}
catch (Exception e) {
throw ExceptionUtils.rethrow(e);
}
}
@Test @Test
public void simple() throws Exception { public void simple() throws Exception {