summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-08-13 12:47:20 (EDT)
committerEike Stepper2006-08-13 12:47:20 (EDT)
commit9ecd682b10cf0336bd5d06e0dac7078c2c8e10b9 (patch)
tree2ab0c83015abf391f819495c6d108a7c786c7217
parent9ab034ae86e54fcc64ba1718a1b61e7fd5792b6b (diff)
downloadcdo-9ecd682b10cf0336bd5d06e0dac7078c2c8e10b9.zip
cdo-9ecd682b10cf0336bd5d06e0dac7078c2c8e10b9.tar.gz
cdo-9ecd682b10cf0336bd5d06e0dac7078c2c8e10b9.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/launches/CDO Basic Test.launch (renamed from plugins/org.eclipse.emf.cdo.tests/launches/BasicTest.launch)6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/BasicTest.java43
2 files changed, 25 insertions, 24 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/launches/BasicTest.launch b/plugins/org.eclipse.emf.cdo.tests/launches/CDO Basic Test.launch
index ca18dc7..8f86dbf 100644
--- a/plugins/org.eclipse.emf.cdo.tests/launches/BasicTest.launch
+++ b/plugins/org.eclipse.emf.cdo.tests/launches/CDO Basic Test.launch
@@ -15,15 +15,15 @@
<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.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="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<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.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"/>
<booleanAttribute key="clearws" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.model1.BasicTest"/>
<stringAttribute key="pde.version" value="3.2a"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcdo.test.mode=client-separated-server"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
<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/BasicTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/BasicTest.java
index 9658575..1ac2d45 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/BasicTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/BasicTest.java
@@ -48,18 +48,19 @@ public class BasicTest extends AbstractModel1Test
{
final String RESOURCE = "/test/res";
final String ROOT = "root";
- final String[] CHILDREN_A = { "a1", "a2", "a3", "a4"};
- final String[] CHILDREN_B = { "b1", "b2", "b3", "b4"};
+ final String[] PATH_A = { "a1", "a2", "a3", "a4"};
+ final String[] PATH_B = { "b1", "b2", "b3", "b4"};
// Execution
{
TreeNode root = createNode(ROOT);
+
TreeNode a = root;
- for (String name : CHILDREN_A)
+ for (String name : PATH_A)
a = createNode(name, a);
TreeNode b = root;
- for (String name : CHILDREN_B)
+ for (String name : PATH_B)
b = createNode(name, b);
saveRoot(root, RESOURCE);
@@ -69,8 +70,8 @@ public class BasicTest extends AbstractModel1Test
{
TreeNode root = (TreeNode) loadRoot(RESOURCE);
assertNode(ROOT, root);
- assertPath(CHILDREN_A, root);
- assertPath(CHILDREN_B, root);
+ assertPath(PATH_A, root);
+ assertPath(PATH_B, root);
}
}
@@ -78,18 +79,19 @@ public class BasicTest extends AbstractModel1Test
{
final String RESOURCE = "/test/res";
final String ROOT = "root";
- final String[] CHILDREN_A = { "a1", "a2", "a3", "a4"};
- final String[] CHILDREN_B = { "b1", "b2", "b3", "b4"};
+ final String[] PATH_A = { "a1", "a2", "a3", "a4"};
+ final String[] PATH_B = { "b1", "b2", "b3", "b4"};
// Execution
{
TreeNode root = createNode(ROOT);
+
TreeNode a = root;
- for (String name : CHILDREN_A)
+ for (String name : PATH_A)
a = createNode(name, a);
TreeNode b = root;
- for (String name : CHILDREN_B)
+ for (String name : PATH_B)
b = createNode(name, b);
a.getReferences().add(b);
@@ -101,9 +103,9 @@ public class BasicTest extends AbstractModel1Test
TreeNode root = (TreeNode) loadRoot(RESOURCE);
assertNode(ROOT, root);
- TreeNode a = findPath(CHILDREN_A, root);
- TreeNode b = findPath(CHILDREN_B, root); // PRE-LOAD
- assertNode(CHILDREN_B[3], (TreeNode) a.getReferences().get(0));
+ TreeNode a = findPath(PATH_A, root);
+ TreeNode b = findPath(PATH_B, root);
+ assertNode(PATH_B[3], (TreeNode) a.getReferences().get(0));
}
}
@@ -111,18 +113,19 @@ public class BasicTest extends AbstractModel1Test
{
final String RESOURCE = "/test/res";
final String ROOT = "root";
- final String[] CHILDREN_A = { "a1", "a2", "a3", "a4"};
- final String[] CHILDREN_B = { "b1", "b2", "b3", "b4"};
+ final String[] PATH_A = { "a1", "a2", "a3", "a4"};
+ final String[] PATH_B = { "b1", "b2", "b3", "b4"};
// Execution
{
TreeNode root = createNode(ROOT);
+
TreeNode a = root;
- for (String name : CHILDREN_A)
+ for (String name : PATH_A)
a = createNode(name, a);
TreeNode b = root;
- for (String name : CHILDREN_B)
+ for (String name : PATH_B)
b = createNode(name, b);
a.getReferences().add(b);
@@ -134,11 +137,9 @@ public class BasicTest extends AbstractModel1Test
TreeNode root = (TreeNode) loadRoot(RESOURCE);
assertNode(ROOT, root);
- TreeNode a = findPath(CHILDREN_A, root);
- // DO NOT LOAD BY CONTAINMENT:
- // TreeNode b = findPath(CHILDREN_B, root);
+ TreeNode a = findPath(PATH_A, root);
TreeNode b = (TreeNode) a.getReferences().get(0);
- assertNode(CHILDREN_B[3], b);
+ assertNode(PATH_B[3], b);
}
}
}