From 35f1d8a7f33a6e32fdb0ae9bd3b2cbf8a99eff31 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 29 Apr 2013 19:07:41 +0400 Subject: [PATCH] Convert line separators when loading expected test results --- .../jet/modules/xml/AbstractModuleXmlParserTest.java | 2 +- .../jet/modules/xml/KotlinModuleXmlGeneratorTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java b/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java index ecdf1b91db5..22d09abd219 100644 --- a/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java +++ b/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java @@ -58,6 +58,6 @@ public abstract class AbstractModuleXmlParserTest extends TestCase { fail("Expected data file does not exist. A new file created: " + txtFile); } - assertEquals(FileUtil.loadFile(txtFile), actual); + assertEquals(FileUtil.loadFile(txtFile, true), actual); } } diff --git a/idea/tests/org/jetbrains/jet/modules/xml/KotlinModuleXmlGeneratorTest.java b/idea/tests/org/jetbrains/jet/modules/xml/KotlinModuleXmlGeneratorTest.java index aa07e5250f5..d6e2635e1ad 100644 --- a/idea/tests/org/jetbrains/jet/modules/xml/KotlinModuleXmlGeneratorTest.java +++ b/idea/tests/org/jetbrains/jet/modules/xml/KotlinModuleXmlGeneratorTest.java @@ -41,7 +41,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { false, Collections.emptySet() ).toString(); - String expected = FileUtil.loadFile(new File("idea/testData/modules.xml/basic.xml")); + String expected = FileUtil.loadFile(new File("idea/testData/modules.xml/basic.xml"), true); assertEquals(expected, actual); } @@ -59,7 +59,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { false, Collections.singleton(new File("cp1")) ).toString(); - String expected = FileUtil.loadFile(new File("idea/testData/modules.xml/filtered.xml")); + String expected = FileUtil.loadFile(new File("idea/testData/modules.xml/filtered.xml"), true); assertEquals(expected, actual); } }