diff options
-rw-r--r-- | plugins/org.eclipse.emf.cdo.tests/launches/CDO Serialization Test.launch | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/SerializationTest.java | 64 |
2 files changed, 36 insertions, 36 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/launches/CDO Serialization Test.launch b/plugins/org.eclipse.emf.cdo.tests/launches/CDO Serialization Test.launch index 07fcdbcffa..8c9fe1b62e 100644 --- a/plugins/org.eclipse.emf.cdo.tests/launches/CDO Serialization Test.launch +++ b/plugins/org.eclipse.emf.cdo.tests/launches/CDO Serialization Test.launch @@ -9,21 +9,21 @@ <listEntry value="org.eclipse.debug.ui.launchGroup.run"/> <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> </listAttribute> -<stringAttribute key="selected_target_plugins" value="com.ibm.icu,org.apache.ant,org.eclipse.ant.core,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.emf.common,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.osgi,org.eclipse.update.configurator,org.junit"/> +<stringAttribute key="selected_target_plugins" value="com.ibm.icu,org.apache.ant,org.eclipse.ant.core,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.emf.common,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.ocl,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.osgi,org.eclipse.update.configurator,org.junit"/> <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> <booleanAttribute key="automaticValidate" value="true"/> <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> <booleanAttribute key="automaticAdd" value="false"/> <stringAttribute key="checked" value="[NONE]"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.jdbc,org.eclipse.net4j.spring,org.eclipse.net4j.socket,org.eclipse.net4j.core,org.eclipse.net4j.spring.db,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.mapping,org.eclipse.emf.cdo.core,org.eclipse.emf.cdo.client,org.eclipse.net4j.util,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.client.ocl,org.eclipse.net4j.embedded,org.eclipse.emf.cdo.jdbc.derby,org.eclipse.emf.cdo.dbgen.derby,org.eclipse.emf.cdo.dbgen.oracle,org.eclipse.emf.cdo.jdbc.hsqldb,org.eclipse.emf.cdo.jdbc.mysql,org.eclipse.emf.cdo.dbgen.ansi92,org.eclipse.emf.cdo.dbgen.mysql,org.eclipse.emf.cdo.dbgen.hsqldb"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.jdbc,org.eclipse.net4j.spring,org.eclipse.net4j.socket,org.eclipse.net4j.core,org.eclipse.net4j.spring.db,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.ocl,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.mapping,org.eclipse.emf.cdo.core,org.eclipse.emf.cdo.client,org.eclipse.net4j.util,org.eclipse.emf.cdo.client.ocl,org.eclipse.emf.cdo.server,org.eclipse.net4j.embedded,org.eclipse.emf.cdo.jdbc.derby,org.eclipse.emf.cdo.dbgen.derby,org.eclipse.emf.cdo.dbgen.oracle,org.eclipse.emf.cdo.jdbc.hsqldb,org.eclipse.emf.cdo.jdbc.mysql,org.eclipse.emf.cdo.dbgen.ansi92,org.eclipse.emf.cdo.dbgen.mysql,org.eclipse.emf.cdo.dbgen.hsqldb"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> <booleanAttribute key="clearws" value="true"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.model1.SerializationTest"/> <stringAttribute key="pde.version" value="3.2a"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcdo.test.mode=client-separated-server"/> <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcdo.test.mode=client-separated-server"/> <booleanAttribute key="default" value="false"/> <booleanAttribute key="clearConfig" value="true"/> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> 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 { |