diff --git a/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java b/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java index 22d09abd219..398b6fdae22 100644 --- a/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java +++ b/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java @@ -25,7 +25,6 @@ import org.jetbrains.jet.cli.common.messages.MessageCollector; import org.jetbrains.jet.cli.common.messages.MessageRenderer; import org.jetbrains.jet.cli.common.modules.ModuleDescription; import org.jetbrains.jet.cli.common.modules.ModuleXmlParser; -import org.jetbrains.jet.utils.Printer; import java.io.File; import java.io.IOException; @@ -46,9 +45,8 @@ public abstract class AbstractModuleXmlParserTest extends TestCase { }); StringBuilder sb = new StringBuilder(); - Printer p = new Printer(sb); for (ModuleDescription description : result) { - p.println(description); + sb.append(description).append("\n"); } String actual = sb.toString(); diff --git a/idea/tests/org/jetbrains/jet/modules/xml/KotlinModuleXmlGeneratorTest.java b/idea/tests/org/jetbrains/jet/modules/xml/KotlinModuleXmlGeneratorTest.java index d6e2635e1ad..03f528a2bb3 100644 --- a/idea/tests/org/jetbrains/jet/modules/xml/KotlinModuleXmlGeneratorTest.java +++ b/idea/tests/org/jetbrains/jet/modules/xml/KotlinModuleXmlGeneratorTest.java @@ -17,6 +17,7 @@ package org.jetbrains.jet.modules.xml; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.testFramework.UsefulTestCase; import junit.framework.TestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionGenerator; @@ -41,8 +42,8 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { false, Collections.emptySet() ).toString(); - String expected = FileUtil.loadFile(new File("idea/testData/modules.xml/basic.xml"), true); - assertEquals(expected, actual); + String expected = FileUtil.loadFile(new File("idea/testData/modules.xml/basic.xml")); + UsefulTestCase.assertSameLines(expected, actual); } public void testFiltered() throws Exception { @@ -59,7 +60,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"), true); - assertEquals(expected, actual); + String expected = FileUtil.loadFile(new File("idea/testData/modules.xml/filtered.xml")); + UsefulTestCase.assertSameLines(expected, actual); } }