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

Append newline at EOF when creating file in JetTestUtils

Browse Source
This commit is contained in:
Alexander Udalov
2014-10-21 02:21:03 +04:00
parent 102f0d3470
commit 6e5647bb67
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JetTestUtils.java
+2 -2
View File
@@ -439,7 +439,7 @@ public class JetTestUtils {
public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull String actual) { public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull String actual) {
try { try {
String actualText = UtilPackage.removeTrailingWhitespacesFromEachLine(StringUtil.convertLineSeparators(actual.trim())); String actualText = UtilPackage.trimTrailingWhitespacesAndAddNewlineAtEOF(StringUtil.convertLineSeparators(actual.trim()));
if (!expectedFile.exists()) { if (!expectedFile.exists()) {
FileUtil.writeToFile(expectedFile, actualText); FileUtil.writeToFile(expectedFile, actualText);
@@ -447,7 +447,7 @@ public class JetTestUtils {
} }
String expected = FileUtil.loadFile(expectedFile, CharsetToolkit.UTF8, true); String expected = FileUtil.loadFile(expectedFile, CharsetToolkit.UTF8, true);
String expectedText = UtilPackage.removeTrailingWhitespacesFromEachLine(StringUtil.convertLineSeparators(expected.trim())); String expectedText = UtilPackage.trimTrailingWhitespacesAndAddNewlineAtEOF(StringUtil.convertLineSeparators(expected.trim()));
if (!Comparing.equal(expectedText, actualText)) { if (!Comparing.equal(expectedText, actualText)) {
throw new FileComparisonFailure("Actual data differs from file content: " + expectedFile.getName(), throw new FileComparisonFailure("Actual data differs from file content: " + expectedFile.getName(),
compiler/tests/org/jetbrains/jet/jetTestUtils.kt
+4 -1
View File
@@ -20,7 +20,10 @@ import com.intellij.testFramework.fixtures.CodeInsightTestFixture
import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtil
import java.io.File import java.io.File
public fun String.removeTrailingWhitespacesFromEachLine(): String = split('\n') map { it.trimTrailing() } makeString ("\n") public fun String.trimTrailingWhitespacesAndAddNewlineAtEOF(): String =
this.split('\n').map { it.trimTrailing() }.joinToString(separator = "\n").let {
result -> if (result.endsWith("\n")) result else result + "\n"
}
public fun CodeInsightTestFixture.configureWithExtraFile(path: String, extraNamePart: String = ".Data") { public fun CodeInsightTestFixture.configureWithExtraFile(path: String, extraNamePart: String = ".Data") {
val noExtensionPath = FileUtil.getNameWithoutExtension(path) val noExtensionPath = FileUtil.getNameWithoutExtension(path)