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

Fix tests problems with line separators

Browse Source
This commit is contained in:
Nikolay Krasko
2013-04-30 12:48:44 +04:00
parent b0b6728c7e
commit 600219d193
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java
+1 -3
View File
@@ -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();
idea/tests/org/jetbrains/jet/modules/xml/KotlinModuleXmlGeneratorTest.java
+5 -4
View File
@@ -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.<File>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);
}
}