From ce5b5566790e5d93da698be07221f5addb58433f Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 22 Jun 2012 17:29:20 +0400
Subject: [PATCH] fix failing because of line endings test

---
 .../src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java b/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java
index f05a75d1c42..11652b1f4cc 100644
--- a/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java
+++ b/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java
@@ -27,7 +27,9 @@ import com.intellij.execution.process.ProcessOutputTypes;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.jet.test.Tmpdir;
 import org.junit.ComparisonFailure;
@@ -42,7 +44,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 
-import static com.google.common.base.Charsets.UTF_8;
 import static org.junit.Assert.*;
 
 public abstract class KotlinIntegrationTestBase {
@@ -122,7 +123,7 @@ public abstract class KotlinIntegrationTestBase {
             fail("No .expected file " + expectedFile);
         }
         else {
-            final String goldContent = Files.toString(expectedFile, UTF_8);
+            final String goldContent = FileUtil.loadFile(expectedFile, CharsetToolkit.UTF8, true);
             try {
                 assertEquals(goldContent, normalizedContent);
                 actualFile.delete();