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

Fix incompleteHierarchyInJava test on Windows

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInJava/output.txt
+2
View File
@@ -1,3 +1,5 @@
ERROR: compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInJava/source.kt: (5, 22) Unresolved reference: foo ERROR: compiler/testData/compileKotlinAgainstCustomBinaries/incompleteHierarchyInJava/source.kt: (5, 22) Unresolved reference: foo
ERROR: The following classes have incomplete hierarchies: ERROR: The following classes have incomplete hierarchies:
test.Sub, unresolved: [Super] test.Sub, unresolved: [Super]
COMPILATION_ERROR
compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class CliBaseTest {
} }
@NotNull @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 String normalizedOutputWithoutExitCode = pureOutput
.replace(new File(testDataDir).getAbsolutePath(), "$TESTDATA_DIR$") .replace(new File(testDataDir).getAbsolutePath(), "$TESTDATA_DIR$")
.replace("expected ABI version is " + Integer.toString(JvmAbi.VERSION), "expected ABI version is $ABI_VERSION$") .replace("expected ABI version is " + Integer.toString(JvmAbi.VERSION), "expected ABI version is $ABI_VERSION$")
compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java
+2 -1
View File
@@ -208,7 +208,8 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
"-classpath", tmpdir.getPath(), "-classpath", tmpdir.getPath(),
"-d", 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);
} }
} }