From ec2613db72023e99f6e592491ba26549a34d37ce Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 31 Oct 2014 17:43:55 +0300 Subject: [PATCH] Do the check with converted line separators --- .../src/org/jetbrains/kotlin/AntTaskJsTest.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java index 8d481f18dee..40a948170cd 100644 --- a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java +++ b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java @@ -65,11 +65,15 @@ public class AntTaskJsTest extends AntTaskBaseTest { private static void checkFilePrefixPostfix(@NotNull File file, @Nullable File prefix, @Nullable File postfix) throws IOException { String fileContent = FileUtil.loadFile(file, true); - String prefixContent = FileUtilsPackage.readTextOrEmpty(prefix); - assertTrue(fileContent.startsWith(prefixContent)); + if (prefix != null) { + String prefixContent = FileUtil.loadFile(prefix, true); + assertTrue(fileContent.startsWith(prefixContent)); + } - String postfixContent = FileUtilsPackage.readTextOrEmpty(postfix); - assertTrue(fileContent.endsWith(postfixContent)); + if (postfix != null) { + String postfixContent = FileUtil.loadFile(postfix, true); + assertTrue(fileContent.endsWith(postfixContent)); + } } @Test