From 95ca96cce5064040a00f935e21ae731a7db0a807 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Wed, 30 Sep 2009 14:52:58 +0400
Subject: [PATCH] fixed tests on linux - 3

---
 .../after/Test.java                                |  0
 .../before/Test.java                               |  0
 .../intellij/refactoring/TurnRefsToSuperTest.java  |  2 +-
 .../maven/dom/MavenModelReadingAndWritingTest.java | 48 +++++++++++-----------
 4 files changed, 25 insertions(+), 25 deletions(-)
 rename java/java-tests/testData/refactoring/turnRefsToSuper/{IDEADEV5517Noop => IDEADEV5517NOOP}/after/Test.java (100%)
 rename java/java-tests/testData/refactoring/turnRefsToSuper/{IDEADEV5517Noop => IDEADEV5517NOOP}/before/Test.java (100%)

diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/IDEADEV5517Noop/after/Test.java b/java/java-tests/testData/refactoring/turnRefsToSuper/IDEADEV5517NOOP/after/Test.java
similarity index 100%
rename from java/java-tests/testData/refactoring/turnRefsToSuper/IDEADEV5517Noop/after/Test.java
rename to java/java-tests/testData/refactoring/turnRefsToSuper/IDEADEV5517NOOP/after/Test.java
diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/IDEADEV5517Noop/before/Test.java b/java/java-tests/testData/refactoring/turnRefsToSuper/IDEADEV5517NOOP/before/Test.java
similarity index 100%
rename from java/java-tests/testData/refactoring/turnRefsToSuper/IDEADEV5517Noop/before/Test.java
rename to java/java-tests/testData/refactoring/turnRefsToSuper/IDEADEV5517NOOP/before/Test.java
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java b/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java
index d8a9a421f2..629204a248 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java
@@ -101,7 +101,7 @@ public class TurnRefsToSuperTest extends MultiFileTestCase {
     doTest("Xyz", "Xint", false);
   }
 
-  public void testIDEADEV5517Noop() throws Exception {
+  public void testIDEADEV5517NOOP() throws Exception {
     doTest("Xyz", "Xint", false);
   }
 
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelReadingAndWritingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelReadingAndWritingTest.java
index bc9d3bfc4f..1aef5921d0 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelReadingAndWritingTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelReadingAndWritingTest.java
@@ -43,15 +43,15 @@ public class MavenModelReadingAndWritingTest extends MavenImportingTestCase {
       }
     }, null, null);
 
-    assertEquals("<?xml version=\"1.0\"?>\r\n" +
-                 "<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n" +
-                 "         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\r\n" +
-                 "    <modelVersion>4.0.0</modelVersion>\r\n" +
-                 "    <groupId>foo</groupId>\r\n" +
-                 "    <artifactId>bar</artifactId>\r\n" +
-                 "    <version>baz</version>\r\n" +
-                 "</project>",
-                 VfsUtil.loadText(myProjectPom));
+    assertSameLines("<?xml version=\"1.0\"?>\r\n" +
+                    "<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n" +
+                    "         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\r\n" +
+                    "    <modelVersion>4.0.0</modelVersion>\r\n" +
+                    "    <groupId>foo</groupId>\r\n" +
+                    "    <artifactId>bar</artifactId>\r\n" +
+                    "    <version>baz</version>\r\n" +
+                    "</project>",
+                    VfsUtil.loadText(myProjectPom));
   }
 
   public void testAddingADependency() throws Exception {
@@ -68,21 +68,21 @@ public class MavenModelReadingAndWritingTest extends MavenImportingTestCase {
       }
     }, null, null);
 
-    assertEquals("<?xml version=\"1.0\"?>\r\n" +
-                 "<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n" +
-                 "         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\r\n" +
-                 "    <modelVersion>4.0.0</modelVersion>\r\n" +
-                 "    <groupId>test</groupId>\r\n" +
-                 "    <artifactId>project</artifactId>\r\n" +
-                 "    <version>1</version>\r\n" +
-                 "    <dependencies>\r\n" +
-                 "        <dependency>\r\n" +
-                 "            <groupId>group</groupId>\r\n" +
-                 "            <artifactId>artifact</artifactId>\r\n" +
-                 "            <version>version</version>\r\n" +
-                 "        </dependency>\r\n" +
-                 "    </dependencies>\r\n" +
-                 "</project>", VfsUtil.loadText(myProjectPom));
+    assertSameLines("<?xml version=\"1.0\"?>\r\n" +
+                    "<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\r\n" +
+                    "         xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\r\n" +
+                    "    <modelVersion>4.0.0</modelVersion>\r\n" +
+                    "    <groupId>test</groupId>\r\n" +
+                    "    <artifactId>project</artifactId>\r\n" +
+                    "    <version>1</version>\r\n" +
+                    "    <dependencies>\r\n" +
+                    "        <dependency>\r\n" +
+                    "            <groupId>group</groupId>\r\n" +
+                    "            <artifactId>artifact</artifactId>\r\n" +
+                    "            <version>version</version>\r\n" +
+                    "        </dependency>\r\n" +
+                    "    </dependencies>\r\n" +
+                    "</project>", VfsUtil.loadText(myProjectPom));
   }
 
   private MavenDomProjectModel getDomModel() {
-- 
2.11.4.GIT