Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java52
1 files changed, 26 insertions, 26 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java
index 97d8ab4ae6..8c9d2446ca 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java
@@ -45,7 +45,7 @@ public class MergingTest extends AbstractCDOTest
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction(mainBranch);
- CDOResource resource = transaction.createResource("/res");
+ CDOResource resource = transaction.createResource(getResourcePath("/res"));
EList<EObject> contents = resource.getContents();
addCompany(contents);
addCompany(contents);
@@ -91,7 +91,7 @@ public class MergingTest extends AbstractCDOTest
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction(mainBranch);
- CDOResource resource = transaction.createResource("/res");
+ CDOResource resource = transaction.createResource(getResourcePath("/res"));
EList<EObject> contents = resource.getContents();
addCompany(contents);
addCompany(contents);
@@ -116,7 +116,7 @@ public class MergingTest extends AbstractCDOTest
sleep(10);
CDOTransaction tx1 = session.openTransaction(source1);
- CDOResource res1 = tx1.getResource("/res");
+ CDOResource res1 = tx1.getResource(getResourcePath("/res"));
EList<EObject> contents1 = res1.getContents();
addCompany(contents1);
addCompany(contents1);
@@ -150,7 +150,7 @@ public class MergingTest extends AbstractCDOTest
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction(mainBranch);
- CDOResource resource = transaction.createResource("/res");
+ CDOResource resource = transaction.createResource(getResourcePath("/res"));
EList<EObject> contents = resource.getContents();
Company company0 = addCompany(contents);
Company company1 = addCompany(contents);
@@ -175,7 +175,7 @@ public class MergingTest extends AbstractCDOTest
sleep(10);
CDOTransaction tx1 = session.openTransaction(source1);
- CDOResource res1 = tx1.getResource("/res");
+ CDOResource res1 = tx1.getResource(getResourcePath("/res"));
EList<EObject> contents1 = res1.getContents();
addCompany(contents1);
addCompany(contents1);
@@ -199,7 +199,7 @@ public class MergingTest extends AbstractCDOTest
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction(mainBranch);
- CDOResource resource = transaction.createResource("/res");
+ CDOResource resource = transaction.createResource(getResourcePath("/res"));
EList<EObject> contents = resource.getContents();
Company company0 = addCompany(contents);
Company company1 = addCompany(contents);
@@ -225,7 +225,7 @@ public class MergingTest extends AbstractCDOTest
{
sleep(10);
CDOTransaction tx1 = session.openTransaction(source1);
- CDOResource res1 = tx1.getResource("/res");
+ CDOResource res1 = tx1.getResource(getResourcePath("/res"));
EList<EObject> contents1 = res1.getContents();
addCompany(contents1);
addCompany(contents1);
@@ -239,7 +239,7 @@ public class MergingTest extends AbstractCDOTest
{
sleep(10);
CDOTransaction tx1 = session.openTransaction(source1);
- CDOResource res1 = tx1.getResource("/res");
+ CDOResource res1 = tx1.getResource(getResourcePath("/res"));
EList<EObject> contents1 = res1.getContents();
addCompany(contents1);
commitAndSync(tx1, transaction);
@@ -274,7 +274,7 @@ public class MergingTest extends AbstractCDOTest
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction(mainBranch);
- CDOResource resource = transaction.createResource("/res");
+ CDOResource resource = transaction.createResource(getResourcePath("/res"));
EList<EObject> contents = resource.getContents();
addCompany(contents);
addCompany(contents);
@@ -300,7 +300,7 @@ public class MergingTest extends AbstractCDOTest
sleep(10);
CDOTransaction tx1 = session.openTransaction(source1);
- CDOResource res1 = tx1.getResource("/res");
+ CDOResource res1 = tx1.getResource(getResourcePath("/res"));
EList<EObject> contents1 = res1.getContents();
addCompany(contents1);
addCompany(contents1);
@@ -312,7 +312,7 @@ public class MergingTest extends AbstractCDOTest
sleep(10);
CDOTransaction tx2 = session.openTransaction(source2);
- CDOResource res2 = tx2.getResource("/res");
+ CDOResource res2 = tx2.getResource(getResourcePath("/res"));
EList<EObject> contents2 = res2.getContents();
addCompany(contents2);
commitAndSync(tx2, transaction);
@@ -346,7 +346,7 @@ public class MergingTest extends AbstractCDOTest
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction(mainBranch);
- CDOResource resource = transaction.createResource("/res");
+ CDOResource resource = transaction.createResource(getResourcePath("/res"));
EList<EObject> contents = resource.getContents();
addCompany(contents);
addCompany(contents);
@@ -372,7 +372,7 @@ public class MergingTest extends AbstractCDOTest
sleep(10);
CDOTransaction tx1 = session.openTransaction(source1);
- CDOResource res1 = tx1.getResource("/res");
+ CDOResource res1 = tx1.getResource(getResourcePath("/res"));
EList<EObject> contents1 = res1.getContents();
addCompany(contents1);
addCompany(contents1);
@@ -384,7 +384,7 @@ public class MergingTest extends AbstractCDOTest
sleep(10);
CDOTransaction tx2 = session.openTransaction(source2);
- CDOResource res2 = tx2.getResource("/res");
+ CDOResource res2 = tx2.getResource(getResourcePath("/res"));
EList<EObject> contents2 = res2.getContents();
addCompany(contents2);
commitAndSync(tx2, transaction);
@@ -423,7 +423,7 @@ public class MergingTest extends AbstractCDOTest
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction(mainBranch);
- CDOResource resource = transaction.createResource("/res" + run);
+ CDOResource resource = transaction.createResource(getResourcePath(("/res" + run)));
EList<EObject> contents = resource.getContents();
addCompany(contents);
addCompany(contents);
@@ -435,7 +435,7 @@ public class MergingTest extends AbstractCDOTest
sleep(10);
CDOTransaction tx1 = session.openTransaction(source);
- CDOResource res1 = tx1.getResource("/res" + run);
+ CDOResource res1 = tx1.getResource(getResourcePath("/res" + run));
EList<EObject> contents1 = res1.getContents();
((Company)contents1.get(0)).setName("Company0");
((Company)contents1.get(1)).setName("Company1");
@@ -466,7 +466,7 @@ public class MergingTest extends AbstractCDOTest
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction(mainBranch);
- CDOResource resource = transaction.createResource("/res");
+ CDOResource resource = transaction.createResource(getResourcePath("/res"));
EList<EObject> contents = resource.getContents();
Company company0 = addCompany(contents);
Company company1 = addCompany(contents);
@@ -478,7 +478,7 @@ public class MergingTest extends AbstractCDOTest
sleep(10);
CDOTransaction tx1 = session.openTransaction(source);
- CDOResource res1 = tx1.getResource("/res");
+ CDOResource res1 = tx1.getResource(getResourcePath("/res"));
EList<EObject> contents1 = res1.getContents();
((Company)contents1.get(0)).setName("Company0");
((Company)contents1.get(1)).setName("Company1");
@@ -511,7 +511,7 @@ public class MergingTest extends AbstractCDOTest
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction(mainBranch);
- CDOResource resource = transaction.createResource("/res");
+ CDOResource resource = transaction.createResource(getResourcePath("/res"));
EList<EObject> contents = resource.getContents();
Company company0 = addCompany(contents);
Company company1 = addCompany(contents);
@@ -523,7 +523,7 @@ public class MergingTest extends AbstractCDOTest
sleep(10);
CDOTransaction tx1 = session.openTransaction(source);
- CDOResource res1 = tx1.getResource("/res");
+ CDOResource res1 = tx1.getResource(getResourcePath("/res"));
EList<EObject> contents1 = res1.getContents();
((Company)contents1.get(0)).setName("Company0");
contents1.remove(1);
@@ -561,7 +561,7 @@ public class MergingTest extends AbstractCDOTest
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction(mainBranch);
- CDOResource resource = transaction.createResource("/res");
+ CDOResource resource = transaction.createResource(getResourcePath("/res"));
EList<EObject> contents = resource.getContents();
addCompany(contents);
addCompany(contents);
@@ -573,7 +573,7 @@ public class MergingTest extends AbstractCDOTest
sleep(10);
CDOTransaction tx1 = session.openTransaction(source);
- CDOResource res1 = tx1.getResource("/res");
+ CDOResource res1 = tx1.getResource(getResourcePath("/res"));
EList<EObject> contents1 = res1.getContents();
((Company)contents1.get(0)).setName("Company0");
contents1.remove(1);
@@ -600,7 +600,7 @@ public class MergingTest extends AbstractCDOTest
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction(mainBranch);
- CDOResource resource = transaction.createResource("/res");
+ CDOResource resource = transaction.createResource(getResourcePath("/res"));
EList<EObject> contents = resource.getContents();
Company company0 = addCompany(contents);
Company company1 = addCompany(contents);
@@ -613,7 +613,7 @@ public class MergingTest extends AbstractCDOTest
{
sleep(10);
CDOTransaction tx1 = session.openTransaction(source1);
- CDOResource res1 = tx1.getResource("/res");
+ CDOResource res1 = tx1.getResource(getResourcePath("/res"));
EList<EObject> contents1 = res1.getContents();
((Company)contents1.get(0)).setName("C0");
((Company)contents1.get(1)).setName("C1");
@@ -649,7 +649,7 @@ public class MergingTest extends AbstractCDOTest
CDOBranch mainBranch = session.getBranchManager().getMainBranch();
CDOTransaction transaction = session.openTransaction(mainBranch);
- CDOResource resource = transaction.createResource("/res");
+ CDOResource resource = transaction.createResource(getResourcePath("/res"));
EList<EObject> contents = resource.getContents();
Company company0 = addCompany(contents);
Company company1 = addCompany(contents);
@@ -662,7 +662,7 @@ public class MergingTest extends AbstractCDOTest
{
sleep(10);
CDOTransaction tx1 = session.openTransaction(source1);
- CDOResource res1 = tx1.getResource("/res");
+ CDOResource res1 = tx1.getResource(getResourcePath("/res"));
EList<EObject> contents1 = res1.getContents();
((Company)contents1.get(0)).setName("C0");
((Company)contents1.get(1)).setName("C1");

Back to the top