Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-08-28 11:50:44 -0400
committerEike Stepper2006-08-28 11:50:44 -0400
commitb4d71a13f6c48fae1a249971f2706952e34fa0f8 (patch)
tree88c33cb8a46aca3bba3aa67b2d5d70db01702ca9 /plugins/org.eclipse.emf.cdo.tests/src
parent064d98b7487c006120b15e8556e4e1cb79db7d3e (diff)
downloadcdo-b4d71a13f6c48fae1a249971f2706952e34fa0f8.tar.gz
cdo-b4d71a13f6c48fae1a249971f2706952e34fa0f8.tar.xz
cdo-b4d71a13f6c48fae1a249971f2706952e34fa0f8.zip
[154522] Copy from CDO resource to XMI resource does not work
https://bugs.eclipse.org/bugs/show_bug.cgi?id=154389
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/src')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/SerializationTest.java64
1 files changed, 32 insertions, 32 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 22d505e39c..510325b2ae 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
@@ -51,12 +51,12 @@ public class SerializationTest extends AbstractModel1Test
final String[] CHILDREN = { "a", "b", "c"};
final File FILE = new File("testExport.testmodel1");
- final String CONTENT = "<?xml version=\"1.0\" encoding=\"ASCII\"?>\r\n"
- + "<testmodel1:TreeNode xmi:version=\"2.0\" xmlns:xmi=\"http://www.omg.org/XMI\" xmlns:testmodel1=\"http://www.eclipse.org/emf/cdo/2006/TestModel1\" stringFeature=\"root\">\r\n" //
- + " <children stringFeature=\"a\"/>\r\n" //
- + " <children stringFeature=\"b\"/>\r\n" //
- + " <children stringFeature=\"c\"/>\r\n" //
- + "</testmodel1:TreeNode>\r\n";
+ final String CONTENT = "<?xml version=\"1.0\" encoding=\"ASCII\"?>\n"
+ + "<testmodel1:TreeNode xmi:version=\"2.0\" xmlns:xmi=\"http://www.omg.org/XMI\" xmlns:testmodel1=\"http://www.eclipse.org/emf/cdo/2006/TestModel1\" stringFeature=\"root\">\n" //
+ + " <children stringFeature=\"a\"/>\n" //
+ + " <children stringFeature=\"b\"/>\n" //
+ + " <children stringFeature=\"c\"/>\n" //
+ + "</testmodel1:TreeNode>\n";
try
{
@@ -77,8 +77,8 @@ public class SerializationTest extends AbstractModel1Test
}
{ // Verification
- String content = IOHelper.readFully(FILE);
- assertEquals(CONTENT, content.replaceAll("\r", ""));
+ String content = IOHelper.readFully(FILE).replaceAll("\r", "");
+ assertEquals(CONTENT, content);
}
}
finally
@@ -94,24 +94,24 @@ public class SerializationTest extends AbstractModel1Test
final String[] CHILDREN = { "a", "b", "c"};
final File FILE = new File("testExport.testmodel1");
- final String CONTENT = "<?xml version=\"1.0\" encoding=\"ASCII\"?>\r\n"
- + "<testmodel1:TreeNode xmi:version=\"2.0\" xmlns:xmi=\"http://www.omg.org/XMI\" xmlns:testmodel1=\"http://www.eclipse.org/emf/cdo/2006/TestModel1\" stringFeature=\"root\">\r\n" //
- + " <children stringFeature=\"a\">\r\n" //
- + " <children stringFeature=\"a\"/>\r\n" //
- + " <children stringFeature=\"b\"/>\r\n" //
- + " <children stringFeature=\"c\"/>\r\n" //
- + " </children>\r\n" //
- + " <children stringFeature=\"b\">\r\n" //
- + " <children stringFeature=\"a\"/>\r\n" //
- + " <children stringFeature=\"b\"/>\r\n" //
- + " <children stringFeature=\"c\"/>\r\n" //
- + " </children>\r\n" //
- + " <children stringFeature=\"c\">\r\n" //
- + " <children stringFeature=\"a\"/>\r\n" //
- + " <children stringFeature=\"b\"/>\r\n" //
- + " <children stringFeature=\"c\"/>\r\n" //
- + " </children>\r\n" //
- + "</testmodel1:TreeNode>\r\n";
+ final String CONTENT = "<?xml version=\"1.0\" encoding=\"ASCII\"?>\n"
+ + "<testmodel1:TreeNode xmi:version=\"2.0\" xmlns:xmi=\"http://www.omg.org/XMI\" xmlns:testmodel1=\"http://www.eclipse.org/emf/cdo/2006/TestModel1\" stringFeature=\"root\">\n" //
+ + " <children stringFeature=\"a\">\n" //
+ + " <children stringFeature=\"a\"/>\n" //
+ + " <children stringFeature=\"b\"/>\n" //
+ + " <children stringFeature=\"c\"/>\n" //
+ + " </children>\n" //
+ + " <children stringFeature=\"b\">\n" //
+ + " <children stringFeature=\"a\"/>\n" //
+ + " <children stringFeature=\"b\"/>\n" //
+ + " <children stringFeature=\"c\"/>\n" //
+ + " </children>\n" //
+ + " <children stringFeature=\"c\">\n" //
+ + " <children stringFeature=\"a\"/>\n" //
+ + " <children stringFeature=\"b\"/>\n" //
+ + " <children stringFeature=\"c\"/>\n" //
+ + " </children>\n" //
+ + "</testmodel1:TreeNode>\n";
try
{
@@ -134,8 +134,8 @@ public class SerializationTest extends AbstractModel1Test
}
{ // Verification
- String content = IOHelper.readFully(FILE);
- assertEquals(CONTENT, content.replaceAll("\r", ""));
+ String content = IOHelper.readFully(FILE).replaceAll("\r", "");
+ assertEquals(CONTENT, content);
}
}
finally
@@ -151,10 +151,10 @@ public class SerializationTest extends AbstractModel1Test
final String[] CHILDREN = { "a", "b", "c"};
final File FILE = new File("testExport.testmodel1");
- final String CONTENT = "<?xml version=\"1.0\" encoding=\"ASCII\"?>\r\n"
- + "<testmodel1:TreeNode xmi:version=\"2.0\" xmlns:xmi=\"http://www.omg.org/XMI\" xmlns:testmodel1=\"http://www.eclipse.org/emf/cdo/2006/TestModel1\" stringFeature=\"root\">\r\n"
- + " <children stringFeature=\"a\"/>\r\n" + " <children stringFeature=\"b\"/>\r\n"
- + " <children stringFeature=\"c\"/>\r\n" + "</testmodel1:TreeNode>\r\n";
+ final String CONTENT = "<?xml version=\"1.0\" encoding=\"ASCII\"?>\n"
+ + "<testmodel1:TreeNode xmi:version=\"2.0\" xmlns:xmi=\"http://www.omg.org/XMI\" xmlns:testmodel1=\"http://www.eclipse.org/emf/cdo/2006/TestModel1\" stringFeature=\"root\">\n"
+ + " <children stringFeature=\"a\"/>\n" + " <children stringFeature=\"b\"/>\n"
+ + " <children stringFeature=\"c\"/>\n" + "</testmodel1:TreeNode>\n";
try
{

Back to the top