From ffa3ff3bbd7b7bb4b46ebfb9b63c14b866b918a1 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Mon, 2 Jun 2014 22:25:15 +0400 Subject: [PATCH] Generating test output when file is missing: removing trailing whitespaces --- compiler/tests/org/jetbrains/jet/JetTestUtils.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 1817d48b690..f6f5cff92d5 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -442,16 +442,15 @@ public class JetTestUtils { public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull String actual) { try { + String actualText = UtilPackage.removeTrailingWhitespacesFromEachLine(StringUtil.convertLineSeparators(actual.trim())); + if (!expectedFile.exists()) { - FileUtil.writeToFile(expectedFile, actual); + FileUtil.writeToFile(expectedFile, actualText); Assert.fail("Expected data file did not exist. Generating: " + expectedFile); } String expected = FileUtil.loadFile(expectedFile, CharsetToolkit.UTF8, true); - String expectedText = UtilPackage.removeTrailingWhitespacesFromEachLine( - StringUtil.convertLineSeparators(expected.trim())); - String actualText = UtilPackage.removeTrailingWhitespacesFromEachLine( - StringUtil.convertLineSeparators(actual.trim())); + String expectedText = UtilPackage.removeTrailingWhitespacesFromEachLine(StringUtil.convertLineSeparators(expected.trim())); if (!Comparing.equal(expectedText, actualText)) { throw new FileComparisonFailure("Actual data differs from file content: " + expectedFile.getName(),