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

fix failing because of line endings test

Browse Source
This commit is contained in:
Alexander Udalov
2012-06-22 17:29:20 +04:00
parent a66771ba42
commit ce5b556679
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java
+3 -2
View File
@@ -27,7 +27,9 @@ import com.intellij.execution.process.ProcessOutputTypes;
import com.intellij.openapi.application.PathManager; import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.util.ArrayUtil; import com.intellij.util.ArrayUtil;
import org.jetbrains.jet.test.Tmpdir; import org.jetbrains.jet.test.Tmpdir;
import org.junit.ComparisonFailure; import org.junit.ComparisonFailure;
@@ -42,7 +44,6 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import static com.google.common.base.Charsets.UTF_8;
import static org.junit.Assert.*; import static org.junit.Assert.*;
public abstract class KotlinIntegrationTestBase { public abstract class KotlinIntegrationTestBase {
@@ -122,7 +123,7 @@ public abstract class KotlinIntegrationTestBase {
fail("No .expected file " + expectedFile); fail("No .expected file " + expectedFile);
} }
else { else {
final String goldContent = Files.toString(expectedFile, UTF_8); final String goldContent = FileUtil.loadFile(expectedFile, CharsetToolkit.UTF8, true);
try { try {
assertEquals(goldContent, normalizedContent); assertEquals(goldContent, normalizedContent);
actualFile.delete(); actualFile.delete();