[154522] Copy from CDO resource to XMI resource does not work

https://bugs.eclipse.org/bugs/show_bug.cgi?id=154389

1 files changed, 4 insertions, 2 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/SerializationTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/SerializationTest.java
index 24e440a490..22d505e39c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/SerializationTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/SerializationTest.java
@@ -78,7 +78,7 @@ public class SerializationTest extends AbstractModel1Test
 
       { // Verification
         String content = IOHelper.readFully(FILE);
-        assertFileContent(CONTENT, FILE);
+        assertEquals(CONTENT, content.replaceAll("\r", ""));
       }
     }
     finally
@@ -134,7 +134,8 @@ public class SerializationTest extends AbstractModel1Test
       }
 
       { // Verification
-        assertFileContent(CONTENT, FILE);
+        String content = IOHelper.readFully(FILE);
+        assertEquals(CONTENT, content.replaceAll("\r", ""));
       }
     }
     finally
@@ -220,6 +221,7 @@ public class SerializationTest extends AbstractModel1Test
     }
   }
 
+  @Deprecated
   protected void assertFileContent(String content, File file) throws IOException
   {
     String[] lines = content.split("\n");