Fix incompleteHierarchyInJava test on Windows

Normalize path delimiters to '/' via CliBaseTest
This commit is contained in:
Alexander Udalov
2015-02-10 16:20:17 +03:00
parent b03b96f202
commit cd6d04b3ba
3 changed files with 5 additions and 2 deletions
@@ -1,3 +1,5 @@
ERROR: compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInJava/source.kt: (5, 22) Unresolved reference: foo
ERROR: The following classes have incomplete hierarchies:
test.Sub, unresolved: [Super]
COMPILATION_ERROR
@@ -67,7 +67,7 @@ public class CliBaseTest {
}
@NotNull
static String getNormalizedCompilerOutput(@NotNull String pureOutput, @NotNull ExitCode exitCode, @NotNull String testDataDir) {
public static String getNormalizedCompilerOutput(@NotNull String pureOutput, @NotNull ExitCode exitCode, @NotNull String testDataDir) {
String normalizedOutputWithoutExitCode = pureOutput
.replace(new File(testDataDir).getAbsolutePath(), "$TESTDATA_DIR$")
.replace("expected ABI version is " + Integer.toString(JvmAbi.VERSION), "expected ABI version is $ABI_VERSION$")
@@ -208,7 +208,8 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
"-classpath", tmpdir.getPath(),
"-d", tmpdir.getPath()
));
String output = CliBaseTest.getNormalizedCompilerOutput(pair.first, pair.second, getTestDataDirectory().getPath());
JetTestUtils.assertEqualsToFile(new File(getTestDataDirectory(), "output.txt"), pair.first);
JetTestUtils.assertEqualsToFile(new File(getTestDataDirectory(), "output.txt"), output);
}
}