From e8a203939622ad72491e526528b9638d29719a5b Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Fri, 7 Nov 2014 13:32:23 +0300
Subject: [PATCH] Use JetTestUtils.assertEqualsToFile in usages tests to
 simplify fixing test data

---
 .../findUsages/kotlin/conventions/plusAssign.results.txt      | 4 ++--
 .../findUsages/kotlin/conventions/unaryMinus.results.txt      | 2 +-
 .../jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/idea/testData/findUsages/kotlin/conventions/plusAssign.results.txt b/idea/testData/findUsages/kotlin/conventions/plusAssign.results.txt
index d348956f494..1a1195222cd 100644
--- a/idea/testData/findUsages/kotlin/conventions/plusAssign.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/plusAssign.results.txt
@@ -1,3 +1,3 @@
-Function call (16: 7) a.plusAssign(1)
 Function call (10: 14) this += a.n
-Function call (17: 7) a += 1
+Function call (16: 7) a.plusAssign(1)
+Function call (17: 7) a += 1
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/unaryMinus.results.txt b/idea/testData/findUsages/kotlin/conventions/unaryMinus.results.txt
index 25bd7f5f48b..f38ad70bc7e 100644
--- a/idea/testData/findUsages/kotlin/conventions/unaryMinus.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/unaryMinus.results.txt
@@ -1,2 +1,2 @@
-Function call (9: 10) A(1).minus()
 Function call (10: 5) -A(1)
+Function call (9: 10) A(1).minus()
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java b/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java
index f017c272f27..3ec3fe0c409 100644
--- a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java
+++ b/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java
@@ -48,6 +48,7 @@ import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.InTextDirectivesUtils;
+import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
 import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
@@ -359,8 +360,7 @@ public abstract class AbstractJetFindUsagesTest extends JetLightCodeInsightFixtu
         };
 
         Collection<String> finalUsages = Ordering.natural().sortedCopy(Collections2.transform(filteredUsages, convertToString));
-        String expectedText = FileUtil.loadFile(new File(rootPath, prefix + "results.txt"), true);
-        assertOrderedEquals(finalUsages, Ordering.natural().sortedCopy(StringUtil.split(expectedText, "\n")));
+        JetTestUtils.assertEqualsToFile(new File(rootPath, prefix + "results.txt"), StringUtil.join(finalUsages, "\n"));
     }
 
     private Collection<UsageInfo> findUsages(@NotNull PsiElement targetElement, @Nullable FindUsagesOptions options) {