summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-08-26 17:40:57 (EDT)
committerEike Stepper2006-08-26 17:40:57 (EDT)
commit064d98b7487c006120b15e8556e4e1cb79db7d3e (patch)
tree7064a44b43587148c9d5ecda430dc81e8d499fc4
parentfc79cba952d6d828f4ff704d6e9c71f3ade219c2 (diff)
downloadcdo-064d98b7487c006120b15e8556e4e1cb79db7d3e.zip
cdo-064d98b7487c006120b15e8556e4e1cb79db7d3e.tar.gz
cdo-064d98b7487c006120b15e8556e4e1cb79db7d3e.tar.bz2
[154522] Copy from CDO resource to XMI resource does not work
https://bugs.eclipse.org/bugs/show_bug.cgi?id=154389
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/SerializationTest.java6
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 24e440a..22d505e 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");