diff options
| author | Caspar De Groot | 2011-02-16 02:34:48 +0000 |
|---|---|---|
| committer | Caspar De Groot | 2011-02-16 02:34:48 +0000 |
| commit | 8c4a98473e40531f1b636fe56233debe96381e55 (patch) | |
| tree | c3113d7ba9fc7470098d4c8a650737a54592da47 | |
| parent | b78733e004bde1eae626839e58112f2804db0eca (diff) | |
| download | cdo-8c4a98473e40531f1b636fe56233debe96381e55.tar.gz cdo-8c4a98473e40531f1b636fe56233debe96381e55.tar.xz cdo-8c4a98473e40531f1b636fe56233debe96381e55.zip | |
[Bug 337180] Use a unique resource name per test method
https://bugs.eclipse.org/bugs/show_bug.cgi?id=337180
186 files changed, 1095 insertions, 1057 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java index 47e91c49c3..bd00c16625 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java @@ -195,4 +195,35 @@ public abstract class AbstractCDOTest extends ConfigTest } } } + + /** + * Constructs a test-specific resource path of the format "/TestClass_testMethod/resourceName". Using this instead of + * (just) a hardcoded name for the test resource, ensures that the test method is isolated from all others at the + * resource level. + * + * @param resourceName + * - the test-local name of the resource (or null if one wants to receive the path of the test-local resource + * folder + * @return the full path of the resource + */ + protected String getResourcePath(String resourceName) + { + StringBuilder builder = new StringBuilder(); + builder.append('/'); + builder.append(getClass().getSimpleName()); // Name of this test class + builder.append('_'); + builder.append(getName()); // Name of this test method + + if (resourceName == null || resourceName.length() == 0 || resourceName.charAt(0) != '/') + { + builder.append('/'); + } + + if (resourceName != null) + { + builder.append(resourceName); + } + + return builder.toString(); + } } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AdapterManagerTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AdapterManagerTest.java index acd707b64f..78c0ececa4 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AdapterManagerTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AdapterManagerTest.java @@ -47,7 +47,7 @@ public class AdapterManagerTest extends AbstractCDOTest transaction.options().setCacheReferenceType(ReferenceType.WEAK); transaction.options().setStrongReferencePolicy(CDOAdapterPolicy.NONE); - transaction.createResource("/resA").getContents().add(companyA); + transaction.createResource(getResourcePath("/resA")).getContents().add(companyA); msg("Committing"); transaction.commit(); @@ -81,7 +81,7 @@ public class AdapterManagerTest extends AbstractCDOTest transaction.options().setCacheReferenceType(ReferenceType.WEAK); transaction.options().setStrongReferencePolicy(CDOAdapterPolicy.ALL); - transaction.createResource("/resA").getContents().add(companyA); + transaction.createResource(getResourcePath("/resA")).getContents().add(companyA); msg("Committing"); transaction.commit(); @@ -121,7 +121,7 @@ public class AdapterManagerTest extends AbstractCDOTest transaction.options().setCacheReferenceType(ReferenceType.WEAK); transaction.options().setStrongReferencePolicy(CDOAdapterPolicy.ALL); - transaction.createResource("/resA").getContents().add(companyA); + transaction.createResource(getResourcePath("/resA")).getContents().add(companyA); msg("Committing"); transaction.commit(); @@ -163,7 +163,7 @@ public class AdapterManagerTest extends AbstractCDOTest transaction.options().setCacheReferenceType(ReferenceType.WEAK); transaction.options().setStrongReferencePolicy(CDOAdapterPolicy.ALL); - transaction.createResource("/resA").getContents().add(companyA); + transaction.createResource(getResourcePath("/resA")).getContents().add(companyA); msg("Committing"); transaction.commit(); @@ -178,7 +178,7 @@ public class AdapterManagerTest extends AbstractCDOTest Company companyB = (Company)CDOUtil.getEObject(transaction.getObject(id)); assertEquals(companyB, weakCompanyA.get()); companyB.setCity("Ottawa"); - transaction.getResource("/resA").getContents().remove(0); + transaction.getResource(getResourcePath("/resA")).getContents().remove(0); transaction.commit(); } } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java index 927c370f2c..eb93b50903 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java @@ -52,7 +52,7 @@ public class AttributeTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(supplier); assertEquals(true, supplier.isPreferred()); transaction.commit(); @@ -63,7 +63,7 @@ public class AttributeTest extends AbstractCDOTest { CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("/my/resource"); + CDOResource resource = view.getResource(getResourcePath("/my/resource")); Supplier supplier = (Supplier)resource.getContents().get(0); assertEquals(true, supplier.isPreferred()); view.close(); @@ -80,7 +80,7 @@ public class AttributeTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(product); assertEquals(VAT.VAT15, product.getVat()); transaction.commit(); @@ -91,7 +91,7 @@ public class AttributeTest extends AbstractCDOTest { CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("/my/resource"); + CDOResource resource = view.getResource(getResourcePath("/my/resource")); Product1 product = (Product1)resource.getContents().get(0); assertEquals(VAT.VAT15, product.getVat()); view.close(); @@ -113,7 +113,7 @@ public class AttributeTest extends AbstractCDOTest EObject genOfByteArray = packageBytes.getEFactoryInstance().create(eClass); genOfByteArray.eSet(genOfByteArray.eClass().getEStructuralFeature("bytes"), saveByteArray); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(genOfByteArray); transaction.commit(); @@ -125,7 +125,7 @@ public class AttributeTest extends AbstractCDOTest { CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("/my/resource"); + CDOResource resource = view.getResource(getResourcePath("/my/resource")); EObject genOfByteArray = resource.getContents().get(0); byte storeByteArray[] = (byte[])genOfByteArray.eGet(genOfByteArray.eClass().getEStructuralFeature("bytes")); assertEquals(storeByteArray.length, saveByteArray.length); @@ -153,7 +153,7 @@ public class AttributeTest extends AbstractCDOTest EObject genOfByteArray = packageBytes.getEFactoryInstance().create(eClass); genOfByteArray.eSet(genOfByteArray.eClass().getEStructuralFeature("bytes"), saveByteArray); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(genOfByteArray); transaction.commit(); @@ -165,7 +165,7 @@ public class AttributeTest extends AbstractCDOTest { CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("/my/resource"); + CDOResource resource = view.getResource(getResourcePath("/my/resource")); EObject genOfByteArray = resource.getContents().get(0); byte storeByteArray[] = (byte[])genOfByteArray.eGet(genOfByteArray.eClass().getEStructuralFeature("bytes")); assertEquals(0, storeByteArray.length); @@ -188,7 +188,7 @@ public class AttributeTest extends AbstractCDOTest EObject genOfByteArray = packageBytes.getEFactoryInstance().create(eClass); genOfByteArray.eSet(genOfByteArray.eClass().getEStructuralFeature("bytes"), saveByteArray); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(genOfByteArray); transaction.commit(); @@ -200,7 +200,7 @@ public class AttributeTest extends AbstractCDOTest { CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("/my/resource"); + CDOResource resource = view.getResource(getResourcePath("/my/resource")); EObject genOfByteArray = resource.getContents().get(0); byte storeByteArray[] = (byte[])genOfByteArray.eGet(genOfByteArray.eClass().getEStructuralFeature("bytes")); assertEquals(true, storeByteArray == null || storeByteArray.length == 0); @@ -228,7 +228,7 @@ public class AttributeTest extends AbstractCDOTest gen.eSet(bigDecimalFeature, bigDecimal); gen.eSet(bigIntegerFeature, bigInteger); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(gen); CDORevisionData data = CDOUtil.getCDOObject(gen).cdoRevision().data(); @@ -244,7 +244,7 @@ public class AttributeTest extends AbstractCDOTest { CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("/my/resource"); + CDOResource resource = view.getResource(getResourcePath("/my/resource")); EObject gen = resource.getContents().get(0); BigDecimal bigDecimalStore = (BigDecimal)gen.eGet(gen.eClass().getEStructuralFeature("bigDecimal")); BigInteger bigIntegerStore = (BigInteger)gen.eGet(gen.eClass().getEStructuralFeature("bigInteger")); @@ -275,7 +275,7 @@ public class AttributeTest extends AbstractCDOTest gen.eSet(bigDecimalFeature, bigDecimal); gen.eSet(bigIntegerFeature, bigInteger); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(gen); transaction.commit(); @@ -287,7 +287,7 @@ public class AttributeTest extends AbstractCDOTest { CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("/my/resource"); + CDOResource resource = view.getResource(getResourcePath("/my/resource")); EObject gen = resource.getContents().get(0); BigDecimal bigDecimalStore = (BigDecimal)gen.eGet(gen.eClass().getEStructuralFeature("bigDecimal")); BigInteger bigIntegerStore = (BigInteger)gen.eGet(gen.eClass().getEStructuralFeature("bigInteger")); @@ -378,7 +378,7 @@ public class AttributeTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(polygon); points = polygon.getPoints(); @@ -422,7 +422,7 @@ public class AttributeTest extends AbstractCDOTest session.close(); session = openSession(); transaction = session.openTransaction(); - resource = transaction.getResource("/my/resource"); + resource = transaction.getResource(getResourcePath("/my/resource")); polygon = (Polygon)resource.getContents().get(0); points = polygon.getPoints(); @@ -468,7 +468,7 @@ public class AttributeTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(polygon); points = polygon.getPoints(); @@ -502,7 +502,7 @@ public class AttributeTest extends AbstractCDOTest session.close(); session = openSession(); transaction = session.openTransaction(); - resource = transaction.getResource("/my/resource"); + resource = transaction.getResource(getResourcePath("/my/resource")); polygon = (Polygon)resource.getContents().get(0); points = polygon.getPoints(); @@ -551,7 +551,7 @@ public class AttributeTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(polygon); points = polygon.getPoints(); @@ -601,7 +601,7 @@ public class AttributeTest extends AbstractCDOTest session.close(); session = openSession(); transaction = session.openTransaction(); - resource = transaction.getResource("/my/resource"); + resource = transaction.getResource(getResourcePath("/my/resource")); polygon = (Polygon)resource.getContents().get(0); points = polygon.getPoints(); @@ -655,7 +655,7 @@ public class AttributeTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(polygon); points = polygon.getPoints(); @@ -689,7 +689,7 @@ public class AttributeTest extends AbstractCDOTest session.close(); session = openSession(); transaction = session.openTransaction(); - resource = transaction.getResource("/my/resource"); + resource = transaction.getResource(getResourcePath("/my/resource")); polygon = (PolygonWithDuplicates)resource.getContents().get(0); points = polygon.getPoints(); @@ -735,7 +735,7 @@ public class AttributeTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(polygon); points = polygon.getPoints(); @@ -769,7 +769,7 @@ public class AttributeTest extends AbstractCDOTest session.close(); session = openSession(); transaction = session.openTransaction(); - resource = transaction.getResource("/my/resource"); + resource = transaction.getResource(getResourcePath("/my/resource")); polygon = (PolygonWithDuplicates)resource.getContents().get(0); points = polygon.getPoints(); @@ -796,14 +796,14 @@ public class AttributeTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(polygon); transaction.commit(); session.close(); session = openSession(); transaction = session.openTransaction(); - resource = transaction.getResource("/my/resource"); + resource = transaction.getResource(getResourcePath("/my/resource")); EList<EObject> contents = resource.getContents(); // java.lang.ClassCastException: org.eclipse.emf.internal.cdo.revision.CDOListWithElementProxiesImpl diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTest.java index 64a2e24ed3..7c4325eeed 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTest.java @@ -62,7 +62,7 @@ public class AuditTest extends AbstractCDOTest { CDOSession session = openSession1(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); Company company = getModel1Factory().createCompany(); company.setName("ESC"); @@ -87,12 +87,12 @@ public class AuditTest extends AbstractCDOTest session = openSession2(); CDOView audit = session.openView(commitTime1); - CDOResource auditResource = audit.getResource("/res1"); + CDOResource auditResource = audit.getResource(getResourcePath("/res1")); Company auditCompany = (Company)auditResource.getContents().get(0); assertEquals("ESC", auditCompany.getName()); CDOView audit2 = session.openView(commitTime2); - CDOResource auditResource2 = audit2.getResource("/res1"); + CDOResource auditResource2 = audit2.getResource(getResourcePath("/res1")); Company auditCompany2 = (Company)auditResource2.getContents().get(0); assertEquals("Sympedia", auditCompany2.getName()); session.close(); @@ -102,7 +102,7 @@ public class AuditTest extends AbstractCDOTest { CDOSession session = openSession1(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); Company company = getModel1Factory().createCompany(); company.setName("ESC"); @@ -128,21 +128,21 @@ public class AuditTest extends AbstractCDOTest CDOView audit = session.openView(commitTime1); { - CDOResource auditResource = audit.getResource("/res1"); + CDOResource auditResource = audit.getResource(getResourcePath("/res1")); Company auditCompany = (Company)auditResource.getContents().get(0); assertEquals("ESC", auditCompany.getName()); } audit.setTimeStamp(commitTime2); { - CDOResource auditResource = audit.getResource("/res1"); + CDOResource auditResource = audit.getResource(getResourcePath("/res1")); Company auditCompany = (Company)auditResource.getContents().get(0); assertEquals("Sympedia", auditCompany.getName()); } audit.setTimeStamp(commitTime3); { - CDOResource auditResource = audit.getResource("/res1"); + CDOResource auditResource = audit.getResource(getResourcePath("/res1")); Company auditCompany = (Company)auditResource.getContents().get(0); assertEquals("Eclipse", auditCompany.getName()); } @@ -154,7 +154,7 @@ public class AuditTest extends AbstractCDOTest { CDOSession session = openSession1(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); Company company = getModel1Factory().createCompany(); company.setName("ESC"); @@ -179,7 +179,7 @@ public class AuditTest extends AbstractCDOTest session = openSession2(); CDOView audit = session.openView(commitTime1); - CDOResource auditResource = audit.getResource("/res1"); + CDOResource auditResource = audit.getResource(getResourcePath("/res1")); Company auditCompany = (Company)auditResource.getContents().get(0); assertEquals("ESC", auditCompany.getName()); @@ -195,7 +195,7 @@ public class AuditTest extends AbstractCDOTest { CDOSession session = openSession1(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(getModel1Factory().createCompany()); long commitTime1 = transaction.commit().getTimeStamp(); @@ -210,7 +210,7 @@ public class AuditTest extends AbstractCDOTest session = openSession2(); CDOView audit = session.openView(commitTime1); - CDOResource auditResource = audit.getResource("/res1"); + CDOResource auditResource = audit.getResource(getResourcePath("/res1")); assertEquals(1, auditResource.getContents().size()); audit.setTimeStamp(commitTime2); @@ -225,7 +225,7 @@ public class AuditTest extends AbstractCDOTest { CDOSession session = openSession1(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(getModel1Factory().createCompany()); resource.getContents().add(getModel1Factory().createCompany()); @@ -244,7 +244,7 @@ public class AuditTest extends AbstractCDOTest session = openSession2(); CDOView audit = session.openView(commitTime1); - CDOResource auditResource = audit.getResource("/res1"); + CDOResource auditResource = audit.getResource(getResourcePath("/res1")); assertEquals(5, auditResource.getContents().size()); audit.setTimeStamp(commitTime2); @@ -259,7 +259,7 @@ public class AuditTest extends AbstractCDOTest { CDOSession session = openSession1(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); Company company = getModel1Factory().createCompany(); company.setName("ESC"); @@ -278,7 +278,7 @@ public class AuditTest extends AbstractCDOTest session = openSession2(); CDOView audit = session.openView(commitTime1); - CDOResource auditResource = audit.getResource("/res1"); + CDOResource auditResource = audit.getResource(getResourcePath("/res1")); assertEquals(5, auditResource.getContents().size()); Company auditCompany = (Company)auditResource.getContents().get(2); @@ -305,7 +305,7 @@ public class AuditTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); GenListOfInt persistentList = Model5Factory.eINSTANCE.createGenListOfInt(); resource.getContents().add(persistentList); @@ -375,7 +375,7 @@ public class AuditTest extends AbstractCDOTest { msg("Checking timestamp " + i + " of " + timestamps.size() + ": " + timestamps.get(i)); CDOView audit = session.openView(timestamps.get(i)); - CDOResource res = audit.getResource("/res1"); + CDOResource res = audit.getResource(getResourcePath("/res1")); GenListOfInt persistentList = (GenListOfInt)res.getContents().get(0); assertEquals(joinList(history.get(i)), joinList(persistentList.getElements())); @@ -383,7 +383,7 @@ public class AuditTest extends AbstractCDOTest } CDOView view = session.openView(); - CDOResource res = view.getResource("/res1"); + CDOResource res = view.getResource(getResourcePath("/res1")); assertEquals(true, res.getContents().isEmpty()); } } @@ -403,7 +403,7 @@ public class AuditTest extends AbstractCDOTest { CDOSession session = openSession1(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); Company company = getModel1Factory().createCompany(); resource.getContents().add(company); transaction.commit(); @@ -427,7 +427,7 @@ public class AuditTest extends AbstractCDOTest try { CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); Company company = getModel1Factory().createCompany(); resource.getContents().add(company); transaction.commit(); @@ -460,7 +460,7 @@ public class AuditTest extends AbstractCDOTest try { CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); Company company = getModel1Factory().createCompany(); resource.getContents().add(company); long commitTime1 = transaction.commit().getTimeStamp(); @@ -489,22 +489,22 @@ public class AuditTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); commitTime1 = transaction.commit().getTimeStamp(); - resource.setPath("/renamed"); + resource.setPath(getResourcePath("/renamed")); commitTime2 = transaction.commit().getTimeStamp(); session.close(); } CDOSession session = openSession(); CDOView audit1 = session.openView(commitTime1); - assertEquals(true, audit1.hasResource("/my/resource")); - assertEquals(false, audit1.hasResource("/renamed")); + assertEquals(true, audit1.hasResource(getResourcePath("/my/resource"))); + assertEquals(false, audit1.hasResource(getResourcePath("/renamed"))); CDOView audit2 = session.openView(commitTime2); - assertEquals(false, audit2.hasResource("/my/resource")); - assertEquals(true, audit2.hasResource("/renamed")); + assertEquals(false, audit2.hasResource(getResourcePath("/my/resource"))); + assertEquals(true, audit2.hasResource(getResourcePath("/renamed"))); session.close(); } @@ -516,11 +516,11 @@ public class AuditTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); commitTime1 = transaction.commit().getTimeStamp(); - URI uri = URI.createURI("cdo://repo1/renamed"); - assertEquals(CDOURIUtil.createResourceURI(session, "/renamed"), uri); + URI uri = URI.createURI("cdo://repo1" + getResourcePath("/renamed")); + assertEquals(CDOURIUtil.createResourceURI(session, getResourcePath("/renamed")), uri); resource.setURI(uri); commitTime2 = transaction.commit().getTimeStamp(); @@ -529,12 +529,12 @@ public class AuditTest extends AbstractCDOTest CDOSession session = openSession(); CDOView audit1 = session.openView(commitTime1); - assertEquals(true, audit1.hasResource("/my/resource")); - assertEquals(false, audit1.hasResource("/renamed")); + assertEquals(true, audit1.hasResource(getResourcePath("/my/resource"))); + assertEquals(false, audit1.hasResource(getResourcePath("/renamed"))); CDOView audit2 = session.openView(commitTime2); - assertEquals(false, audit2.hasResource("/my/resource")); - assertEquals(true, audit2.hasResource("/renamed")); + assertEquals(false, audit2.hasResource(getResourcePath("/my/resource"))); + assertEquals(true, audit2.hasResource(getResourcePath("/renamed"))); session.close(); } } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BackupTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BackupTest.java index 6e5cbf985c..5e5e493d97 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BackupTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BackupTest.java @@ -64,7 +64,7 @@ public class BackupTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(createCustomer("Eike")); transaction.commit(); session.close(); @@ -81,7 +81,7 @@ public class BackupTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); PurchaseOrder purchaseOrder = getModel1Factory().createPurchaseOrder(); purchaseOrder.setDate(new Date(1234567)); resource.getContents().add(purchaseOrder); @@ -112,7 +112,7 @@ public class BackupTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(image); transaction.commit(); } @@ -144,7 +144,7 @@ public class BackupTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(file); transaction.commit(); } @@ -165,7 +165,7 @@ public class BackupTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(createPoligon(new Point(1, 2), new Point(3, 1), new Point(4, 5))); transaction.commit(); session.close(); @@ -182,7 +182,7 @@ public class BackupTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); addFeatureMap(resource); @@ -208,7 +208,7 @@ public class BackupTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); Customer eike = createCustomer("Eike"); resource.getContents().add(eike); resource.getContents().add(createCustomer("Jos")); @@ -260,7 +260,7 @@ public class BackupTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); PurchaseOrder purchaseOrder = getModel1Factory().createPurchaseOrder(); purchaseOrder.setDate(new Date(1234567)); resource.getContents().add(purchaseOrder); @@ -297,7 +297,7 @@ public class BackupTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(image); transaction.commit(); } @@ -335,7 +335,7 @@ public class BackupTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(file); transaction.commit(); } @@ -362,7 +362,7 @@ public class BackupTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(createPoligon(new Point(1, 2), new Point(3, 1), new Point(4, 5))); transaction.commit(); session.close(); @@ -385,7 +385,7 @@ public class BackupTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); addFeatureMap(resource); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java index 294c96a528..dcaca73e8f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java @@ -337,7 +337,7 @@ public class BranchingTest extends AbstractCDOTest orderDetail.setProduct(product); orderDetail.setPrice(5); - CDOResource resource = transaction.createResource("/res"); + CDOResource resource = transaction.createResource(getResourcePath("/res")); resource.getContents().add(product); resource.getContents().add(orderDetail); @@ -353,7 +353,7 @@ public class BranchingTest extends AbstractCDOTest assertEquals(subBranch, transaction.getBranch()); assertEquals(CDOBranchPoint.UNSPECIFIED_DATE, transaction.getTimeStamp()); - resource = transaction.getResource("/res"); + resource = transaction.getResource(getResourcePath("/res")); orderDetail = (OrderDetail)resource.getContents().get(1); assertEquals(5.0f, orderDetail.getPrice()); product = orderDetail.getProduct(); @@ -403,7 +403,7 @@ public class BranchingTest extends AbstractCDOTest orderDetail.setProduct(product); orderDetail.setPrice(5); - CDOResource resource = transaction.createResource("/res"); + CDOResource resource = transaction.createResource(getResourcePath("/res")); resource.getContents().add(product); resource.getContents().add(orderDetail); @@ -419,7 +419,7 @@ public class BranchingTest extends AbstractCDOTest assertEquals(subBranch, transaction.getBranch()); assertEquals(CDOBranchPoint.UNSPECIFIED_DATE, transaction.getTimeStamp()); - resource = transaction.getResource("/res"); + resource = transaction.getResource(getResourcePath("/res")); orderDetail = (OrderDetail)resource.getContents().get(1); assertEquals(5.0f, orderDetail.getPrice()); product = orderDetail.getProduct(); @@ -477,7 +477,7 @@ public class BranchingTest extends AbstractCDOTest orderDetail2.setProduct(product); orderDetail2.setPrice(10); - CDOResource resource = transaction.createResource("/res"); + CDOResource resource = transaction.createResource(getResourcePath("/res")); resource.getContents().add(orderDetail2); resource.getContents().add(product); resource.getContents().add(orderDetail); @@ -494,7 +494,7 @@ public class BranchingTest extends AbstractCDOTest assertEquals(subBranch, transaction.getBranch()); assertEquals(CDOBranchPoint.UNSPECIFIED_DATE, transaction.getTimeStamp()); - resource = transaction.getResource("/res"); + resource = transaction.getResource(getResourcePath("/res")); orderDetail = (OrderDetail)resource.getContents().get(2); assertEquals(5.0f, orderDetail.getPrice()); product = orderDetail.getProduct(); @@ -545,7 +545,7 @@ public class BranchingTest extends AbstractCDOTest orderDetail.setProduct(product); orderDetail.setPrice(5); - CDOResource resource = transaction.createResource("/res"); + CDOResource resource = transaction.createResource(getResourcePath("/res")); resource.getContents().add(product); resource.getContents().add(orderDetail); @@ -560,7 +560,7 @@ public class BranchingTest extends AbstractCDOTest assertEquals(subBranch, transaction.getBranch()); assertEquals(CDOBranchPoint.UNSPECIFIED_DATE, transaction.getTimeStamp()); - resource = transaction.getResource("/res"); + resource = transaction.getResource(getResourcePath("/res")); orderDetail = (OrderDetail)resource.getContents().get(1); assertEquals(5.0f, orderDetail.getPrice()); product = orderDetail.getProduct(); @@ -660,7 +660,7 @@ public class BranchingTest extends AbstractCDOTest private void check(CDOSession session, CDOBranch branch, long timeStamp, float price, String name) { CDOView view = session.openView(branch, timeStamp); - CDOResource resource = view.getResource("/res"); + CDOResource resource = view.getResource(getResourcePath("/res")); assertEquals(2, resource.getContents().size()); dumpAll(session); @@ -679,7 +679,7 @@ public class BranchingTest extends AbstractCDOTest private void check(CDOSession session, CDOBranch branch, long timeStamp, float price, float price2, String name) { CDOView view = session.openView(branch, timeStamp); - CDOResource resource = view.getResource("/res"); + CDOResource resource = view.getResource(getResourcePath("/res")); assertEquals(3, resource.getContents().size()); dumpAll(session); @@ -713,7 +713,7 @@ public class BranchingTest extends AbstractCDOTest Product1 product = getModel1Factory().createProduct1(); product.setName("CDO"); - CDOResource resource = transaction.createResource("/res"); + CDOResource resource = transaction.createResource(getResourcePath("/res")); resource.getContents().add(product); CDOCommitInfo commitInfo = transaction.commit(); @@ -727,7 +727,7 @@ public class BranchingTest extends AbstractCDOTest assertEquals(subBranch, transaction.getBranch()); assertEquals(CDOBranchPoint.UNSPECIFIED_DATE, transaction.getTimeStamp()); - resource = transaction.getResource("/res"); + resource = transaction.getResource(getResourcePath("/res")); product = (Product1)resource.getContents().get(0); assertEquals("CDO", product.getName()); @@ -785,7 +785,7 @@ public class BranchingTest extends AbstractCDOTest Product1 product = getModel1Factory().createProduct1(); product.setName("CDO"); - CDOResource resource = transaction.createResource("/res"); + CDOResource resource = transaction.createResource(getResourcePath("/res")); resource.getContents().add(product); CDOCommitInfo commitInfo = transaction.commit(); @@ -799,7 +799,7 @@ public class BranchingTest extends AbstractCDOTest assertEquals(subBranch, transaction.getBranch()); assertEquals(CDOBranchPoint.UNSPECIFIED_DATE, transaction.getTimeStamp()); - resource = transaction.getResource("/res"); + resource = transaction.getResource(getResourcePath("/res")); product = (Product1)resource.getContents().get(0); assertEquals("CDO", product.getName()); @@ -861,7 +861,7 @@ public class BranchingTest extends AbstractCDOTest Product1 product = getModel1Factory().createProduct1(); product.setName("CDO"); - CDOResource resource = transaction.createResource("/res"); + CDOResource resource = transaction.createResource(getResourcePath("/res")); resource.getContents().add(product); CDOCommitInfo commitInfo = transaction.commit(); @@ -892,7 +892,7 @@ public class BranchingTest extends AbstractCDOTest Product1 product = getModel1Factory().createProduct1(); product.setName("CDO"); - CDOResource resource = transaction.createResource("/res"); + CDOResource resource = transaction.createResource(getResourcePath("/res")); resource.getContents().add(product); // Commit to main branch @@ -921,7 +921,7 @@ public class BranchingTest extends AbstractCDOTest private void check(CDOSession session, CDOBranch branch, long timeStamp, String name) { CDOView view = session.openView(branch, timeStamp); - CDOResource resource = view.getResource("/res"); + CDOResource resource = view.getResource(getResourcePath("/res")); dumpAll(session); Product1 product = (Product1)resource.getContents().get(0); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CDOIDTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CDOIDTest.java index a8d49e5ae9..16709f39b6 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CDOIDTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CDOIDTest.java @@ -86,7 +86,7 @@ public class CDOIDTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Supplier supplier = getModel1Factory().createSupplier(); supplier.setName("Stepper"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java index ab3a55c8b6..5938b8da2b 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChangeSubscriptionTest.java @@ -58,7 +58,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest final CDOTransaction transaction = session.openTransaction(); transaction.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); - final CDOResource resourceA = transaction.createResource("/test1"); + final CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); resourceA.getContents().add(companyA); transaction.commit(); @@ -122,7 +122,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest final CDOTransaction transaction = session.openTransaction(); - final CDOResource resourceA = transaction.createResource("/test1"); + final CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); resourceA.getContents().add(companyA); transaction.commit(); @@ -184,7 +184,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); transaction.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); - CDOResource resourceA = transaction.createResource("/test1"); + CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); resourceA.getContents().add(companyA); transaction.commit(); @@ -246,7 +246,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resourceA = transaction.createResource("/test1"); + CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); resourceA.getContents().add(companyA); transaction.commit(); @@ -318,7 +318,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest final CDOTransaction transaction = session.openTransaction(); transaction.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); msg("Creating resource"); - final CDOResource resourceA = transaction.createResource("/test1"); + final CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); msg("Adding company"); resourceA.getContents().add(companyA); @@ -384,7 +384,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest transaction.options().addChangeSubscriptionPolicy(customPolicy); msg("Creating resource"); - final CDOResource resourceA = transaction.createResource("/test1"); + final CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); msg("Adding company"); resourceA.getContents().add(companyA); @@ -477,7 +477,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest transaction.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); msg("Creating resource"); - final CDOResource resourceA = transaction.createResource("/test1"); + final CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); msg("Adding company"); resourceA.getContents().add(companyA); @@ -574,7 +574,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(company); transaction.commit(); @@ -582,7 +582,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest CDOView view = session2.openView(); view.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); - CDOResource resource2 = view.getResource("/test1"); + CDOResource resource2 = view.getResource(getResourcePath("/test1")); Company company2 = (Company)resource2.getContents().get(0); Object[] strongRefs = company2.getCategories().toArray(); // Keep those in memory @@ -636,7 +636,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(company); transaction.commit(); @@ -644,7 +644,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest CDOView view = session2.openView(); view.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); - CDOResource resource2 = view.getResource("/test1"); + CDOResource resource2 = view.getResource(getResourcePath("/test1")); Company company2 = (Company)resource2.getContents().get(0); Object[] strongRefs = company2.getCategories().toArray(); // Keep those in memory @@ -703,7 +703,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(product); resource.getContents().addAll(details); transaction.commit(); @@ -712,7 +712,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest CDOView view = session2.openView(); view.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); - CDOResource resource2 = view.getResource("/test1"); + CDOResource resource2 = view.getResource(getResourcePath("/test1")); Product1 product2 = (Product1)resource2.getContents().get(0); Object[] strongRefs = product2.getOrderDetails().toArray(); // Keep those in memory @@ -773,7 +773,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(product); resource.getContents().addAll(details); transaction.commit(); @@ -782,7 +782,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest CDOView view = session2.openView(); view.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); - CDOResource resource2 = view.getResource("/test1"); + CDOResource resource2 = view.getResource(getResourcePath("/test1")); Product1 product2 = (Product1)resource2.getContents().get(0); Object[] strongRefs = product2.getOrderDetails().toArray(); // Keep those in memory @@ -842,7 +842,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest Company company = getModel1Factory().createCompany(); company.setName("main-v1"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(company); commitAndSync(transaction, view); @@ -884,7 +884,7 @@ public class ChangeSubscriptionTest extends AbstractCDOTest Company company = getModel1Factory().createCompany(); company.setName("main-v1"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(company); transaction.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingTest.java index ef5c55b80d..029d986ac9 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingTest.java @@ -38,7 +38,7 @@ public class ChunkingTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Customer customer = getModel1Factory().createCustomer(); customer.setName("customer"); @@ -63,7 +63,7 @@ public class ChunkingTest extends AbstractCDOTest session.options().setCollectionLoadingPolicy(CDOUtil.createCollectionLoadingPolicy(10, 10)); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer customer = (Customer)resource.getContents().get(0); EList<SalesOrder> salesOrders = customer.getSalesOrders(); @@ -81,7 +81,7 @@ public class ChunkingTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Customer customer = getModel1Factory().createCustomer(); customer.setName("customer"); @@ -106,7 +106,7 @@ public class ChunkingTest extends AbstractCDOTest session.options().setCollectionLoadingPolicy(CDOUtil.createCollectionLoadingPolicy(10, 10)); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer customer = (Customer)resource.getContents().get(0); EList<SalesOrder> salesOrders = customer.getSalesOrders(); @@ -126,7 +126,7 @@ public class ChunkingTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Customer customer = getModel1Factory().createCustomer(); customer.setName("customer"); @@ -142,7 +142,7 @@ public class ChunkingTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); transaction.options().setRevisionPrefetchingPolicy(CDOUtil.createRevisionPrefetchingPolicy(10)); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer customer = getModel1Factory().createCustomer(); customer.setName("customer"); @@ -160,7 +160,7 @@ public class ChunkingTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); for (int i = 0; i < 100; i++) { @@ -180,7 +180,7 @@ public class ChunkingTest extends AbstractCDOTest session.options().setCollectionLoadingPolicy(CDOUtil.createCollectionLoadingPolicy(10, 10)); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); for (int i = 50; i < 70; i++) { @@ -203,7 +203,7 @@ public class ChunkingTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); for (int i = 0; i < 100; i++) { @@ -224,7 +224,7 @@ public class ChunkingTest extends AbstractCDOTest msg("Creating resource"); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); for (int i = 50; i < 70; i++) { @@ -251,7 +251,7 @@ public class ChunkingTest extends AbstractCDOTest CDOSession session = openSession(); session.options().setCollectionLoadingPolicy(CDOUtil.createCollectionLoadingPolicy(3, 1)); CDOTransaction tx = session.openTransaction(); - CDOResource resource = tx.getResource(RESOURCE_PATH); + CDOResource resource = tx.getResource(getResourcePath(RESOURCE_PATH)); GenListOfInt list = (GenListOfInt)resource.getContents().get(0); list.getElements().add(9); @@ -271,7 +271,7 @@ public class ChunkingTest extends AbstractCDOTest CDOSession session = openSession(); session.options().setCollectionLoadingPolicy(CDOUtil.createCollectionLoadingPolicy(3, 1)); CDOTransaction tx = session.openTransaction(); - CDOResource resource = tx.getResource(RESOURCE_PATH); + CDOResource resource = tx.getResource(getResourcePath(RESOURCE_PATH)); GenListOfInt list = (GenListOfInt)resource.getContents().get(0); list.getElements().add(5, 9); @@ -291,7 +291,7 @@ public class ChunkingTest extends AbstractCDOTest CDOSession session = openSession(); session.options().setCollectionLoadingPolicy(CDOUtil.createCollectionLoadingPolicy(3, 1)); CDOTransaction tx = session.openTransaction(); - CDOResource resource = tx.getResource(RESOURCE_PATH); + CDOResource resource = tx.getResource(getResourcePath(RESOURCE_PATH)); GenListOfInt list = (GenListOfInt)resource.getContents().get(0); list.getElements().set(5, 9); @@ -311,7 +311,7 @@ public class ChunkingTest extends AbstractCDOTest CDOSession session = openSession(); session.options().setCollectionLoadingPolicy(CDOUtil.createCollectionLoadingPolicy(3, 1)); CDOTransaction tx = session.openTransaction(); - CDOResource resource = tx.getResource(RESOURCE_PATH); + CDOResource resource = tx.getResource(getResourcePath(RESOURCE_PATH)); GenListOfInt list = (GenListOfInt)resource.getContents().get(0); list.getElements().remove(5); @@ -328,7 +328,7 @@ public class ChunkingTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource resource = tx.createResource(RESOURCE_PATH); + CDOResource resource = tx.createResource(getResourcePath(RESOURCE_PATH)); GenListOfInt list = Model5Factory.eINSTANCE.createGenListOfInt(); @@ -349,7 +349,7 @@ public class ChunkingTest extends AbstractCDOTest CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource(RESOURCE_PATH); + CDOResource resource = view.getResource(getResourcePath(RESOURCE_PATH)); EList<Integer> actualList = ((GenListOfInt)resource.getContents().get(0)).getElements(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java index 06ccea230e..b8bdcf02a0 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java @@ -41,7 +41,7 @@ public class ChunkingWithMEMTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Creating customer"); Customer customer = getModel1Factory().createCustomer(); @@ -72,7 +72,7 @@ public class ChunkingWithMEMTest extends AbstractCDOTest msg("Attaching transaction"); CDOTransaction transaction = session.openTransaction(); msg("Loading resource"); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer customer = (Customer)resource.getContents().get(0); EList<SalesOrder> salesOrders = customer.getSalesOrders(); @@ -99,7 +99,7 @@ public class ChunkingWithMEMTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Creating customer"); Customer customer = getModel1Factory().createCustomer(); @@ -132,7 +132,7 @@ public class ChunkingWithMEMTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Loading resource"); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer customer = (Customer)resource.getContents().get(0); EList<SalesOrder> salesOrders = customer.getSalesOrders(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CompareTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CompareTest.java index 49d94ab31b..786b901559 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CompareTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CompareTest.java @@ -44,7 +44,7 @@ public class CompareTest 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); @@ -86,7 +86,7 @@ public class CompareTest 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); @@ -111,7 +111,7 @@ public class CompareTest 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); @@ -129,7 +129,7 @@ public class CompareTest 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); @@ -155,7 +155,7 @@ public class CompareTest 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); @@ -164,7 +164,7 @@ public class CompareTest 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); tx2.commit(); @@ -195,7 +195,7 @@ public class CompareTest extends AbstractCDOTest sleep(10); CDOTransaction tx1 = session.openTransaction(source); - CDOResource res1 = tx1.getResource("/res" + 0); + CDOResource res1 = tx1.getResource(getResourcePath("/res" + 0)); EList<EObject> contents1 = res1.getContents(); ((Company)contents1.get(0)).setName("Company0"); ((Company)contents1.get(1)).setName("Company1"); @@ -214,7 +214,7 @@ public class CompareTest 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); @@ -226,7 +226,7 @@ public class CompareTest 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); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java index 536c50c4a2..3075a3cf3b 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ComplexTest.java @@ -1036,12 +1036,12 @@ public class ComplexTest extends AbstractCDOTest public void testMultipleTransactions3() throws CommitException { CDOTransaction transaction1 = session.openTransaction(); - String resource1path = "/resources/3/" + uniqueCounter; + String resource1path = getResourcePath("/resources/3/" + uniqueCounter); CDOResource resource1 = transaction1.createResource(resource1path); transaction1.commit(); CDOTransaction transaction2 = session.openTransaction(); - String resource2path = "/resources/4/" + uniqueCounter++; + String resource2path = getResourcePath("/resources/4/" + uniqueCounter++); CDOResource resource2 = transaction2.createResource(resource2path); transaction2.commit(); @@ -1090,12 +1090,12 @@ public class ComplexTest extends AbstractCDOTest public void testMultipleTransactions2() throws CommitException { CDOTransaction transaction1 = session.openTransaction(); - String resource1path = "/resources/3/" + uniqueCounter; + String resource1path = getResourcePath("/resources/3/" + uniqueCounter); CDOResource resource1 = transaction1.createResource(resource1path); transaction1.commit(); CDOTransaction transaction2 = session.openTransaction(); - String resource2path = "/resources/4/" + uniqueCounter++; + String resource2path = getResourcePath("/resources/4/" + uniqueCounter++); CDOResource resource2 = transaction2.createResource(resource2path); transaction2.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java index 1e6c11e11b..cb2d5c071a 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java @@ -87,7 +87,7 @@ public class ContainmentTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Adding company"); resource.getContents().add(company); @@ -131,7 +131,7 @@ public class ContainmentTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Adding company"); resource.getContents().add(company); @@ -180,7 +180,7 @@ public class ContainmentTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Adding company"); resource.getContents().add(company); @@ -195,7 +195,7 @@ public class ContainmentTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Loading resource"); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); assertProxy(resource); EList<EObject> contents = resource.getContents(); @@ -251,7 +251,7 @@ public class ContainmentTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Adding company"); resource.getContents().add(company); @@ -269,7 +269,7 @@ public class ContainmentTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Loading resource"); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); assertProxy(resource); EList<EObject> contents = resource.getContents(); @@ -307,7 +307,7 @@ public class ContainmentTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(order); transaction.commit(); @@ -331,7 +331,7 @@ public class ContainmentTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(order); transaction.commit(); @@ -356,7 +356,7 @@ public class ContainmentTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(resourceSet); Resource resource1 = resourceSet.createResource(URI.createURI("test://1")); - Resource resource2 = transaction.createResource("test"); + Resource resource2 = transaction.createResource(getResourcePath("test")); EPackage packageObject = createDynamicEPackage(); EClass eClass = (EClass)packageObject.getEClassifier("SchoolBook"); @@ -393,7 +393,7 @@ public class ContainmentTest extends AbstractCDOTest Resource resource1 = resourceSet.createResource(URI.createURI("test://1")); resource1.load(new ByteArrayInputStream(data), null); - Resource resource2 = transaction.getResource("test"); + Resource resource2 = transaction.getResource(getResourcePath("test")); EObject container = resource1.getContents().get(0); Order order = (Order)resource2.getContents().get(0); @@ -413,8 +413,8 @@ public class ContainmentTest extends AbstractCDOTest ResourceSet resourceSet = new ResourceSetImpl(); CDOTransaction transaction = session.openTransaction(resourceSet); - Resource resource1 = transaction.createResource("testA"); - Resource resource2 = transaction.createResource("testB"); + Resource resource1 = transaction.createResource(getResourcePath("testA")); + Resource resource2 = transaction.createResource(getResourcePath("testB")); EPackage packageObject = createDynamicEPackage(); session.getPackageRegistry().putEPackage(packageObject); @@ -442,8 +442,8 @@ public class ContainmentTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(resourceSet); - Resource resource1 = transaction.getResource("testA"); - Resource resource2 = transaction.getResource("testB"); + Resource resource1 = transaction.getResource(getResourcePath("testA")); + Resource resource2 = transaction.getResource(getResourcePath("testB")); EObject container = resource1.getContents().get(0); Order order = (Order)resource2.getContents().get(0); @@ -495,7 +495,7 @@ public class ContainmentTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/resource1"); + CDOResource resource = transaction.createResource(getResourcePath("/resource1")); resource.getContents().add(taskContainer); transaction.commit(); @@ -508,7 +508,7 @@ public class ContainmentTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/resource1"); + CDOResource resource = transaction.createResource(getResourcePath("/resource1")); PersistentContainment parent1 = createPersistentContainment(); parent1.getChildren().add(createTransientContainer()); @@ -535,7 +535,7 @@ public class ContainmentTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/resource1"); + CDOResource resource = transaction.createResource(getResourcePath("/resource1")); PersistentContainment parent1 = createPersistentContainment(); parent1.getChildren().add(createTransientContainer()); @@ -547,7 +547,7 @@ public class ContainmentTest extends AbstractCDOTest session.close(); session = openSession(); transaction = session.openTransaction(); - resource = transaction.getResource("/resource1"); + resource = transaction.getResource(getResourcePath("/resource1")); parent1 = (PersistentContainment)resource.getContents().get(0); // Move child diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContentAdapterTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContentAdapterTest.java index 8b6c1ae786..d1114b921d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContentAdapterTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContentAdapterTest.java @@ -62,7 +62,7 @@ public class ContentAdapterTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test2"); + CDOResource resource = transaction.createResource(getResourcePath("/test2")); // resource.eAdapters().add(contentAdapter); Supplier supplier = getModel1Factory().createSupplier(); @@ -87,7 +87,7 @@ public class ContentAdapterTest extends AbstractCDOTest session.setFetchRuleManager(info); InternalCDOTransaction transaction = (InternalCDOTransaction)session.openTransaction(); - CDOResource resource = transaction.getResource("/test2"); + CDOResource resource = transaction.getResource(getResourcePath("/test2")); // I don't want to fetch my objects!! EList<Adapter> adapters = resource.eAdapters(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java index 722473968c..ccdc98d646 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java @@ -64,7 +64,7 @@ public class CrossReferenceTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resourceA = transaction.createResource("/test1"); + CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); msg("Adding company"); resourceA.getContents().add(companyA); @@ -80,7 +80,7 @@ public class CrossReferenceTest extends AbstractCDOTest CDOView viewB = session.openTransaction(); msg("Loading resource"); - CDOResource resourceB = viewB.getResource("/test1"); + CDOResource resourceB = viewB.getResource(getResourcePath("/test1")); assertProxy(resourceB); EList<EObject> contents = resourceB.getContents(); @@ -139,7 +139,7 @@ public class CrossReferenceTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resourceA = transaction.createResource("/test1"); + CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); msg("Adding company"); resourceA.getContents().add(companyA); @@ -155,7 +155,7 @@ public class CrossReferenceTest extends AbstractCDOTest CDOView viewB = session.openTransaction(); msg("Loading resource"); - CDOResource resourceB = viewB.getResource("/test1"); + CDOResource resourceB = viewB.getResource(getResourcePath("/test1")); assertProxy(resourceB); EList<EObject> contents = resourceB.getContents(); @@ -200,7 +200,7 @@ public class CrossReferenceTest extends AbstractCDOTest company1A.getCustomers().add(customerA); msg("Creating resource1"); - CDOResource resource1A = transaction.createResource("/test1"); + CDOResource resource1A = transaction.createResource(getResourcePath("/test1")); msg("Adding company1"); resource1A.getContents().add(company1A); @@ -227,7 +227,7 @@ public class CrossReferenceTest extends AbstractCDOTest company2A.getSalesOrders().add(salesOrder2A); msg("Creating resource2"); - CDOResource resource2A = transaction.createResource("/test2"); + CDOResource resource2A = transaction.createResource(getResourcePath("/test2")); msg("Adding company"); resource2A.getContents().add(company2A); @@ -245,7 +245,7 @@ public class CrossReferenceTest extends AbstractCDOTest CDOView viewB = session.openTransaction(); msg("Loading resource1"); - CDOResource resource1B = viewB.getResource("/test1"); + CDOResource resource1B = viewB.getResource(getResourcePath("/test1")); assertProxy(resource1B); EList<EObject> contents = resource1B.getContents(); @@ -281,7 +281,7 @@ public class CrossReferenceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/company/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/company/resource")); resource.getContents().add(company); transaction.commit(); @@ -312,7 +312,7 @@ public class CrossReferenceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/company/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/company/resource")); resource.getContents().add(company); transaction.commit(); @@ -338,7 +338,7 @@ public class CrossReferenceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/company/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/company/resource")); resource.getContents().add(company); transaction.commit(); @@ -367,7 +367,7 @@ public class CrossReferenceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/company/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/company/resource")); resource.getContents().add(company); transaction.commit(); @@ -403,7 +403,7 @@ public class CrossReferenceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/company/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/company/resource")); resource.getContents().add(company); // DO NOT: transaction.commit(); @@ -432,7 +432,7 @@ public class CrossReferenceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/company/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/company/resource")); resource.getContents().add(company); // DO NOT: transaction.commit(); @@ -465,7 +465,7 @@ public class CrossReferenceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/company/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/company/resource")); resource.getContents().add(company); // DO NOT: transaction.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java index 6cda022d7a..fbb76abcbc 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java @@ -45,7 +45,7 @@ public class DetachTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Company c1 = getModel1Factory().createCompany(); c1.setName("Test"); @@ -68,7 +68,7 @@ public class DetachTest extends AbstractCDOTest // ((org.eclipse.emf.cdo.net4j.CDOSession)session).options().setCommitTimeout(1000); // ((org.eclipse.emf.cdo.net4j.CDOSession)session).options().setProgressInterval(100); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Company c1 = getModel1Factory().createCompany(); c1.setName("Test"); @@ -106,7 +106,7 @@ public class DetachTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Company c1 = getModel1Factory().createCompany(); c1.setName("Test"); @@ -119,7 +119,7 @@ public class DetachTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Company c1 = getModel1Factory().createCompany(); c1.setName("Test"); @@ -197,7 +197,7 @@ public class DetachTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Company c1 = getModel1Factory().createCompany(); c1.setName("Test"); @@ -208,7 +208,7 @@ public class DetachTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getOrCreateResource("/my/resource"); + CDOResource resource = transaction.getOrCreateResource(getResourcePath("/my/resource")); Company c1 = (Company)resource.getContents().get(0); // remove object by index assertEquals("Test", c1.getName()); @@ -274,7 +274,7 @@ public class DetachTest extends AbstractCDOTest ResourceSet rset = transaction.getResourceSet(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); detachResource(rset, resource, false); transaction.commit(); @@ -291,7 +291,7 @@ public class DetachTest extends AbstractCDOTest ResourceSet rset = transaction.getResourceSet(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); transaction.commit(); CDOID resourceID = resource.cdoID(); @@ -312,7 +312,7 @@ public class DetachTest extends AbstractCDOTest ResourceSet rset = transaction.getResourceSet(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); transaction.commit(); CDOID resourceID = resource.cdoID(); @@ -331,7 +331,7 @@ public class DetachTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Deleting resource"); resource.delete(null); @@ -343,7 +343,7 @@ public class DetachTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); - String resourcePath = "/test1"; + String resourcePath = getResourcePath("/test1"); CDOResource res = transaction1.createResource(resourcePath); res.getContents().add(getModel1Factory().createCompany()); res.getContents().add(getModel1Factory().createCompany()); @@ -384,7 +384,7 @@ public class DetachTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - transaction.createResource("/test1"); + transaction.createResource(getResourcePath("/test1")); transaction.commit(); } @@ -395,7 +395,7 @@ public class DetachTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); msg("Deleting resource"); resource.delete(null); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DymamicEcoreTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DymamicEcoreTest.java index 4532ad7b47..892938db5e 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DymamicEcoreTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DymamicEcoreTest.java @@ -40,7 +40,7 @@ public class DymamicEcoreTest extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(ecore); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); EObject root = loadModel("model1.ecore", session.getPackageRegistry()); res.getContents().add(root); @@ -51,7 +51,7 @@ public class DymamicEcoreTest extends AbstractCDOTest // Load resource in session 2 CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); EObject root = res.getContents().get(0); saveModel("model1X.ecore", root); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DymamicUmlTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DymamicUmlTest.java index 16888914f2..30750a2e5d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DymamicUmlTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DymamicUmlTest.java @@ -41,7 +41,7 @@ public class DymamicUmlTest extends AbstractCDOTest // Create resource in session 1 CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); Company company = getModel1Factory().createCompany(); company.setName("Eike"); @@ -53,7 +53,7 @@ public class DymamicUmlTest extends AbstractCDOTest // Load resource in session 2 CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); Company company = (Company)res.getContents().get(0); assertEquals("Eike", company.getName()); @@ -71,7 +71,7 @@ public class DymamicUmlTest extends AbstractCDOTest // Create resource in session 1 CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); EObject company = EcoreUtil.create(companyClass); company.eSet(nameAttribute, "Eike"); @@ -83,7 +83,7 @@ public class DymamicUmlTest extends AbstractCDOTest // Load resource in session 2 CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); CDOObject company = CDOUtil.getCDOObject(res.getContents().get(0)); EClass companyClass = company.eClass(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DynamicPackageTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DynamicPackageTest.java index d81bceb955..7948a6fdb1 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DynamicPackageTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DynamicPackageTest.java @@ -40,7 +40,7 @@ public class DynamicPackageTest extends AbstractCDOTest EPackage dynamicMapEPackge = createPackage(); EFactory dynamicMapEFactoryInstance = dynamicMapEPackge.getEFactoryInstance(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); EObject mapContainer = dynamicMapEFactoryInstance.create((EClass)dynamicMapEPackge.getEClassifier("MapContainer")); resource.getContents().add(mapContainer); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DynamicXSDTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DynamicXSDTest.java index b7246e7f90..ae2ebf38c7 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DynamicXSDTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DynamicXSDTest.java @@ -43,7 +43,7 @@ public class DynamicXSDTest extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(ecore); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); EObject company = EcoreUtil.create(companyClass); company.eSet(nameAttribute, "Eike"); @@ -55,7 +55,7 @@ public class DynamicXSDTest extends AbstractCDOTest // Load resource in session 2 CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); CDOObject company = CDOUtil.getCDOObject(res.getContents().get(0)); EClass companyClass = company.eClass(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMapTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMapTest.java index a8751d85d9..20af02a5c8 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMapTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMapTest.java @@ -45,7 +45,7 @@ public class EMapTest extends AbstractCDOTest msg("Opening transaction for querying"); CDOTransaction transaction = session.openTransaction(); - Resource res = transaction.getResource("/test1"); + Resource res = transaction.getResource(getResourcePath("/test1")); for (EObject eObject : res.getContents()) { if (eObject instanceof Customer) @@ -73,7 +73,7 @@ public class EMapTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); fillResource(resource); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EnumTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EnumTest.java index 019d6dd624..2db44826f0 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EnumTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EnumTest.java @@ -31,7 +31,7 @@ public class EnumTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(product); transaction.commit(); session.close(); @@ -40,7 +40,7 @@ public class EnumTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/my/resource"); + CDOResource resource = transaction.getResource(getResourcePath("/my/resource")); Product1 product = (Product1)resource.getContents().get(0); assertEquals(VAT.VAT7, product.getVat()); @@ -52,7 +52,7 @@ public class EnumTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/my/resource"); + CDOResource resource = transaction.getResource(getResourcePath("/my/resource")); Product1 product = (Product1)resource.getContents().get(0); assertEquals(VAT.VAT15, product.getVat()); session.close(); @@ -68,7 +68,7 @@ public class EnumTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(product); transaction.commit(); session.close(); @@ -79,7 +79,7 @@ public class EnumTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/my/resource"); + CDOResource resource = transaction.getResource(getResourcePath("/my/resource")); Product1 product = (Product1)resource.getContents().get(0); assertEquals(VAT.VAT7, product.getVat()); @@ -93,7 +93,7 @@ public class EnumTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/my/resource"); + CDOResource resource = transaction.getResource(getResourcePath("/my/resource")); Product1 product = (Product1)resource.getContents().get(0); assertEquals(VAT.VAT15, product.getVat()); session.close(); @@ -106,7 +106,7 @@ public class EnumTest extends AbstractCDOTest Category category = getModel1Factory().createCategory(); CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(category); Product1 product = getModel1Factory().createProduct1(); @@ -121,7 +121,7 @@ public class EnumTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/my/resource"); + CDOResource resource = transaction.getResource(getResourcePath("/my/resource")); Category category = (Category)resource.getContents().get(0); Product1 product = category.getProducts().get(0); assertEquals(VAT.VAT7, product.getVat()); @@ -134,7 +134,7 @@ public class EnumTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/my/resource"); + CDOResource resource = transaction.getResource(getResourcePath("/my/resource")); Category category = (Category)resource.getContents().get(0); Product1 product = category.getProducts().get(0); assertEquals(VAT.VAT15, product.getVat()); @@ -148,7 +148,7 @@ public class EnumTest extends AbstractCDOTest Category category = getModel1Factory().createCategory(); CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(category); Product1 product = getModel1Factory().createProduct1(); @@ -165,7 +165,7 @@ public class EnumTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/my/resource"); + CDOResource resource = transaction.getResource(getResourcePath("/my/resource")); Category category = (Category)resource.getContents().get(0); Product1 product = category.getProducts().get(0); assertEquals(VAT.VAT7, product.getVat()); @@ -180,7 +180,7 @@ public class EnumTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/my/resource"); + CDOResource resource = transaction.getResource(getResourcePath("/my/resource")); Category category = (Category)resource.getContents().get(0); Product1 product = category.getProducts().get(0); assertEquals(VAT.VAT15, product.getVat()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java index 79a3e360a9..ad28699b7c 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java @@ -98,7 +98,7 @@ public class ExternalReferenceTest extends AbstractCDOTest sessionA.getPackageRegistry().putEPackage(getModel4Package()); CDOTransaction transactionA1 = sessionA.openTransaction(resourceSet); - CDOResource resA = transactionA1.createResource("/resA"); + CDOResource resA = transactionA1.createResource(getResourcePath("/resA")); GenRefSingleNonContained objectFromResA = getModel4Factory().createGenRefSingleNonContained(); objectFromResA.setElement(getModel1Package().getAddress()); resA.getContents().add(objectFromResA); @@ -113,7 +113,7 @@ public class ExternalReferenceTest extends AbstractCDOTest resourceSet.getPackageRegistry().put(getModel1Package().getNsURI(), getModel1Package()); CDOTransaction transactionA1 = sessionA.openTransaction(resourceSet); - CDOResource resA = transactionA1.getResource("/resA"); + CDOResource resA = transactionA1.getResource(getResourcePath("/resA")); GenRefSingleNonContained objectFromResA = (GenRefSingleNonContained)resA.getContents().get(0); assertEquals(getModel1Package().getAddress(), objectFromResA.getElement()); @@ -132,7 +132,7 @@ public class ExternalReferenceTest extends AbstractCDOTest sessionA.getPackageRegistry().putEPackage(getModel4InterfacesPackage()); CDOTransaction transactionA1 = sessionA.openTransaction(resourceSet); - CDOResource resA = transactionA1.createResource("/resA"); + CDOResource resA = transactionA1.createResource(getResourcePath("/resA")); GenRefSingleNonContained objectFromResA = getModel4Factory().createGenRefSingleNonContained(); objectFromResA.setElement(getModel1Package()); resA.getContents().add(objectFromResA); @@ -147,7 +147,7 @@ public class ExternalReferenceTest extends AbstractCDOTest resourceSet.getPackageRegistry().put(getModel1Package().getNsURI(), getModel1Package()); CDOTransaction transactionA1 = sessionA.openTransaction(resourceSet); - CDOResource resA = transactionA1.getResource("/resA"); + CDOResource resA = transactionA1.getResource(getResourcePath("/resA")); GenRefSingleNonContained objectFromResA = (GenRefSingleNonContained)resA.getContents().get(0); assertEquals(getModel1Package(), objectFromResA.getElement()); @@ -174,13 +174,13 @@ public class ExternalReferenceTest extends AbstractCDOTest CDOTransaction transactionA1 = sessionA.openTransaction(resourceSet); CDOTransaction transactionB1 = sessionB.openTransaction(resourceSet); - CDOResource resA = transactionA1.createResource("/resA"); - CDOResource resB = transactionB1.createResource("/resB"); + CDOResource resA = transactionA1.createResource(getResourcePath("/resA")); + CDOResource resB = transactionB1.createResource(getResourcePath("/resB")); EList<Resource> resources = resourceSet.getResources(); assertEquals(4, resources.size()); - CDOResource resC = transactionA1.createResource("/resC"); + CDOResource resC = transactionA1.createResource(getResourcePath("/resC")); assertNotNull(resC); assertEquals(5, resources.size()); @@ -238,8 +238,8 @@ public class ExternalReferenceTest extends AbstractCDOTest Resource resD = resourceSet.createResource(URI.createURI("test://1")); resD.load(new ByteArrayInputStream(dataOfresD), null); - CDOResource resA = transaction.getResource("/resA"); - CDOResource resB = transaction2.getResource("/resB"); + CDOResource resA = transaction.getResource(getResourcePath("/resA")); + CDOResource resB = transaction2.getResource(getResourcePath("/resB")); Company companyA = (Company)resA.getContents().get(0); Company companyB = (Company)resB.getContents().get(0); Company companyD = (Company)resD.getContents().get(0); @@ -278,8 +278,8 @@ public class ExternalReferenceTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(resourceSet); CDOTransaction transactionB = sessionB.openTransaction(resourceSet); - CDOResource res = transaction.createResource("/resA"); - CDOResource resB = transactionB.createResource("/resB"); + CDOResource res = transaction.createResource(getResourcePath("/resA")); + CDOResource resB = transactionB.createResource(getResourcePath("/resB")); PurchaseOrder purchaseOrder = getModel1Factory().createPurchaseOrder(); Supplier supplier = getModel1Factory().createSupplier(); @@ -304,10 +304,10 @@ public class ExternalReferenceTest extends AbstractCDOTest CDOSession sessionB = openSession(REPOSITORY_B_NAME); CDOTransaction transactionB = sessionB.openTransaction(resourceSet); - CDOResource resA = transactionA.getResource("/resA"); + CDOResource resA = transactionA.getResource(getResourcePath("/resA")); assertNotNull(resA); - CDOResource resB = transactionB.getResource("/resB"); + CDOResource resB = transactionB.getResource(getResourcePath("/resB")); assertNotNull(resB); Supplier supplierB = (Supplier)resB.getContents().get(0); @@ -331,7 +331,7 @@ public class ExternalReferenceTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource1 = transaction.createResource("/test1"); + CDOResource resource1 = transaction.createResource(getResourcePath("/test1")); msg("Adding company"); Supplier supplier = getModel1Factory().createSupplier(); @@ -389,7 +389,7 @@ public class ExternalReferenceTest extends AbstractCDOTest Supplier supplier = getModel1Factory().createSupplier(); supplier.getPurchaseOrders().add(externalObject); - CDOResource resource = transaction.createResource("/internal"); + CDOResource resource = transaction.createResource(getResourcePath("/internal")); resource.getContents().add(supplier); transaction.commit(); @@ -420,7 +420,7 @@ public class ExternalReferenceTest extends AbstractCDOTest supplier.getPurchaseOrders().add(externalObject); } - CDOResource resource = transaction.createResource("/internal"); + CDOResource resource = transaction.createResource(getResourcePath("/internal")); resource.getContents().add(supplier); transaction.commit(); } @@ -448,7 +448,7 @@ public class ExternalReferenceTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(resourceSet); transaction.options().setRevisionPrefetchingPolicy(CDOUtil.createRevisionPrefetchingPolicy(10)); - CDOResource resource = transaction.getResource("/internal"); + CDOResource resource = transaction.getResource(getResourcePath("/internal")); Supplier supplier = (Supplier)resource.getContents().get(0); for (int i = 0; i < 200; i++) @@ -458,7 +458,7 @@ public class ExternalReferenceTest extends AbstractCDOTest } int count = signalCounter.getCountFor(LoadRevisionsRequest.class); - assertEquals(2, count); // Resource + root object (supplier) + assertEquals(3, count); // Resource + top folder + top object (supplier) CDORevisionData data = CDOUtil.getCDOObject(supplier).cdoRevision().data(); EReference reference = getModel1Package().getSupplier_PurchaseOrders(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java index b9b107be7a..aee77179dd 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java @@ -187,7 +187,7 @@ public class FeatureMapTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); TestFeatureMap featureMap = getModel5Factory().createTestFeatureMap(); FeatureMap people = featureMap.getPeople(); @@ -214,7 +214,7 @@ public class FeatureMapTest extends AbstractCDOTest session = openSession(); transaction = session.openTransaction(); - resource = transaction.getResource("/res1"); + resource = transaction.getResource(getResourcePath("/res1")); featureMap = (TestFeatureMap)resource.getContents().get(featureMapIndex); doctors = (List<?>)featureMap.getPeople().get(feature, true); @@ -240,6 +240,6 @@ public class FeatureMapTest extends AbstractCDOTest tx = session.openTransaction(); - resource = tx.getResource(path); + resource = tx.getResource(getResourcePath(path)); } } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java index 0948c58a0c..f2c914cd97 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java @@ -52,7 +52,7 @@ public class FetchRuleAnalyzerTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test2"); + CDOResource resource = transaction.createResource(getResourcePath("/test2")); msg("Creating supplier"); for (int i = 0; i < 10; i++) diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/GeneratedEcoreTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/GeneratedEcoreTest.java index 8053be00ab..7f430a271c 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/GeneratedEcoreTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/GeneratedEcoreTest.java @@ -47,7 +47,7 @@ public class GeneratedEcoreTest extends AbstractCDOTest // Load resource in session 2 CDOSession session2 = openSession(); CDOTransaction transaction2 = session2.openTransaction(); - CDOResource res2 = transaction2.getResource("/res"); + CDOResource res2 = transaction2.getResource(getResourcePath("/res")); EList<EObject> contents = res2.getContents(); EPackage root2 = (EPackage)contents.get(0); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IndexReconstructionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IndexReconstructionTest.java index 21491aaf39..2cb46c9df7 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IndexReconstructionTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/IndexReconstructionTest.java @@ -49,7 +49,7 @@ public class IndexReconstructionTest extends AbstractCDOTest OMPlatform.INSTANCE.setDebugging(false); CDOSession session = openSession(); transaction = session.openTransaction(); - resource = transaction.createResource("/test1"); + resource = transaction.createResource(getResourcePath("/test1")); expectedIndices = new HashSet<ReconstructedIndex>(); } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java index 1542e847db..8a0a45398d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java @@ -153,9 +153,10 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); assertNew(resource, transaction); - assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + "/test1"), resource.getURI()); + assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + getResourcePath("/test1")), + resource.getURI()); ResourceSet expected = transaction.getResourceSet(); ResourceSet actual = resource.getResourceSet(); assertEquals(expected, actual); @@ -176,7 +177,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Getting contents"); EList<EObject> contents = resource.getContents(); @@ -200,7 +201,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Creating supplier"); Supplier supplier = getModel1Factory().createSupplier(); @@ -229,7 +230,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Creating supplier"); Supplier supplier = getModel1Factory().createSupplier(); @@ -260,7 +261,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Creating supplier"); Supplier supplier = getModel1Factory().createSupplier(); @@ -291,7 +292,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Creating supplier"); Supplier supplier = getModel1Factory().createSupplier(); @@ -319,7 +320,7 @@ public class InitialTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Supplier supplier = getModel1Factory().createSupplier(); supplier.setName("Stepper"); @@ -350,7 +351,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Creating supplier"); Supplier supplier = getModel1Factory().createSupplier(); @@ -371,9 +372,10 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Getting resource"); - CDOResource resource = transaction.getResource("/test1", true); + CDOResource resource = transaction.getResource(getResourcePath("/test1"), true); assertNotNull(resource); - assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + "/test1"), resource.getURI()); + assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + getResourcePath("/test1")), + resource.getURI()); assertEquals(transaction.getResourceSet(), resource.getResourceSet()); assertEquals(1, transaction.getResourceSet().getResources().size()); assertEquals(CDOState.CLEAN, resource.cdoState()); @@ -387,9 +389,10 @@ public class InitialTest extends AbstractCDOTest msg("Getting resource"); CDOResource resource = (CDOResource)transaction.getResourceSet().getResource( - CDOURIUtil.createResourceURI(transaction, "/test1"), true); + CDOURIUtil.createResourceURI(transaction, getResourcePath("/test1")), true); assertNotNull(resource); - assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + "/test1"), resource.getURI()); + assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + getResourcePath("/test1")), + resource.getURI()); assertEquals(transaction.getResourceSet(), resource.getResourceSet()); assertEquals(1, transaction.getResourceSet().getResources().size()); assertEquals(CDOState.CLEAN, resource.cdoState()); @@ -409,7 +412,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Creating supplier"); Supplier supplier = getModel1Factory().createSupplier(); @@ -429,7 +432,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Getting resource"); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); msg("Getting contents"); EList<EObject> contents = resource.getContents(); @@ -447,7 +450,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Creating supplier"); Supplier supplier = getModel1Factory().createSupplier(); @@ -467,7 +470,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Getting resource"); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); msg("Getting contents"); EList<EObject> contents = resource.getContents(); @@ -491,7 +494,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Creating supplier"); Product1 product = getModel1Factory().createProduct1(); @@ -514,7 +517,7 @@ public class InitialTest extends AbstractCDOTest CDOView view = session.openView(); msg("Getting resource"); - CDOResource resource = view.getResource("/test1"); + CDOResource resource = view.getResource(getResourcePath("/test1")); msg("Getting contents"); EList<EObject> contents = resource.getContents(); @@ -544,7 +547,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Creating supplier"); Supplier supplier = getModel1Factory().createSupplier(); @@ -568,10 +571,10 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Getting resource"); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); assertNotNull(resource); - URI uri = URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + "/test1"); + URI uri = URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + getResourcePath("/test1")); URI resourceURI = resource.getURI(); assertEquals(uri, resourceURI); assertEquals(transaction.getResourceSet(), resource.getResourceSet()); @@ -591,7 +594,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Creating supplier"); Supplier supplier = getModel1Factory().createSupplier(); @@ -615,7 +618,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Getting resource"); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); msg("Getting contents"); EList<EObject> contents = resource.getContents(); @@ -635,7 +638,7 @@ public class InitialTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); OrderAddress orderAddress = getModel1Factory().createOrderAddress(); resource.getContents().add(orderAddress); @@ -698,7 +701,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Creating orderDetail"); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); @@ -721,7 +724,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Getting resource"); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); msg("Getting contents"); EList<EObject> contents = resource.getContents(); @@ -787,7 +790,7 @@ public class InitialTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating resource"); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); msg("Creating supplier"); Supplier supplier = getModel1Factory().createSupplier(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java index 3328d54877..ffaf857c45 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java @@ -70,7 +70,7 @@ public class InvalidationTest extends AbstractCDOTest category2A.getCategories().add(category3A); final CDOTransaction transaction = session.openTransaction(); - final CDOResource resourceA = transaction.createResource("/test1"); + final CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); resourceA.getContents().add(companyA); transaction.commit(); @@ -78,7 +78,7 @@ public class InvalidationTest extends AbstractCDOTest final CDOView view = session.openTransaction(); - final CDOResource resourceB = view.getResource("/test1"); + final CDOResource resourceB = view.getResource(getResourcePath("/test1")); assertProxy(resourceB); EList<EObject> contents = resourceB.getContents(); @@ -142,14 +142,14 @@ public class InvalidationTest extends AbstractCDOTest category2A.getCategories().add(category3A); final CDOTransaction transaction = session.openTransaction(); - final CDOResource resourceA = transaction.createResource("/test1"); + final CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); resourceA.getContents().add(companyA); transaction.commit(); // ************************************************************* // final CDOView viewB = session.openTransaction(); - final CDOResource resourceB = viewB.getResource("/test1"); + final CDOResource resourceB = viewB.getResource(getResourcePath("/test1")); assertProxy(resourceB); EList<EObject> contents = resourceB.getContents(); @@ -281,10 +281,10 @@ public class InvalidationTest extends AbstractCDOTest private void testDetachedConflict(CDOTransaction trans1, CDOTransaction trans2) throws Exception { - final CDOResource res1 = trans1.getOrCreateResource("/test"); + final CDOResource res1 = trans1.getOrCreateResource(getResourcePath("/test")); trans1.commit(); - final CDOResource res2 = trans2.getResource("/test"); + final CDOResource res2 = trans2.getResource(getResourcePath("/test")); res1.delete(null); @@ -327,7 +327,7 @@ public class InvalidationTest extends AbstractCDOTest final CDOSession sessionA = openSession(); final CDOTransaction transaction = sessionA.openTransaction(); - final CDOResource resourceA = transaction.createResource("/test1"); + final CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); resourceA.getContents().add(companyA); transaction.commit(); @@ -335,7 +335,7 @@ public class InvalidationTest extends AbstractCDOTest final CDOSession sessionB = openSession(); final CDOView viewB = sessionB.openTransaction(); - final CDOResource resourceB = viewB.getResource("/test1"); + final CDOResource resourceB = viewB.getResource(getResourcePath("/test1")); assertProxy(resourceB); EList<EObject> contents = resourceB.getContents(); @@ -466,7 +466,7 @@ public class InvalidationTest extends AbstractCDOTest CDOSession sessionA = openSession(); CDOTransaction transaction = sessionA.openTransaction(); - CDOResource resourceA = transaction.createResource("/test1"); + CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); resourceA.getContents().add(companyA); transaction.commit(); @@ -527,7 +527,7 @@ public class InvalidationTest extends AbstractCDOTest final CDOTransaction transaction = sessionA.openTransaction(); msg("Creating resource"); - final CDOResource resourceA = transaction.createResource("/test1"); + final CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); msg("Adding company"); resourceA.getContents().add(companyA); @@ -624,7 +624,7 @@ public class InvalidationTest extends AbstractCDOTest final CDOSession sessionA = openSession(); final CDOTransaction transaction = sessionA.openTransaction(); - final CDOResource resourceA = transaction.createResource("/test1"); + final CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); resourceA.getContents().add(categoryA); transaction.commit(); @@ -635,7 +635,7 @@ public class InvalidationTest extends AbstractCDOTest final CDOView viewB = sessionB.openTransaction(); viewB.options().setInvalidationNotificationEnabled(true); - final CDOResource resourceB = viewB.getResource("/test1"); + final CDOResource resourceB = viewB.getResource(getResourcePath("/test1")); assertProxy(resourceB); EList<EObject> contents = resourceB.getContents(); @@ -692,7 +692,7 @@ public class InvalidationTest extends AbstractCDOTest final CDOTransaction transaction = sessionA.openTransaction(); msg("Creating resource"); - final CDOResource resourceA = transaction.createResource("/test1"); + final CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); msg("Adding company"); resourceA.getContents().add(categoryA); @@ -711,7 +711,7 @@ public class InvalidationTest extends AbstractCDOTest viewB.options().setInvalidationNotificationEnabled(true); msg("Loading resource"); - final CDOResource resourceB = viewB.getResource("/test1"); + final CDOResource resourceB = viewB.getResource(getResourcePath("/test1")); assertProxy(resourceB); EList<EObject> contents = resourceB.getContents(); @@ -770,7 +770,7 @@ public class InvalidationTest extends AbstractCDOTest CDOSession sessionA = openSession(); CDOTransaction transaction = sessionA.openTransaction(); - CDOResource resourceA = transaction.createResource("/test1"); + CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); resourceA.getContents().add(categoryA); transaction.commit(); @@ -781,7 +781,7 @@ public class InvalidationTest extends AbstractCDOTest sessionB.options().setPassiveUpdateMode(PassiveUpdateMode.CHANGES); CDOView viewB = sessionB.openTransaction(); - CDOResource resourceB = viewB.getResource("/test1"); + CDOResource resourceB = viewB.getResource(getResourcePath("/test1")); Category categoryB = (Category)resourceB.getContents().get(0); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LegacyTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LegacyTest.java index a0e844354c..3129f2be7e 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LegacyTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LegacyTest.java @@ -33,7 +33,7 @@ public class LegacyTest extends AbstractCDOTest CDOSession session = openSession(); CDOUtil.setLegacyModeDefault(false); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); try { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LobTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LobTest.java index 3622cff7c1..5473e2dc27 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LobTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LobTest.java @@ -49,7 +49,7 @@ public class LobTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("res"); + CDOResource resource = transaction.createResource(getResourcePath("res")); resource.getContents().add(image); transaction.commit(); @@ -67,7 +67,7 @@ public class LobTest extends AbstractCDOTest CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("res"); + CDOResource resource = view.getResource(getResourcePath("res")); Image image = (Image)resource.getContents().get(0); assertEquals(320, image.getWidth()); @@ -101,7 +101,7 @@ public class LobTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("res"); + CDOResource resource = transaction.createResource(getResourcePath("res")); resource.getContents().add(file); transaction.commit(); @@ -119,7 +119,7 @@ public class LobTest extends AbstractCDOTest CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("res"); + CDOResource resource = view.getResource(getResourcePath("res")); File file = (File)resource.getContents().get(0); assertEquals("copyright.txt", file.getName()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingManagerTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingManagerTest.java index ab5de8e5c2..22254bc930 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingManagerTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingManagerTest.java @@ -21,8 +21,8 @@ import org.eclipse.emf.cdo.tests.model1.Company; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.CommitException; -import org.eclipse.emf.cdo.util.StaleRevisionLockException; import org.eclipse.emf.cdo.util.LockTimeoutException; +import org.eclipse.emf.cdo.util.StaleRevisionLockException; import org.eclipse.net4j.util.concurrent.IRWLockManager.LockType; import org.eclipse.net4j.util.concurrent.RWLockManager; @@ -148,7 +148,7 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); @@ -173,7 +173,7 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); @@ -181,7 +181,7 @@ public class LockingManagerTest extends AbstractCDOTest readLock(cdoCompany); CDOTransaction transaction2 = session.openTransaction(); - Company company2 = (Company)transaction2.getResource("/res1").getContents().get(0); + Company company2 = (Company)transaction2.getResource(getResourcePath("/res1")).getContents().get(0); CDOObject cdoCompany2 = CDOUtil.getCDOObject(company2); assertEquals(false, cdoCompany2.cdoWriteLock().isLockedByOthers()); @@ -194,12 +194,12 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); CDOTransaction transaction2 = session.openTransaction(); - Company company2 = (Company)transaction2.getResource("/res1").getContents().get(0); + Company company2 = (Company)transaction2.getResource(getResourcePath("/res1")).getContents().get(0); res.getContents().remove(0); CDOObject cdoCompany2 = CDOUtil.getCDOObject(company2); @@ -224,7 +224,7 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); @@ -232,7 +232,7 @@ public class LockingManagerTest extends AbstractCDOTest writeLock(cdoCompany); CDOTransaction transaction2 = session.openTransaction(); - Company company2 = (Company)transaction2.getResource("/res1").getContents().get(0); + Company company2 = (Company)transaction2.getResource(getResourcePath("/res1")).getContents().get(0); CDOObject cdoCompany2 = CDOUtil.getCDOObject(company2); assertEquals(true, cdoCompany2.cdoWriteLock().isLockedByOthers()); @@ -245,12 +245,12 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); CDOTransaction transaction2 = session.openTransaction(); - Company company2 = (Company)transaction2.getResource("/res1").getContents().get(0); + Company company2 = (Company)transaction2.getResource(getResourcePath("/res1")).getContents().get(0); CDOObject cdoCompany = CDOUtil.getCDOObject(company); CDOObject cdoCompany2 = CDOUtil.getCDOObject(company2); @@ -284,12 +284,12 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); CDOTransaction transaction2 = session.openTransaction(); - Company company2 = (Company)transaction2.getResource("/res1").getContents().get(0); + Company company2 = (Company)transaction2.getResource(getResourcePath("/res1")).getContents().get(0); CDOObject cdoCompany = CDOUtil.getCDOObject(company); CDOObject cdoCompany2 = CDOUtil.getCDOObject(company2); @@ -317,12 +317,12 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); CDOTransaction transaction2 = session.openTransaction(); - Company company2 = (Company)transaction2.getResource("/res1").getContents().get(0); + Company company2 = (Company)transaction2.getResource(getResourcePath("/res1")).getContents().get(0); CDOObject cdoCompany = CDOUtil.getCDOObject(company); CDOObject cdoCompany2 = CDOUtil.getCDOObject(company2); @@ -345,12 +345,12 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); CDOTransaction transaction2 = session.openTransaction(); - Company company2 = (Company)transaction2.getResource("/res1").getContents().get(0); + Company company2 = (Company)transaction2.getResource(getResourcePath("/res1")).getContents().get(0); CDOObject cdoCompany = CDOUtil.getCDOObject(company); transaction.lockObjects(Collections.singletonList(cdoCompany), LockType.READ, CDOLock.WAIT); @@ -372,12 +372,12 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); CDOTransaction transaction2 = session.openTransaction(); - Company company2 = (Company)transaction2.getResource("/res1").getContents().get(0); + Company company2 = (Company)transaction2.getResource(getResourcePath("/res1")).getContents().get(0); CDOObject cdoCompany = CDOUtil.getCDOObject(company); transaction.lockObjects(Collections.singletonList(cdoCompany), LockType.WRITE, CDOLock.WAIT); @@ -400,7 +400,7 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); @@ -417,7 +417,7 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); @@ -440,7 +440,7 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); @@ -458,7 +458,7 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); CDOObject cdoCompany = CDOUtil.getCDOObject(company); @@ -539,7 +539,7 @@ public class LockingManagerTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); IView view = repo.getSessionManager().getSession(session.getSessionID()).getView(transaction.getViewID()); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); @@ -558,7 +558,7 @@ public class LockingManagerTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); IView view = repo.getSessionManager().getSession(session.getSessionID()).getView(transaction.getViewID()); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); @@ -599,7 +599,7 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); transaction.options().setAutoReleaseLocksEnabled(false); @@ -639,7 +639,7 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); transaction.options().setAutoReleaseLocksEnabled(false); @@ -680,7 +680,7 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); res.getContents().add(company); transaction.commit(); @@ -721,7 +721,7 @@ public class LockingManagerTest extends AbstractCDOTest CDOSession session = openSession(); session.options().setPassiveUpdateEnabled(false); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); Company company = getModel1Factory().createCompany(); company.setName("AAA"); @@ -753,7 +753,7 @@ public class LockingManagerTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res1"); + CDOResource res = transaction.getResource(getResourcePath("/res1")); Company company = (Company)res.getContents().get(0); company.setName("BBB"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MEMStoreQueryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MEMStoreQueryTest.java index f9b7733404..797b17e81e 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MEMStoreQueryTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MEMStoreQueryTest.java @@ -41,7 +41,7 @@ public class MEMStoreQueryTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("/test1"); + CDOResource resource1 = transaction.createResource(getResourcePath("/test1")); objects.add(resource1); Company company1 = getModel1Factory().createCompany(); Category category1 = getModel1Factory().createCategory(); @@ -52,13 +52,14 @@ public class MEMStoreQueryTest extends AbstractCDOTest objects.add(company1); objects.add(category1); objects.add(transaction.getRootResource()); + objects.add(transaction.getResourceNode(getResourcePath(null))); company1.setName("TEST"); transaction.commit(); CDOQuery query = transaction.createQuery("TEST", "QUERYSTRING"); List<Object> result = query.getResult(Object.class); - assertEquals(4, result.size()); + assertEquals(5, result.size()); for (Object object : result) { assertEquals(true, objects.contains(object)); @@ -76,7 +77,7 @@ public class MEMStoreQueryTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("/test1"); + CDOResource resource1 = transaction.createResource(getResourcePath("/test1")); objects.add(resource1); Company company1 = getModel1Factory().createCompany(); Category category1 = getModel1Factory().createCategory(); @@ -204,7 +205,7 @@ public class MEMStoreQueryTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("/test1"); + CDOResource resource1 = transaction.createResource(getResourcePath("/test1")); for (int i = 0; i < number; i++) { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MangoTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MangoTest.java index 1cadebf54b..8efc3b131a 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MangoTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MangoTest.java @@ -27,7 +27,7 @@ public class MangoTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); MangoValue v1 = getMangoFactory().createMangoValue(); v1.setName("v1"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapDynamicTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapDynamicTest.java index 0ef1959806..51474cbc70 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapDynamicTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapDynamicTest.java @@ -203,7 +203,7 @@ public class MapDynamicTest extends MapTest } CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource(resourceName); + CDOResource resource = transaction.getResource(getResourcePath(resourceName)); EObject mapHolder = resource.getContents().get(0); @@ -234,7 +234,7 @@ public class MapDynamicTest extends MapTest session.getPackageRegistry().putEPackage(epackage); } - CDOResource resource = transaction.getResource(resourceName); + CDOResource resource = transaction.getResource(getResourcePath(resourceName)); EObject mapHolder = resource.getContents().get(0); @@ -258,7 +258,7 @@ public class MapDynamicTest extends MapTest } CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource(resourceName); + CDOResource resource = transaction.getResource(getResourcePath(resourceName)); EObject mapHolder = resource.getContents().get(0); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapTest.java index 9e5851b9c1..bda2a50d08 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapTest.java @@ -75,9 +75,9 @@ public class MapTest extends AbstractCDOTest objects.put("Simon", "McDuff"); objects.put("Stefan", "Winkler"); objects.put("Victor", "Roldan Betancort"); - objects.put("André", "Dietisheim"); + objects.put("Andr�", "Dietisheim"); objects.put("Ibrahim", "Sallam"); - objects.put("Martin", "Flügge"); + objects.put("Martin", "Fl�gge"); objects.put("Caspar", "De Groot"); objects.put("Martin", "Taal"); @@ -216,7 +216,7 @@ public class MapTest extends AbstractCDOTest boolean keyNotContained = false; boolean valueNotContained = false; - String resourceName = "/test1" + count++; + String resourceName = getResourcePath("/test1" + count++); EClass eType = (EClass)feature.getEType(); for (EStructuralFeature f : eType.getEAllStructuralFeatures()) diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MemoryLeakTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MemoryLeakTest.java index acb3511d3f..7bc3538c24 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MemoryLeakTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MemoryLeakTest.java @@ -45,7 +45,7 @@ public class MemoryLeakTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - Resource resource = transaction.createResource("res1"); + Resource resource = transaction.createResource(getResourcePath("res1")); company = getModel1Factory().createCompany(); resource.getContents().add(company); 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"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MetaTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MetaTest.java index 3edc91b8d8..a7b5362384 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MetaTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MetaTest.java @@ -27,7 +27,7 @@ public class MetaTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); MetaRef metaRef = getModel3Factory().createMetaRef(); metaRef.setEPackageRef(getModel3Package()); @@ -38,7 +38,7 @@ public class MetaTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); MetaRef metaRef = (MetaRef)res.getContents().get(0); assertEquals(getModel3Package(), metaRef.getEPackageRef()); @@ -49,7 +49,7 @@ public class MetaTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); MetaRef metaRef = getModel3Factory().createMetaRef(); res.getContents().add(metaRef); @@ -60,7 +60,7 @@ public class MetaTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); MetaRef metaRef = (MetaRef)res.getContents().get(0); assertEquals(getModel3Package(), metaRef.getEPackageRef()); @@ -76,7 +76,7 @@ public class MetaTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(metaRef); transaction.commit(); @@ -91,7 +91,7 @@ public class MetaTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); MetaRef metaRef = (MetaRef)resource.getContents().get(0); assertEquals(targetRef, metaRef.getEReferenceRef()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MultiValuedOfAttributeTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MultiValuedOfAttributeTest.java index cb1b381c02..c4e18bbdfc 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MultiValuedOfAttributeTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MultiValuedOfAttributeTest.java @@ -130,7 +130,7 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); EObject eGenObject = EcoreUtil.create(containerClass); @@ -150,7 +150,7 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/res1"); + CDOResource resource = transaction.getResource(getResourcePath("/res1")); EObject eGenObject = resource.getContents().get(0); @@ -172,7 +172,7 @@ public class MultiValuedOfAttributeTest extends AbstractCDOTest CDOSession session = openSession(); session.options().setCollectionLoadingPolicy(CDOUtil.createCollectionLoadingPolicy(0, 100)); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/res1"); + CDOResource resource = transaction.getResource(getResourcePath("/res1")); EObject eGenObject = resource.getContents().get(0); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java index d8e5058bfa..8f40dd76aa 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java @@ -195,7 +195,7 @@ public class OCLQueryTest extends AbstractCDOTest private CDOResource createTestSet(CDOTransaction transaction) throws CommitException { disableConsole(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); fillResource(resource); transaction.commit(); enableConsole(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OldValueNotificationTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OldValueNotificationTest.java index afbfd1d3aa..f2369206ba 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OldValueNotificationTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OldValueNotificationTest.java @@ -44,7 +44,7 @@ public class OldValueNotificationTest extends AbstractCDOTest order.setDate(new Date()); order.setShippingAddress(address1); - final CDOResource resourceA = transaction.createResource("/test1"); + final CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); resourceA.getContents().add(order); transaction.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java index 37771df461..f5549edadf 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java @@ -64,7 +64,7 @@ public class PackageRegistryTest extends AbstractCDOTest // Create resource in session 1 CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); Company company = getModel1Factory().createCompany(); company.setName("Eike"); @@ -75,7 +75,7 @@ public class PackageRegistryTest extends AbstractCDOTest // Load resource in session 2 CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); Company company = (Company)res.getContents().get(0); assertEquals("Eike", company.getName()); @@ -88,7 +88,7 @@ public class PackageRegistryTest extends AbstractCDOTest session.getPackageRegistry().putEPackage(getModel1Package()); session.getPackageRegistry().putEPackage(getModel2Package()); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); SpecialPurchaseOrder specialPurchaseOrder = getModel2Factory().createSpecialPurchaseOrder(); specialPurchaseOrder.setDiscountCode("12345"); @@ -98,7 +98,7 @@ public class PackageRegistryTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); SpecialPurchaseOrder specialPurchaseOrder = (SpecialPurchaseOrder)res.getContents().get(0); assertEquals("12345", specialPurchaseOrder.getDiscountCode()); @@ -109,7 +109,7 @@ public class PackageRegistryTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); PurchaseOrder purchaseOrder = getModel1Factory().createPurchaseOrder(); res.getContents().add(purchaseOrder); @@ -120,7 +120,7 @@ public class PackageRegistryTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); MangoValue value = getMangoFactory().createMangoValue(); value.setName("V0"); @@ -150,7 +150,7 @@ public class PackageRegistryTest extends AbstractCDOTest assertEquals(5, session.getPackageRegistry().size()); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); Class1 class1 = getModel3Factory().createClass1(); res.getContents().add(class1); @@ -168,7 +168,7 @@ public class PackageRegistryTest extends AbstractCDOTest session.getPackageRegistry().putEPackage(getModel3Package()); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); Class1 class1 = getModel3Factory().createClass1(); res.getContents().add(class1); @@ -191,8 +191,8 @@ public class PackageRegistryTest extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(Model3Package.eINSTANCE); CDOTransaction transaction = session.openTransaction(); - CDOResource res1 = transaction.createResource("/res1"); - CDOResource res2 = transaction.createResource("/res2"); + CDOResource res1 = transaction.createResource(getResourcePath("/res1")); + CDOResource res2 = transaction.createResource(getResourcePath("/res2")); Class1 class1 = getModel3Factory().createClass1(); Class2 class2 = getModel3SubpackageFactory().createClass2(); @@ -207,7 +207,7 @@ public class PackageRegistryTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res1 = transaction.getResource("/res1"); + CDOResource res1 = transaction.getResource(getResourcePath("/res1")); Class1 class1 = (Class1)res1.getContents().get(0); assertNotNull(class1); @@ -218,7 +218,7 @@ public class PackageRegistryTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res2 = transaction.getResource("/res2"); + CDOResource res2 = transaction.getResource(getResourcePath("/res2")); Class2 class2 = (Class2)res2.getContents().get(0); assertNotNull(class2); @@ -232,7 +232,7 @@ public class PackageRegistryTest extends AbstractCDOTest // Create resource in session 1 CDOSession session = openSession(IRepositoryConfig.REPOSITORY_NAME); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); Company company = getModel1Factory().createCompany(); company.setName("Eike"); @@ -243,7 +243,7 @@ public class PackageRegistryTest extends AbstractCDOTest // Load resource in session 2 CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); Company company = (Company)res.getContents().get(0); assertEquals("Eike", company.getName()); @@ -274,7 +274,7 @@ public class PackageRegistryTest extends AbstractCDOTest p = session.getPackageRegistry().getEPackage(nsURI); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); EFactory factory = p.getEFactoryInstance(); EObject object = factory.create(c); @@ -316,7 +316,7 @@ public class PackageRegistryTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); EFactory factory = p.getEFactoryInstance(); EObject object = factory.create(c); @@ -355,7 +355,7 @@ public class PackageRegistryTest extends AbstractCDOTest CDOUtil.setLegacyModeDefault(false); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); EFactory factory = p.getEFactoryInstance(); EObject object = factory.create(c); @@ -392,7 +392,7 @@ public class PackageRegistryTest extends AbstractCDOTest assertEquals(model1Resource, model1.eResource()); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); EFactory factory = model1.getEFactoryInstance(); EObject company = factory.create(companyClass); @@ -405,7 +405,7 @@ public class PackageRegistryTest extends AbstractCDOTest // Load resource in session 2 CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); CDOObject company = CDOUtil.getCDOObject(res.getContents().get(0)); EClass companyClass = company.eClass(); @@ -426,7 +426,7 @@ public class PackageRegistryTest extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(model1); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); CDOObject company = CDOUtil.getCDOObject(EcoreUtil.create(companyClass)); company.eSet(nameAttribute, "Eike"); @@ -438,7 +438,7 @@ public class PackageRegistryTest extends AbstractCDOTest // Load resource in session 2 CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); CDOObject company = CDOUtil.getCDOObject(res.getContents().get(0)); EClass companyClass = company.eClass(); @@ -457,7 +457,7 @@ public class PackageRegistryTest extends AbstractCDOTest { { CDOTransaction transaction = session1.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); Company company = getModel1Factory().createCompany(); company.setName("Company1"); @@ -475,7 +475,7 @@ public class PackageRegistryTest extends AbstractCDOTest { CDOTransaction transaction = session2.openTransaction(); - CDOResource res = transaction.createResource("/res2"); + CDOResource res = transaction.createResource(getResourcePath("/res2")); Company company = getModel1Factory().createCompany(); company.setName("Company2"); @@ -500,7 +500,7 @@ public class PackageRegistryTest extends AbstractCDOTest { { CDOTransaction transaction = session1.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); Company company = getModel1Factory().createCompany(); company.setName("Company1"); @@ -519,7 +519,7 @@ public class PackageRegistryTest extends AbstractCDOTest { CDOTransaction transaction = session2.openTransaction(); - CDOResource res = transaction.createResource("/res2"); + CDOResource res = transaction.createResource(getResourcePath("/res2")); Company company = getModel1Factory().createCompany(); company.setName("Company2"); @@ -546,7 +546,7 @@ public class PackageRegistryTest extends AbstractCDOTest { { CDOTransaction transaction = session1.openTransaction(); - CDOResource res = transaction.createResource("/res1"); + CDOResource res = transaction.createResource(getResourcePath("/res1")); Company company = getModel1Factory().createCompany(); company.setName("Company1"); @@ -563,7 +563,7 @@ public class PackageRegistryTest extends AbstractCDOTest { CDOTransaction transaction = session2.openTransaction(); - CDOResource res = transaction.createResource("/res2"); + CDOResource res = transaction.createResource(getResourcePath("/res2")); Company company = getModel1Factory().createCompany(); company.setName("Company2"); @@ -599,7 +599,7 @@ public class PackageRegistryTest extends AbstractCDOTest CDOPackageRegistryPopulator.populate(registry, session.getPackageRegistry()); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); Company company = getModel1Factory().createCompany(); company.setName("Eike"); @@ -610,7 +610,7 @@ public class PackageRegistryTest extends AbstractCDOTest // Load resource in session 2 CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); Company company = (Company)res.getContents().get(0); assertEquals("Eike", company.getName()); @@ -639,7 +639,7 @@ public class PackageRegistryTest extends AbstractCDOTest CDOPackageRegistryPopulator.populate(registry, session.getPackageRegistry()); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); Company company = getModel1Factory().createCompany(); company.setName("Eike"); @@ -650,7 +650,7 @@ public class PackageRegistryTest extends AbstractCDOTest // Load resource in session 2 CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); Company company = (Company)res.getContents().get(0); assertEquals("Eike", company.getName()); @@ -666,7 +666,7 @@ public class PackageRegistryTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); Company company = getModel1Factory().createCompany(); company.setName("Eike"); @@ -677,7 +677,7 @@ public class PackageRegistryTest extends AbstractCDOTest // Load resource in session 2 CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/res"); + CDOResource res = transaction.getResource(getResourcePath("/res")); Company company = (Company)res.getContents().get(0); assertEquals("Eike", company.getName()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java index 3cec2169f0..08ba84d532 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java @@ -684,7 +684,7 @@ public class PartialCommitTest extends AbstractCDOTest { CDOSession session2 = openSession(); CDOView view = session2.openView(); - CDOResource resource = view.getResource(resource1.getPath()); + CDOResource resource = view.getResource(getResourcePath(resource1.getPath())); // We want to know if the new company that was committed, is an element // in the getContents() collection of the Resource. We cannot just call diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PerformanceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PerformanceTest.java index 37f3b7c0ce..7e3aa96a3b 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PerformanceTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PerformanceTest.java @@ -74,7 +74,7 @@ public class PerformanceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); getModel1Factory().createCustomer(); for (int i = 0; i < 500; i++) { @@ -109,7 +109,7 @@ public class PerformanceTest extends AbstractCDOTest // EPackage dynamicMapEPackge = createPackage(); // EFactory dynamicMapEFactoryInstance = dynamicMapEPackge.getEFactoryInstance(); // - // CDOResource resource = transaction.createResource("/test1"); + // CDOResource resource = transaction.createResource(getResourcePath("/test1")); // for (int i = 0; i < 5000; i++) // { // @@ -131,7 +131,7 @@ public class PerformanceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); getModel1Factory().createCustomer(); for (int i = 0; i < 500; i++) { @@ -158,7 +158,7 @@ public class PerformanceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); int i = 0; for (EObject o : resource.getContents()) @@ -196,7 +196,7 @@ public class PerformanceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); getModel1Factory().createCustomer(); for (int i = 0; i < 500; i++) { @@ -222,7 +222,7 @@ public class PerformanceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); int i = 0; for (EObject o : resource.getContents()) @@ -259,7 +259,7 @@ public class PerformanceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); for (int i = 0; i < 100; i++) { Customer customer = getModel1Factory().createCustomer(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PushTransactionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PushTransactionTest.java index bf55c3d3d1..9c0631c755 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PushTransactionTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PushTransactionTest.java @@ -70,7 +70,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction); file = pushTransaction.getFile(); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); msg("Make a diff in existing element"); Supplier supplier = (Supplier)resource.getContents().get(0); supplier.setName(newName); @@ -94,7 +94,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource(resourcePath); + CDOResource resource = view.getResource(getResourcePath(resourcePath)); assertEquals(2, resource.getContents().size()); Supplier supplier = (Supplier)resource.getContents().get(0); assertNotNull(supplier); @@ -109,7 +109,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction); file = pushTransaction.getFile(); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); msg("Remove an existing element"); Supplier supplier = (Supplier)resource.getContents().get(0); resource.getContents().remove(supplier); @@ -133,7 +133,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource(resourcePath); + CDOResource resource = view.getResource(getResourcePath(resourcePath)); assertEquals(1, resource.getContents().size()); } @@ -145,7 +145,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction); file = pushTransaction.getFile(); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); msg("Create a new element"); Supplier supplier = getModel1Factory().createSupplier(); supplier.setName("supplier" + System.currentTimeMillis()); @@ -172,7 +172,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource(resourcePath); + CDOResource resource = view.getResource(getResourcePath(resourcePath)); assertEquals(3, resource.getContents().size()); } @@ -184,7 +184,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction); file = pushTransaction.getFile(); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); msg("Create a new element"); Category category = getModel1Factory().createCategory(); Company company = (Company)resource.getContents().get(1); @@ -211,7 +211,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource(resourcePath); + CDOResource resource = view.getResource(getResourcePath(resourcePath)); assertEquals(2, resource.getContents().size()); } @@ -225,7 +225,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction); file = pushTransaction.getFile(); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); msg("Create a new resource"); CDOResource resource2 = transaction.createResource(resourcePath2); resource.getContents().add(resource2); @@ -240,7 +240,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file); assertEquals(true, transaction.isDirty()); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); CDOResource resource2 = (CDOResource)resource.getContents().get(2); assertNotNull(resource2); msg("Publish previous modifications"); @@ -251,7 +251,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOSession session = openSession(); CDOView view = session.openView(); assertEquals(1, view.getRootResource().getContents().size()); - CDOResource resource = view.getResource(resourcePath); + CDOResource resource = view.getResource(getResourcePath(resourcePath)); CDOResource resource2 = (CDOResource)resource.getContents().get(2); assertNotNull(resource2); } @@ -268,7 +268,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction); file = pushTransaction.getFile(); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); msg("Create a new element"); Supplier supplier = getModel1Factory().createSupplier(); supplier.setName(currentSupplierName); @@ -293,7 +293,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file); assertEquals(true, transaction.isDirty()); assertEquals(1, transaction.getRevisionDeltas().size()); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); assertEquals(4, resource.getContents().size()); msg("Publish previous modifications"); pushTransaction.push(); @@ -303,7 +303,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource(resourcePath); + CDOResource resource = view.getResource(getResourcePath(resourcePath)); assertEquals(4, resource.getContents().size()); Supplier supplier = (Supplier)resource.getContents().get(2); assertEquals(currentSupplierName, supplier.getName()); @@ -325,7 +325,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction); file = pushTransaction.getFile(); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); msg("Create a new elements"); Supplier supplier2 = getModel1Factory().createSupplier(); supplier2.setName("supplier" + System.currentTimeMillis()); @@ -345,7 +345,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file); assertEquals(true, transaction.isDirty()); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); assertEquals(supplierName, ((Supplier)resource.getContents().get(1)).getName()); msg("Publish previous modifications"); pushTransaction.push(); @@ -355,7 +355,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOSession session = openSession(); CDOView view = session.openView(); assertEquals(1, view.getRootResource().getContents().size()); - CDOResource resource = view.getResource(resourcePath); + CDOResource resource = view.getResource(getResourcePath(resourcePath)); assertEquals(supplierName, ((Supplier)resource.getContents().get(1)).getName()); } @@ -367,7 +367,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction); file = pushTransaction.getFile(); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); msg("Create a new elements"); Supplier supplier2 = getModel1Factory().createSupplier(); supplier2.setName("supplier" + System.currentTimeMillis()); @@ -385,7 +385,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file); assertEquals(true, transaction.isDirty()); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); assertEquals(0, resource.getContents().size()); msg("Publish previous modifications"); pushTransaction.push(); @@ -394,7 +394,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource(resourcePath); + CDOResource resource = view.getResource(getResourcePath(resourcePath)); assertEquals(0, resource.getContents().size()); } @@ -406,7 +406,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction); file = pushTransaction.getFile(); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); Supplier supplier = (Supplier)resource.getContents().get(0); supplier.setName(null); msg("Commit"); @@ -420,7 +420,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction, file); assertEquals(true, transaction.isDirty()); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); Supplier supplier = (Supplier)resource.getContents().get(0); assertNull(supplier.getName()); msg("Publish previous modifications"); @@ -430,7 +430,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource(resourcePath); + CDOResource resource = view.getResource(getResourcePath(resourcePath)); Supplier supplier = (Supplier)resource.getContents().get(0); assertNull(supplier.getName()); } @@ -443,7 +443,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction); file = pushTransaction.getFile(); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); msg("Make a diff in existing element"); Supplier supplier = (Supplier)resource.getContents().get(0); supplier.setName(null); @@ -456,7 +456,7 @@ public class PushTransactionTest extends AbstractCDOTest msg("Open transaction & commit changes to repo"); CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); resource.getContents().remove(0); transaction.commit(); session.close(); @@ -485,7 +485,7 @@ public class PushTransactionTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction); file = pushTransaction.getFile(); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); msg("Make a diff in existing element"); Supplier supplier = (Supplier)resource.getContents().get(0); supplier.setName("" + System.currentTimeMillis()); @@ -498,7 +498,7 @@ public class PushTransactionTest extends AbstractCDOTest msg("Open transaction & commit changes to repo"); CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getOrCreateResource(resourcePath); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(resourcePath)); Supplier supplier = (Supplier)resource.getContents().get(0); supplier.setName("" + System.currentTimeMillis()); transaction.commit(); @@ -528,7 +528,7 @@ public class PushTransactionTest extends AbstractCDOTest msg("Create resource"); CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource(resourcePath); + CDOResource resource = transaction.createResource(getResourcePath(resourcePath)); msg("Populate resource"); Supplier supplier0 = getModel1Factory().createSupplier(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java index d215788170..e79271cef0 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java @@ -88,7 +88,7 @@ public class RepositoryTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(createCustomer("Eike")); transaction.commit(); // Ensure that model1 is committed to the repository @@ -109,7 +109,7 @@ public class RepositoryTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(createCustomer("Eike")); long timeStamp = transaction.commit().getTimeStamp(); session.close(); @@ -122,7 +122,7 @@ public class RepositoryTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(createCustomer("Eike")); transaction.commit(); // Ensure that model1 is committed to the repository @@ -181,7 +181,7 @@ public class RepositoryTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(createCustomer("Eike")); transaction.commit(); // Ensure that model1 is committed to the repository @@ -241,7 +241,7 @@ public class RepositoryTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(createCustomer("Eike")); transaction.commit(); // Ensure that model1 is committed to the repository @@ -292,7 +292,7 @@ public class RepositoryTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(createCustomer("Eike")); resource.getContents().add(createCustomer("Simon")); resource.getContents().add(createCustomer("Admin")); @@ -333,7 +333,7 @@ public class RepositoryTest extends AbstractCDOTest CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("/res1"); + CDOResource resource = view.getResource(getResourcePath("/res1")); int read = 0; try diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceModificationTrackingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceModificationTrackingTest.java index cdfc4cb2e7..7d5c903605 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceModificationTrackingTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceModificationTrackingTest.java @@ -29,8 +29,8 @@ public class ResourceModificationTrackingTest extends AbstractCDOTest {
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
- CDOResource resource1 = transaction.createResource("/my/resource1");
- CDOResource resource2 = transaction.createResource("/my/resource2");
+ CDOResource resource1 = transaction.createResource(getResourcePath("/my/resource1"));
+ CDOResource resource2 = transaction.createResource(getResourcePath("/my/resource2"));
Company company = getModel1Factory().createCompany();
resource1.getContents().add(company);
transaction.commit();
@@ -67,7 +67,7 @@ public class ResourceModificationTrackingTest extends AbstractCDOTest CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
- CDOResource resource1 = transaction.createResource("/my/resource1");
+ CDOResource resource1 = transaction.createResource(getResourcePath("/my/resource1"));
transaction.commit();
resource1.setTrackingModification(true);
@@ -87,7 +87,7 @@ public class ResourceModificationTrackingTest extends AbstractCDOTest {
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
- CDOResource resource1 = transaction.createResource("/my/resource1");
+ CDOResource resource1 = transaction.createResource(getResourcePath("/my/resource1"));
resource1.setTrackingModification(true);
assertEquals(false, resource1.isModified());
@@ -109,7 +109,7 @@ public class ResourceModificationTrackingTest extends AbstractCDOTest CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
- CDOResource resource1 = transaction.createResource("/my/resource1");
+ CDOResource resource1 = transaction.createResource(getResourcePath("/my/resource1"));
resource1.setTrackingModification(true);
assertEquals(false, resource1.isModified());
@@ -127,7 +127,7 @@ public class ResourceModificationTrackingTest extends AbstractCDOTest {
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
- CDOResource resource1 = transaction.createResource("/my/resource1");
+ CDOResource resource1 = transaction.createResource(getResourcePath("/my/resource1"));
resource1.setTrackingModification(false);
assertEquals(false, resource1.isModified());
@@ -152,7 +152,7 @@ public class ResourceModificationTrackingTest extends AbstractCDOTest {
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
- CDOResource resource1 = transaction.createResource("/my/resource1");
+ CDOResource resource1 = transaction.createResource(getResourcePath("/my/resource1"));
resource1.setTrackingModification(true);
assertEquals(false, resource1.isModified());
@@ -175,7 +175,7 @@ public class ResourceModificationTrackingTest extends AbstractCDOTest {
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
- CDOResource resource1 = transaction.createResource("/my/resource1");
+ CDOResource resource1 = transaction.createResource(getResourcePath("/my/resource1"));
Company company = getModel1Factory().createCompany();
resource1.getContents().add(company);
transaction.commit();
@@ -193,7 +193,7 @@ public class ResourceModificationTrackingTest extends AbstractCDOTest {
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
- CDOResource resource1 = transaction.createResource("/my/resource1");
+ CDOResource resource1 = transaction.createResource(getResourcePath("/my/resource1"));
Company company1 = getModel1Factory().createCompany();
Company company2 = getModel1Factory().createCompany();
resource1.getContents().add(company1);
@@ -219,7 +219,7 @@ public class ResourceModificationTrackingTest extends AbstractCDOTest {
CDOSession session = openSession();
CDOTransaction transaction = session.openTransaction();
- CDOResource resource = transaction.createResource("/my/resource1");
+ CDOResource resource = transaction.createResource(getResourcePath("/my/resource1"));
resource.setTrackingModification(true);
Company company = getModel1Factory().createCompany();
resource.getContents().add(company);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java index 663f4aa926..0ccfd3f382 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java @@ -64,7 +64,7 @@ public class ResourceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/folder/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/folder/res1")); counter = 0; Category category = createCategoryTree(3); @@ -100,7 +100,7 @@ public class ResourceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/folder/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/folder/res1")); counter = 0; Category category = createCategoryTree(3); @@ -146,8 +146,8 @@ public class ResourceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/folder/res1"); - CDOResource resource2 = transaction.createResource("/folder/res2"); + CDOResource resource = transaction.createResource(getResourcePath("/folder/res1")); + CDOResource resource2 = transaction.createResource(getResourcePath("/folder/res2")); counter = 0; Category category = createCategoryTree(3); @@ -229,13 +229,13 @@ public class ResourceTest extends AbstractCDOTest { URI rootResourceURI = null; URI resourceURI = null; - String resourcePath = "test1"; + String resourcePath = getResourcePath("/test1"); { CDOSession session = openSession(); ResourceSet resourceSet = new ResourceSetImpl(); CDOTransaction transaction = session.openTransaction(resourceSet); - resourceURI = URI.createURI("cdo:/" + resourcePath); + resourceURI = URI.createURI("cdo:" + resourcePath); Resource res1 = resourceSet.createResource(resourceURI); transaction.commit(); @@ -320,13 +320,13 @@ public class ResourceTest extends AbstractCDOTest // Adapter will be called right after and could be used! transaction.getResourceSet().eAdapters().add(new TestAdapter()); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); assertActive(resource); - CDOResource resourceCopy = transaction.getOrCreateResource("/test1"); + CDOResource resourceCopy = transaction.getOrCreateResource(getResourcePath("/test1")); assertEquals(resource, resourceCopy); assertNew(resource, transaction); - assertEquals(CDOURIUtil.createResourceURI(session, "test1"), resource.getURI()); + assertEquals(CDOURIUtil.createResourceURI(session, getResourcePath("test1")), resource.getURI()); assertEquals(transaction.getResourceSet(), resource.getResourceSet()); } @@ -335,15 +335,15 @@ public class ResourceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - transaction.createResource("/org/eclipse/net4j/core"); + transaction.createResource(getResourcePath("/org/eclipse/net4j/core")); transaction.commit(); session.close(); } CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/org/eclipse/net4j/core"); - assertEquals(CDOURIUtil.createResourceURI(session, "/org/eclipse/net4j/core"), resource.getURI()); + CDOResource resource = transaction.getResource(getResourcePath("/org/eclipse/net4j/core")); + assertEquals(CDOURIUtil.createResourceURI(session, getResourcePath("/org/eclipse/net4j/core")), resource.getURI()); assertEquals(transaction.getResourceSet(), resource.getResourceSet()); session.close(); } @@ -375,7 +375,7 @@ public class ResourceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); ResourceSet rset = transaction.getResourceSet(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); assertActive(resource); transaction.commit(); @@ -392,7 +392,7 @@ public class ResourceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); CDOResource resource = (CDOResource)transaction.getResourceSet().getResource( - CDOURIUtil.createResourceURI(transaction, "/test1"), true); + CDOURIUtil.createResourceURI(transaction, getResourcePath("/test1")), true); assertNotNull(resource); assertEquals(transaction.getResourceSet(), resource.getResourceSet()); assertEquals(1, transaction.getResourceSet().getResources().size()); @@ -407,9 +407,9 @@ public class ResourceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("/my/resource1"); - CDOResource resource2 = transaction.createResource("/my/resource2"); - CDOResource resource3 = transaction.createResource("/my/resource3"); + CDOResource resource1 = transaction.createResource(getResourcePath("/my/resource1")); + CDOResource resource2 = transaction.createResource(getResourcePath("/my/resource2")); + CDOResource resource3 = transaction.createResource(getResourcePath("/my/resource3")); List<Resource> tobeRemoved = new ArrayList<Resource>(); tobeRemoved.add(resource1); @@ -437,9 +437,9 @@ public class ResourceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("/my/resource1"); - CDOResource resource2 = transaction.createResource("/my/resource2"); - CDOResource resource3 = transaction.createResource("/my/resource3"); + CDOResource resource1 = transaction.createResource(getResourcePath("/my/resource1")); + CDOResource resource2 = transaction.createResource(getResourcePath("/my/resource2")); + CDOResource resource3 = transaction.createResource(getResourcePath("/my/resource3")); List<Resource> tobeRemoved = new ArrayList<Resource>(); tobeRemoved.add(resource1); @@ -461,18 +461,18 @@ public class ResourceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - transaction.createResource("/level1/level2-A/level3"); - transaction.createResource("/level1/level2-B/level3"); + transaction.createResource(getResourcePath("/level1/level2-A/level3")); + transaction.createResource(getResourcePath("/level1/level2-B/level3")); transaction.commit(); session.close(); } CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.getResource("/level1/level2-A/level3"); - CDOResource resource2 = transaction.getResource("/level1/level2-B/level3"); - assertEquals("/level1/level2-A/level3", resource1.getPath()); - assertEquals("/level1/level2-B/level3", resource2.getPath()); + CDOResource resource1 = transaction.getResource(getResourcePath("/level1/level2-A/level3")); + CDOResource resource2 = transaction.getResource(getResourcePath("/level1/level2-B/level3")); + assertEquals(getResourcePath("/level1/level2-A/level3"), resource1.getPath()); + assertEquals(getResourcePath("/level1/level2-B/level3"), resource2.getPath()); session.close(); } @@ -481,8 +481,8 @@ public class ResourceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - transaction.createResource("/level1/level2-A/level3"); - transaction.createResource("/level1/level2-B/level3"); + transaction.createResource(getResourcePath("/level1/level2-A/level3")); + transaction.createResource(getResourcePath("/level1/level2-B/level3")); transaction.commit(); session.close(); } @@ -491,10 +491,10 @@ public class ResourceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.getResource("/level1/level2-A/level3"); - CDOResource resource2 = transaction.getResource("/level1/level2-B/level3"); - assertEquals("/level1/level2-A/level3", resource1.getPath()); - assertEquals("/level1/level2-B/level3", resource2.getPath()); + CDOResource resource1 = transaction.getResource(getResourcePath("/level1/level2-A/level3")); + CDOResource resource2 = transaction.getResource(getResourcePath("/level1/level2-B/level3")); + assertEquals(getResourcePath("/level1/level2-A/level3"), resource1.getPath()); + assertEquals(getResourcePath("/level1/level2-B/level3"), resource2.getPath()); session.close(); } @@ -502,10 +502,10 @@ public class ResourceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - transaction.createResource("/my/resource"); + transaction.createResource(getResourcePath("/my/resource")); transaction.commit(); - transaction.createResource("/my/resource"); + transaction.createResource(getResourcePath("/my/resource")); try { @@ -526,13 +526,13 @@ public class ResourceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); transaction.commit(); resource.delete(null); transaction.commit(); - transaction.createResource("/my/resource"); + transaction.createResource(getResourcePath("/my/resource")); transaction.commit(); session.close(); } @@ -582,7 +582,7 @@ public class ResourceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); transaction.commit(); URI uri = URI.createURI("cdo://repo1/renamed"); @@ -607,7 +607,7 @@ public class ResourceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); transaction.commit(); URI uri = URI.createURI("cdo://repo1/renamed"); @@ -632,39 +632,39 @@ public class ResourceTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); - assertEquals("/res1", resource.getPath()); - assertEquals(CDOURIUtil.createResourceURI(session, "/res1"), resource.getURI()); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); + assertEquals(getResourcePath("/res1"), resource.getPath()); + assertEquals(CDOURIUtil.createResourceURI(session, getResourcePath("/res1")), resource.getURI()); transaction.commit(); - assertEquals("/res1", resource.getPath()); - assertEquals(CDOURIUtil.createResourceURI(session, "/res1"), resource.getURI()); + assertEquals(getResourcePath("/res1"), resource.getPath()); + assertEquals(CDOURIUtil.createResourceURI(session, getResourcePath("/res1")), resource.getURI()); session.close(); } { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/res1"); - assertEquals("/res1", resource.getPath()); - assertEquals(CDOURIUtil.createResourceURI(session, "/res1"), resource.getURI()); + CDOResource resource = transaction.getResource(getResourcePath("/res1")); + assertEquals(getResourcePath("/res1"), resource.getPath()); + assertEquals(CDOURIUtil.createResourceURI(session, getResourcePath("/res1")), resource.getURI()); - CDOResource resource2 = transaction.getOrCreateResource("/res2"); - assertEquals("/res2", resource2.getPath()); - assertEquals(CDOURIUtil.createResourceURI(session, "/res2"), resource2.getURI()); + CDOResource resource2 = transaction.getOrCreateResource(getResourcePath("/res2")); + assertEquals(getResourcePath("/res2"), resource2.getPath()); + assertEquals(CDOURIUtil.createResourceURI(session, getResourcePath("/res2")), resource2.getURI()); transaction.commit(); - assertEquals("/res2", resource2.getPath()); - assertEquals(CDOURIUtil.createResourceURI(session, "/res2"), resource2.getURI()); + assertEquals(getResourcePath("/res2"), resource2.getPath()); + assertEquals(CDOURIUtil.createResourceURI(session, getResourcePath("/res2")), resource2.getURI()); session.close(); } { CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource2 = view.getResource("/res2"); - assertEquals("/res2", resource2.getPath()); - assertEquals(CDOURIUtil.createResourceURI(session, "/res2"), resource2.getURI()); + CDOResource resource2 = view.getResource(getResourcePath("/res2")); + assertEquals(getResourcePath("/res2"), resource2.getPath()); + assertEquals(CDOURIUtil.createResourceURI(session, getResourcePath("/res2")), resource2.getURI()); session.close(); } } @@ -678,7 +678,7 @@ public class ResourceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); resource.getContents().add(company); transaction.commit(); @@ -688,7 +688,7 @@ public class ResourceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/res1"); + CDOResource resource = transaction.getResource(getResourcePath("/res1")); resource.cdoPrefetch(CDORevision.DEPTH_INFINITE); Company company = (Company)resource.getContents().get(0); @@ -869,7 +869,7 @@ public class ResourceTest extends AbstractCDOTest try { - view.getResource("/resource1"); + view.getResource(getResourcePath("/resource1")); fail("Exception expected"); } catch (Exception expected) @@ -928,7 +928,7 @@ public class ResourceTest extends AbstractCDOTest try { - view.getResource("/resource1"); + view.getResource(getResourcePath("/resource1")); fail("Exception expected"); } catch (Exception expected) @@ -971,8 +971,8 @@ public class ResourceTest extends AbstractCDOTest CDOID objectID = object.cdoID(); transaction.commit(); - assertEquals(true, view.hasResource("/resource1")); - assertEquals(resource.getURI(), view.getResource("/resource1").getURI()); + assertEquals(true, view.hasResource(getResourcePath("/resource1"))); + assertEquals(resource.getURI(), view.getResource(getResourcePath("/resource1")).getURI()); resource.delete(null); commitAndSync(transaction, view); @@ -991,7 +991,7 @@ public class ResourceTest extends AbstractCDOTest try { - view.getResource("/resource1"); + view.getResource(getResourcePath("/resource1")); fail("Exception expected"); } catch (Exception expected) @@ -1034,8 +1034,8 @@ public class ResourceTest extends AbstractCDOTest CDOID objectID = object.cdoID(); transaction.commit(); - assertEquals(true, view.hasResource("/resource1")); - assertEquals(resource.getURI(), view.getResource("/resource1").getURI()); + assertEquals(true, view.hasResource(getResourcePath("/resource1"))); + assertEquals(resource.getURI(), view.getResource(getResourcePath("/resource1")).getURI()); resource.delete(null); commitAndSync(transaction, view); @@ -1055,7 +1055,7 @@ public class ResourceTest extends AbstractCDOTest try { - CDOResource resource1 = view.getResource("/resource1"); + CDOResource resource1 = view.getResource(getResourcePath("/resource1")); assertNull(resource1); fail("Exception expected"); // TODO Fails on automated build: @@ -1147,7 +1147,7 @@ public class ResourceTest extends AbstractCDOTest try { - view.getResource("/folder/resource1"); + view.getResource(getResourcePath("/folder/resource1")); fail("Exception expected"); } catch (Exception expected) @@ -1225,7 +1225,7 @@ public class ResourceTest extends AbstractCDOTest try { - view.getResource("/folder/resource1"); + view.getResource(getResourcePath("/folder/resource1")); fail("Exception expected"); } catch (Exception expected) @@ -1275,8 +1275,8 @@ public class ResourceTest extends AbstractCDOTest CDOObject object = CDOUtil.getCDOObject(resource.getContents().get(0)); transaction.commit(); - assertEquals(true, view.hasResource("/folder/resource1")); - assertEquals(resource.getURI(), view.getResource("/folder/resource1").getURI()); + assertEquals(true, view.hasResource(getResourcePath("/folder/resource1"))); + assertEquals(resource.getURI(), view.getResource(getResourcePath("/folder/resource1")).getURI()); CDOID folderID = folder.cdoID(); CDOID resourceID = resource.cdoID(); @@ -1308,7 +1308,7 @@ public class ResourceTest extends AbstractCDOTest try { - view.getResource("/folder/resource1"); + view.getResource(getResourcePath("/folder/resource1")); fail("Exception expected"); } catch (Exception expected) @@ -1358,8 +1358,8 @@ public class ResourceTest extends AbstractCDOTest CDOObject object = CDOUtil.getCDOObject(resource.getContents().get(0)); transaction.commit(); - assertEquals(true, view.hasResource("/folder/resource1")); - assertEquals(resource.getURI(), view.getResource("/folder/resource1").getURI()); + assertEquals(true, view.hasResource(getResourcePath("/folder/resource1"))); + assertEquals(resource.getURI(), view.getResource(getResourcePath("/folder/resource1")).getURI()); CDOID folderID = folder.cdoID(); CDOID resourceID = resource.cdoID(); @@ -1392,7 +1392,7 @@ public class ResourceTest extends AbstractCDOTest try { - view.getResource("/folder/resource1"); + view.getResource(getResourcePath("/folder/resource1")); // TODO Fails on automated build fail("Exception expected"); } @@ -1628,7 +1628,7 @@ public class ResourceTest extends AbstractCDOTest p.setName("test-" + path); p.setVat(VAT.VAT0); - CDOResource resource = transaction.createResource(path); + CDOResource resource = transaction.createResource(getResourcePath(path)); resource.getContents().add(p); return resource; } @@ -1639,15 +1639,16 @@ public class ResourceTest extends AbstractCDOTest p.setName("test-" + path + "-modified"); p.setVat(VAT.VAT0); - CDOResource resource = transaction.getResource(path); + CDOResource resource = transaction.getResource(getResourcePath(path)); resource.getContents().add(p); return resource; } - private void queryResources(CDOView view, String pathPrefix, int expected) + private void queryResources(CDOView view, String namePrefix, int expected) { - msg("Path prefix: " + pathPrefix); - List<CDOResourceNode> nodes = view.queryResources(null, pathPrefix, false); + msg("Name prefix: " + namePrefix); + CDOResourceFolder folder = (CDOResourceFolder)view.getResourceNode(getResourcePath(null)); + List<CDOResourceNode> nodes = view.queryResources(folder, namePrefix, false); for (CDOResourceNode node : nodes) { msg("Result: " + node.getPath()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaCascadingBranchesTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaCascadingBranchesTest.java index 5c6c10a24f..04c44eba51 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaCascadingBranchesTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaCascadingBranchesTest.java @@ -54,7 +54,7 @@ public class RevisionDeltaCascadingBranchesTest extends RevisionDeltaTest CDOBranch mainBranch = session.getBranchManager().getMainBranch(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); addCompaniesToList(resource.getContents(), 0, 10); addCompaniesToList(referenceMain, 0, 10); @@ -84,7 +84,7 @@ public class RevisionDeltaCascadingBranchesTest extends RevisionDeltaTest CDOBranch mainBranch = session.getBranchManager().getMainBranch(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); addCompaniesToList(resource.getContents(), 10, 15); addCompaniesToList(referenceMain, 10, 15); @@ -113,7 +113,7 @@ public class RevisionDeltaCascadingBranchesTest extends RevisionDeltaTest subBranchID = subBranch.getID(); CDOTransaction transaction = session.openTransaction(subBranch); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); addCompaniesToList(resource.getContents(), 10, 15); addCompaniesToList(referenceSub, 10, 15); @@ -139,7 +139,7 @@ public class RevisionDeltaCascadingBranchesTest extends RevisionDeltaTest CDOSession session = openSession(); CDOBranch subBranch = session.getBranchManager().getBranch(subBranchID); CDOTransaction transaction = session.openTransaction(subBranch); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); addCompaniesToList(resource.getContents(), 15, 20); addCompaniesToList(referenceSub, 15, 20); @@ -166,7 +166,7 @@ public class RevisionDeltaCascadingBranchesTest extends RevisionDeltaTest subsubBranchID = subsubBranch.getID(); CDOTransaction transaction = session.openTransaction(subsubBranch); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); addCompaniesToList(resource.getContents(), 15, 20); addCompaniesToList(referenceSubSub, 15, 20); @@ -192,7 +192,7 @@ public class RevisionDeltaCascadingBranchesTest extends RevisionDeltaTest CDOSession session = openSession(); CDOBranch subBranch = session.getBranchManager().getBranch(subBranchID); CDOTransaction transaction = session.openTransaction(subBranch); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); manipulator.doManipulations(resource.getContents()); manipulator.doManipulations(referenceSub); @@ -217,7 +217,7 @@ public class RevisionDeltaCascadingBranchesTest extends RevisionDeltaTest CDOSession session = openSession(); CDOBranch subsubBranch = session.getBranchManager().getBranch(subsubBranchID); CDOTransaction transaction = session.openTransaction(subsubBranch); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); manipulator.doManipulations(resource.getContents()); manipulator.doManipulations(referenceSubSub); @@ -241,7 +241,7 @@ public class RevisionDeltaCascadingBranchesTest extends RevisionDeltaTest CDOSession session = openSession(); CDOBranch subsubBranch = session.getBranchManager().getBranch(subsubBranchID); CDOView view = session.openView(subsubBranch); - CDOResource resource = view.getResource("/test1"); + CDOResource resource = view.getResource(getResourcePath("/test1")); assertEquals(referenceSubSub.size(), resource.getContents().size()); @@ -260,7 +260,7 @@ public class RevisionDeltaCascadingBranchesTest extends RevisionDeltaTest CDOSession session = openSession(); CDOBranch subBranch = session.getBranchManager().getBranch(subBranchID); CDOView view = session.openView(subBranch); - CDOResource resource = view.getResource("/test1"); + CDOResource resource = view.getResource(getResourcePath("/test1")); assertEquals(referenceSub.size(), resource.getContents().size()); @@ -278,7 +278,7 @@ public class RevisionDeltaCascadingBranchesTest extends RevisionDeltaTest { CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("/test1"); + CDOResource resource = view.getResource(getResourcePath("/test1")); assertEquals(referenceMain.size(), resource.getContents().size()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaInBranchTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaInBranchTest.java index 8a1714aec8..dd7c9e3f9c 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaInBranchTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaInBranchTest.java @@ -51,7 +51,7 @@ public class RevisionDeltaInBranchTest extends RevisionDeltaTest CDOBranch mainBranch = session.getBranchManager().getMainBranch(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); addCompaniesToList(resource.getContents(), 0, 10); addCompaniesToList(referenceMain, 0, 10); @@ -80,7 +80,7 @@ public class RevisionDeltaInBranchTest extends RevisionDeltaTest CDOBranch mainBranch = session.getBranchManager().getMainBranch(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); addCompaniesToList(resource.getContents(), 10, 15); addCompaniesToList(referenceMain, 10, 15); @@ -109,7 +109,7 @@ public class RevisionDeltaInBranchTest extends RevisionDeltaTest subBranchID = subBranch.getID(); CDOTransaction transaction = session.openTransaction(subBranch); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); addCompaniesToList(resource.getContents(), 10, 20); addCompaniesToList(referenceSub, 10, 20); @@ -135,7 +135,7 @@ public class RevisionDeltaInBranchTest extends RevisionDeltaTest CDOSession session = openSession(); CDOBranch subBranch = session.getBranchManager().getBranch(subBranchID); CDOTransaction transaction = session.openTransaction(subBranch); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); manipulator.doManipulations(resource.getContents()); manipulator.doManipulations(referenceSub); @@ -159,7 +159,7 @@ public class RevisionDeltaInBranchTest extends RevisionDeltaTest CDOSession session = openSession(); CDOBranch subBranch = session.getBranchManager().getBranch(subBranchID); CDOView view = session.openView(subBranch); - CDOResource resource = view.getResource("/test1"); + CDOResource resource = view.getResource(getResourcePath("/test1")); assertEquals(referenceSub.size(), resource.getContents().size()); @@ -177,7 +177,7 @@ public class RevisionDeltaInBranchTest extends RevisionDeltaTest { CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("/test1"); + CDOResource resource = view.getResource(getResourcePath("/test1")); assertEquals(referenceMain.size(), resource.getContents().size()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java index 22a804d535..0d41a743ce 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java @@ -62,7 +62,7 @@ public class RevisionDeltaTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("/test1"); + CDOResource resource1 = transaction.createResource(getResourcePath("/test1")); Company company1 = getModel1Factory().createCompany(); Category category1 = getModel1Factory().createCategory(); @@ -122,7 +122,7 @@ public class RevisionDeltaTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); SalesOrder salesOrder = getModel1Factory().createSalesOrder(); resource.getContents().add(salesOrder); @@ -156,7 +156,7 @@ public class RevisionDeltaTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); SalesOrder salesOrder = getModel1Factory().createSalesOrder(); resource.getContents().add(salesOrder); @@ -180,7 +180,7 @@ public class RevisionDeltaTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Customer customer = getModel1Factory().createCustomer(); resource.getContents().add(customer); @@ -210,7 +210,7 @@ public class RevisionDeltaTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Customer customer = getModel1Factory().createCustomer(); resource.getContents().add(customer); @@ -242,7 +242,7 @@ public class RevisionDeltaTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); NodeD a = getModel3Factory().createNodeD(); NodeD b = getModel3Factory().createNodeD(); @@ -259,7 +259,7 @@ public class RevisionDeltaTest extends AbstractCDOTest transaction.commit(); transaction.close(); transaction = session.openTransaction(); - resource = transaction.getResource("/test1"); + resource = transaction.getResource(getResourcePath("/test1")); } // Start test logic @@ -282,7 +282,7 @@ public class RevisionDeltaTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); NodeD a = getModel3Factory().createNodeD(); NodeD b = getModel3Factory().createNodeD(); @@ -299,7 +299,7 @@ public class RevisionDeltaTest extends AbstractCDOTest transaction.commit(); transaction.close(); transaction = session.openTransaction(); - resource = transaction.getResource("/test1"); + resource = transaction.getResource(getResourcePath("/test1")); } // Start test logic @@ -545,7 +545,7 @@ public class RevisionDeltaTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); for (int i = 0; i < 20; i++) { @@ -577,7 +577,7 @@ public class RevisionDeltaTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); manipulator.doManipulations(resource.getContents()); manipulator.doManipulations(reference); @@ -600,7 +600,7 @@ public class RevisionDeltaTest extends AbstractCDOTest { CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("/test1"); + CDOResource resource = view.getResource(getResourcePath("/test1")); assertEquals(reference.size(), resource.getContents().size()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RollbackTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RollbackTest.java index 05930abb38..c987534d4b 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RollbackTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RollbackTest.java @@ -51,7 +51,7 @@ public class RollbackTest extends AbstractCDOTest protected void flow1(CDOTransaction transaction1, CDOTransaction transaction2) throws CommitException { // Client1 - CDOResource resource1 = transaction1.createResource("/test1"); + CDOResource resource1 = transaction1.createResource(getResourcePath("/test1")); Company company1 = getModel1Factory().createCompany(); resource1.getContents().add(company1); Category category1 = getModel1Factory().createCategory(); @@ -60,7 +60,7 @@ public class RollbackTest extends AbstractCDOTest // Client2 transaction2.waitForUpdate(commitTime, DEFAULT_TIMEOUT); - CDOResource resource2 = transaction2.getResource("/test1"); + CDOResource resource2 = transaction2.getResource(getResourcePath("/test1")); Company company2 = (Company)resource2.getContents().get(0); // Infrequent exceptions in legacy mode Category category2 = company2.getCategories().get(0); category2.setName("client2"); @@ -138,7 +138,7 @@ public class RollbackTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res"); + CDOResource resource = transaction.createResource(getResourcePath("/res")); resource.getContents().add(getModel1Factory().createCompany()); transaction.commit(); session.close(); @@ -146,7 +146,7 @@ public class RollbackTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/res"); + CDOResource resource = transaction.getResource(getResourcePath("/res")); Company company = (Company)resource.getContents().get(0); company.setName("MyCompany"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SavePointTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SavePointTest.java index b2e519a4e0..9298d0952e 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SavePointTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SavePointTest.java @@ -169,7 +169,7 @@ public class SavePointTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); // Client1 - CDOResource resource1 = transaction.createResource("/test1"); + CDOResource resource1 = transaction.createResource(getResourcePath("/test1")); Category category3, category2, category4; Company company1 = getModel1Factory().createCompany(); @@ -298,7 +298,7 @@ public class SavePointTest extends AbstractCDOTest // client2 modifies object2 CDOSession client2 = openSession(); CDOTransaction transaction2 = client2.openTransaction(); - CDOResource object2Y = transaction2.getResource("/object2"); + CDOResource object2Y = transaction2.getResource(getResourcePath("/object2")); object2Y.getContents().add(getModel1Factory().createPurchaseOrder()); // client2 commits @@ -310,9 +310,9 @@ public class SavePointTest extends AbstractCDOTest // CDORepositoryInfo: object1 not modified, object2 is modified CDOSession client3 = openSession(); CDOView view = client3.openView(); - CDOResource object1Test = view.getResource("/object1"); + CDOResource object1Test = view.getResource(getResourcePath("/object1")); assertEquals(0, object1Test.getContents().size()); - CDOResource object2Test = view.getResource("/object2"); + CDOResource object2Test = view.getResource(getResourcePath("/object2")); assertEquals(1, object2Test.getContents().size()); // client1: same as repository @@ -320,7 +320,7 @@ public class SavePointTest extends AbstractCDOTest assertEquals(object2Test.getContents().size(), object2X.getContents().size()); // client2: same as repository - CDOResource object1Y = transaction2.getResource("/object1"); + CDOResource object1Y = transaction2.getResource(getResourcePath("/object1")); assertEquals(object1Test.getContents().size(), object1Y.getContents().size()); assertEquals(object2Test.getContents().size(), object2Y.getContents().size()); } @@ -332,7 +332,7 @@ public class SavePointTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Company company = getModel1Factory().createCompany(); resource.getContents().add(company); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java index 69f59b02b2..466149cf66 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java @@ -62,14 +62,14 @@ public class SessionTest extends AbstractCDOTest CDOSession session1 = openSession(); session1.options().setPassiveUpdateEnabled(false); CDOTransaction transaction = session1.openTransaction(); - CDOResource resource1 = transaction.createResource("ttt"); + CDOResource resource1 = transaction.createResource(getResourcePath("ttt")); resource1.getContents().add(getModel1Factory().createCategory()); transaction.commit(); CDOSession session2 = openSession(); session2.options().setPassiveUpdateEnabled(false); CDOView view = session2.openView(); - CDOResource resource2 = view.getResource("ttt"); + CDOResource resource2 = view.getResource(getResourcePath("ttt")); assertEquals(1, resource2.getContents().size()); resource1.getContents().add(getModel1Factory().createCategory()); @@ -89,13 +89,13 @@ public class SessionTest extends AbstractCDOTest CDOSession session1 = openSession(); session1.options().setPassiveUpdateEnabled(false); CDOTransaction transaction = session1.openTransaction(); - CDOResource resource1 = transaction.createResource("ttt"); + CDOResource resource1 = transaction.createResource(getResourcePath("ttt")); transaction.commit(); CDOSession session2 = openSession(); session2.options().setPassiveUpdateEnabled(false); CDOView view = session2.openView(); - CDOResource resource2 = view.getResource("ttt"); + CDOResource resource2 = view.getResource(getResourcePath("ttt")); assertEquals(0, resource2.getContents().size()); resource1.getContents().add(getModel1Factory().createCategory()); @@ -120,7 +120,7 @@ public class SessionTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("ttt"); + CDOResource resource = transaction.createResource(getResourcePath("ttt")); resource.getContents().add(getModel1Factory().createCompany()); transaction.commit(); @@ -157,7 +157,7 @@ public class SessionTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - transaction.createResource("ttt"); + transaction.createResource(getResourcePath("ttt")); long commitTime = transaction.commit().getTimeStamp(); waitForUpdate(commitTime, session); @@ -168,13 +168,13 @@ public class SessionTest extends AbstractCDOTest { CDOSession session1 = openSession(); final CDOTransaction transaction = session1.openTransaction(); - transaction.createResource("ttt"); + transaction.createResource(getResourcePath("ttt")); long commitTime1 = transaction.commit().getTimeStamp(); final CDOSession session2 = openSession(); waitForUpdate(commitTime1, session2); - transaction.createResource("xxx"); + transaction.createResource(getResourcePath("xxx")); long commitTime2 = transaction.commit().getTimeStamp(); waitForUpdate(commitTime2, session2); @@ -198,7 +198,7 @@ public class SessionTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - transaction.createResource("ttt"); + transaction.createResource(getResourcePath("ttt")); long commitTime = transaction.commit().getTimeStamp(); assertEquals(true, session.waitForUpdate(commitTime, DEFAULT_TIMEOUT)); @@ -208,7 +208,7 @@ public class SessionTest extends AbstractCDOTest public void testWaitForUpdateRemote() throws Exception { final CDOTransaction transaction = openSession().openTransaction(); - transaction.createResource("ttt"); + transaction.createResource(getResourcePath("ttt")); final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch stopLatch = new CountDownLatch(1); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SetFeatureTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SetFeatureTest.java index 4431527142..bed5082384 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SetFeatureTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SetFeatureTest.java @@ -660,7 +660,7 @@ public class SetFeatureTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); assertEquals(false, object.eIsSet(feature)); @@ -714,7 +714,7 @@ public class SetFeatureTest extends AbstractCDOTest session = openSession(); transaction = session.openTransaction(); - resource = transaction.getResource("/test1", true); + resource = transaction.getResource(getResourcePath("/test1"), true); object = resource.getContents().get(0); if (!feature.isUnsettable() && ObjectUtil.equals(feature.getDefaultValue(), value)) @@ -747,7 +747,7 @@ public class SetFeatureTest extends AbstractCDOTest transaction = session.openTransaction(); CDOView view = session.openView(); - resource = view.getResource("/test1"); + resource = view.getResource(getResourcePath("/test1")); object = resource.getContents().get(0); assertEquals(false, object.eIsSet(feature)); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java index fcb42a789c..9a9245385a 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StateMachineTest.java @@ -53,9 +53,10 @@ public class StateMachineTest extends AbstractCDOTest // Attach resource CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); assertNew(resource, transaction); - assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + "/test1"), resource.getURI()); + assertEquals(URI.createURI("cdo://" + session.getRepositoryInfo().getUUID() + getResourcePath("/test1")), + resource.getURI()); assertEquals(transaction.getResourceSet(), resource.getResourceSet()); // Attach single object @@ -301,7 +302,7 @@ public class StateMachineTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); assertNew(resource, transaction); Supplier supplier = getModel1Factory().createSupplier(); @@ -315,7 +316,7 @@ public class StateMachineTest extends AbstractCDOTest // Detach single object CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); assertNew(resource, transaction); Supplier supplier = getModel1Factory().createSupplier(); @@ -363,7 +364,7 @@ public class StateMachineTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Category cat1 = getModel1Factory().createCategory(); cat1.setName("CAT1"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StickyViewsTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StickyViewsTest.java index 8603a6c65a..093f1cc753 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StickyViewsTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/StickyViewsTest.java @@ -96,7 +96,7 @@ public class StickyViewsTest extends AbstractCDOTest // Persist it CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); - CDOResource res = transaction1.createResource("/res1"); + CDOResource res = transaction1.createResource(getResourcePath("/res1")); res.getContents().add(company1); transaction1.commit(); @@ -106,7 +106,7 @@ public class StickyViewsTest extends AbstractCDOTest CDOSession session2 = openSession(); session2.options().setPassiveUpdateEnabled(false); CDOTransaction transaction2 = session2.openTransaction(); - CDOResource res2 = transaction2.getResource("/res1"); + CDOResource res2 = transaction2.getResource(getResourcePath("/res1")); Company company2 = (Company)res2.getContents().get(0); // In the 1st session, manipulate the categories @@ -184,7 +184,7 @@ public class StickyViewsTest extends AbstractCDOTest { CDOSession sess = openSession(); CDOTransaction tx = sess.openTransaction(); - CDOResource res = tx.createResource("/res1"); + CDOResource res = tx.createResource(getResourcePath("/res1")); Company company1 = getModel1Factory().createCompany(); company1.setName("aaa"); res.getContents().add(company1); @@ -197,7 +197,7 @@ public class StickyViewsTest extends AbstractCDOTest CDOSession sess = openSession(); CDOTransaction tx = sess.openTransaction(); sess.options().setPassiveUpdateEnabled(false); - CDOResource res = tx.getResource("/res1"); + CDOResource res = tx.getResource(getResourcePath("/res1")); // Save with a new name Company company1 = (Company)res.getContents().get(0); @@ -235,7 +235,7 @@ public class StickyViewsTest extends AbstractCDOTest { CDOSession sess = openSession(); CDOTransaction tx = sess.openTransaction(); - CDOResource res = tx.createResource("/res1"); + CDOResource res = tx.createResource(getResourcePath("/res1")); Company company1 = getModel1Factory().createCompany(); company1.setName("aaa"); res.getContents().add(company1); @@ -248,7 +248,7 @@ public class StickyViewsTest extends AbstractCDOTest CDOSession sess = openSession(); CDOTransaction tx = sess.openTransaction(); sess.options().setPassiveUpdateEnabled(false); - CDOResource res = tx.getResource("/res1"); + CDOResource res = tx.getResource(getResourcePath("/res1")); // Remove it Company company1 = (Company)res.getContents().get(0); @@ -287,7 +287,7 @@ public class StickyViewsTest extends AbstractCDOTest CDOTransaction tx = sess.openTransaction(); sess.options().setPassiveUpdateEnabled(false); - CDOResource res = tx.createResource("/res1"); + CDOResource res = tx.createResource(getResourcePath("/res1")); Company company1 = getModel1Factory().createCompany(); company1.setName("aaa"); res.getContents().add(company1); @@ -319,7 +319,7 @@ public class StickyViewsTest extends AbstractCDOTest CDOTransaction tx = sess.openTransaction(); sess.options().setPassiveUpdateEnabled(false); - CDOResource res = tx.createResource("/res1"); + CDOResource res = tx.createResource(getResourcePath("/res1")); Company company1 = getModel1Factory().createCompany(); company1.setName("aaa"); res.getContents().add(company1); @@ -347,7 +347,7 @@ public class StickyViewsTest extends AbstractCDOTest { CDOSession sess = openSession(); CDOTransaction tx = sess.openTransaction(); - CDOResource res = tx.getResource("/res1"); + CDOResource res = tx.getResource(getResourcePath("/res1")); Company company1 = (Company)res.getContents().get(0); company1.setName("ccc"); tx.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionTest.java index 0e258e59f7..4f19e8b004 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionTest.java @@ -105,7 +105,7 @@ public class TransactionTest extends AbstractCDOTest IOUtil.OUT().println("Opening session"); CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - transaction.createResource("/test2"); + transaction.createResource(getResourcePath("/test2")); transaction.commit(); transaction.close(); session.close(); @@ -116,7 +116,7 @@ public class TransactionTest extends AbstractCDOTest IOUtil.OUT().println("Session " + i); CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test2"); + CDOResource resource = transaction.getResource(getResourcePath("/test2")); Category category = getModel1Factory().createCategory(); resource.getContents().add(category); transaction.commit(); @@ -130,7 +130,7 @@ public class TransactionTest extends AbstractCDOTest IOUtil.OUT().println("Opening session"); CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test2"); + CDOResource resource = transaction.createResource(getResourcePath("/test2")); transaction.commit(); transaction.close(); @@ -140,7 +140,7 @@ public class TransactionTest extends AbstractCDOTest IOUtil.OUT().println("Transaction " + i + " (" + lastDuration + ")"); lastDuration = System.currentTimeMillis(); transaction = session.openTransaction(); - resource = transaction.getResource("/test2"); + resource = transaction.getResource(getResourcePath("/test2")); Category category = getModel1Factory().createCategory(); resource.getContents().add(category); @@ -252,7 +252,7 @@ public class TransactionTest extends AbstractCDOTest CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction); File file = pushTransaction.getFile(); - CDOResource resource = pushTransaction.getOrCreateResource("/test1"); + CDOResource resource = pushTransaction.getOrCreateResource(getResourcePath("/test1")); resource.getContents().add(company); pushTransaction.commit(); @@ -265,7 +265,7 @@ public class TransactionTest extends AbstractCDOTest session = openSession(); CDOView view = session.openView(); - resource = view.getResource("/test1"); + resource = view.getResource(getResourcePath("/test1")); company = (Company)resource.getContents().get(0); assertEquals("Foundation", company.getName()); assertEquals(1, company.getCategories().size()); @@ -292,7 +292,7 @@ public class TransactionTest extends AbstractCDOTest CDOPushTransaction pushTransaction = new CDOPushTransaction(transaction); File file = pushTransaction.getFile(); - CDOResource resource = pushTransaction.getOrCreateResource("/test1"); + CDOResource resource = pushTransaction.getOrCreateResource(getResourcePath("/test1")); resource.getContents().add(company); pushTransaction.commit(); @@ -318,7 +318,7 @@ public class TransactionTest extends AbstractCDOTest session = openSession(); CDOView view = session.openView(); - resource = view.getResource("/test1"); + resource = view.getResource(getResourcePath("/test1")); company = (Company)resource.getContents().get(0); assertEquals("Foundation", company.getName()); assertEquals(1, company.getCategories().size()); @@ -331,7 +331,7 @@ public class TransactionTest extends AbstractCDOTest final CDOSession session1 = openSession(); final CDOTransaction transaction1 = session1.openTransaction(); - CDOResource resource1 = transaction1.createResource("/test"); + CDOResource resource1 = transaction1.createResource(getResourcePath("/test")); Category category1 = getModel1Factory().createCategory(); resource1.getContents().add(category1); transaction1.commit(); @@ -367,7 +367,7 @@ public class TransactionTest extends AbstractCDOTest } }); - CDOResource resource2 = transaction2.getResource("/test"); + CDOResource resource2 = transaction2.getResource(getResourcePath("/test")); Category category2 = (Category)resource2.getContents().get(0); category2.setName("session2"); @@ -389,7 +389,7 @@ public class TransactionTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("/test"); + CDOResource resource1 = transaction.createResource(getResourcePath("/test")); resource1.getContents().add(category); transaction.commit(); @@ -414,7 +414,7 @@ public class TransactionTest extends AbstractCDOTest CDOSession session1 = openSession(); CDOTransaction transaction1 = session1.openTransaction(); - CDOResource resource1 = transaction1.createResource("/test"); + CDOResource resource1 = transaction1.createResource(getResourcePath("/test")); Category category1 = getModel1Factory().createCategory(); resource1.getContents().add(category1); transaction1.commit(); @@ -422,7 +422,7 @@ public class TransactionTest extends AbstractCDOTest CDOSession session2 = openSession(); CDOTransaction transaction2 = session2.openTransaction(); - CDOResource resource2 = transaction2.getResource("/test"); + CDOResource resource2 = transaction2.getResource(getResourcePath("/test")); Category category2 = (Category)resource2.getContents().get(0); category2.setName("session2"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/UnsetTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/UnsetTest.java index 88593e0747..77738db5e4 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/UnsetTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/UnsetTest.java @@ -80,7 +80,7 @@ public class UnsetTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Supplier supplier = getModel1Factory().createSupplier(); supplier.setName("Stepper"); @@ -91,7 +91,7 @@ public class UnsetTest extends AbstractCDOTest session = openSession(); CDOView view = session.openView(); - resource = view.getResource("/test1"); + resource = view.getResource(getResourcePath("/test1")); supplier = (Supplier)resource.getContents().get(0); assertEquals(true, supplier.isPreferred()); } @@ -100,7 +100,7 @@ public class UnsetTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Supplier supplier = getModel1Factory().createSupplier(); supplier.setName("Stepper"); @@ -112,7 +112,7 @@ public class UnsetTest extends AbstractCDOTest session = openSession(); CDOView view = session.openView(); - resource = view.getResource("/test1"); + resource = view.getResource(getResourcePath("/test1")); supplier = (Supplier)resource.getContents().get(0); assertEquals(true, supplier.isPreferred()); } @@ -121,7 +121,7 @@ public class UnsetTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Supplier supplier = getModel1Factory().createSupplier(); supplier.setName("Stepper"); @@ -133,7 +133,7 @@ public class UnsetTest extends AbstractCDOTest session = openSession(); CDOView view = session.openView(); - resource = view.getResource("/test1"); + resource = view.getResource(getResourcePath("/test1")); supplier = (Supplier)resource.getContents().get(0); assertEquals(false, supplier.isPreferred()); } @@ -461,7 +461,7 @@ public class UnsetTest extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.createResource("/test1"); + CDOResource res = transaction.createResource(getResourcePath("/test1")); res.getContents().add(test1); res.getContents().add(test2); @@ -479,7 +479,7 @@ public class UnsetTest extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOView view = session.openTransaction(); - CDOResource res = view.getResource("/test1"); + CDOResource res = view.getResource(getResourcePath("/test1")); assertEquals(4, res.getContents().size()); EObject test1 = res.getContents().get(0); @@ -516,7 +516,7 @@ public class UnsetTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(object); transaction.commit(); @@ -526,7 +526,7 @@ public class UnsetTest extends AbstractCDOTest session = openSession(); CDOView view = session.openView(); - resource = view.getResource("/test1"); + resource = view.getResource(getResourcePath("/test1")); @SuppressWarnings("unchecked") T result = (T)resource.getContents().get(0); @@ -540,7 +540,7 @@ public class UnsetTest extends AbstractCDOTest commitAndLoadSession = openSession(); commitAndLoadTransaction = commitAndLoadSession.openTransaction(); - CDOResource resource = commitAndLoadTransaction.createResource("/test1"); + CDOResource resource = commitAndLoadTransaction.createResource(getResourcePath("/test1")); resource.getContents().add(object); } @@ -552,7 +552,7 @@ public class UnsetTest extends AbstractCDOTest commitAndLoadSession = openSession(); commitAndLoadTransaction = commitAndLoadSession.openTransaction(); - CDOResource resource = commitAndLoadTransaction.getResource("/test1"); + CDOResource resource = commitAndLoadTransaction.getResource(getResourcePath("/test1")); @SuppressWarnings("unchecked") T result = (T)resource.getContents().get(0); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java index 97a35a8031..22292abe31 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java @@ -59,15 +59,15 @@ public class ViewTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - transaction.createResource("/test1"); + transaction.createResource(getResourcePath("/test1")); transaction.commit(); session.close(); } CDOSession session = openSession(); CDOView view = session.openView(); - assertEquals(true, view.hasResource("/test1")); - assertEquals(false, view.hasResource("/test2")); + assertEquals(true, view.hasResource(getResourcePath("/test1"))); + assertEquals(false, view.hasResource(getResourcePath("/test2"))); session.close(); } @@ -85,7 +85,7 @@ public class ViewTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); transaction.commit(); id = resource.cdoID().toString(); session.close(); @@ -93,8 +93,8 @@ public class ViewTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - assertEquals(id, transaction.getOrCreateResource("/test1").cdoID().toString()); - assertNotSame(id, transaction.getOrCreateResource("/test2").cdoID().toString()); + assertEquals(id, transaction.getOrCreateResource(getResourcePath("/test1")).cdoID().toString()); + assertNotSame(id, transaction.getOrCreateResource(getResourcePath("/test2")).cdoID().toString()); session.close(); } @@ -103,7 +103,7 @@ public class ViewTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); EList<EObject> contents = resource.getContents(); for (int i = 0; i < 100; i++) { @@ -121,7 +121,7 @@ public class ViewTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); EList<EObject> contents = resource.getContents(); for (int i = 100; i < 110; i++) { @@ -142,7 +142,7 @@ public class ViewTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); EList<EObject> contents = resource.getContents(); for (int i = 0; i < 100; i++) { @@ -160,7 +160,7 @@ public class ViewTest extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); EList<EObject> contents = resource.getContents(); for (int i = 100; i < 110; i++) { @@ -185,15 +185,15 @@ public class ViewTest extends AbstractCDOTest ResourceSet resourceSet = new ResourceSetImpl(); CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(resourceSet); - transaction.createResource("/test1"); + transaction.createResource(getResourcePath("/test1")); transaction.commit(); session.close(); } CDOSession session = openSession(); CDOView view = session.openView(); - assertEquals(true, view.hasResource("/test1")); - assertEquals(false, view.hasResource("/test2")); + assertEquals(true, view.hasResource(getResourcePath("/test1"))); + assertEquals(false, view.hasResource(getResourcePath("/test2"))); session.close(); } @@ -201,12 +201,12 @@ public class ViewTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); transaction.commit(); CDOView view = session.openView(); CDOResource resource2 = view.getObject(resource); - assertEquals("/test1", resource2.getPath()); + assertEquals(getResourcePath("/test1"), resource2.getPath()); session.close(); } @@ -214,7 +214,7 @@ public class ViewTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); transaction.commit(); getRepository("repo2"); @@ -240,7 +240,7 @@ public class ViewTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); transaction.commit(); CDOSession session2 = openSession(); @@ -258,13 +258,13 @@ public class ViewTest extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - transaction.createResource("/my/test1"); + transaction.createResource(getResourcePath("/my/test1")); transaction.commit(); - transaction.createResource("/my/test2"); - transaction.createResource("/my/test3"); - transaction.createResource("/my/test4"); - transaction.createResource("/my/test5"); + transaction.createResource(getResourcePath("/my/test2")); + transaction.createResource(getResourcePath("/my/test3")); + transaction.createResource(getResourcePath("/my/test4")); + transaction.createResource(getResourcePath("/my/test5")); boolean done; done = transaction.options().setCacheReferenceType(ReferenceType.SOFT); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java index 88f24fdff0..7b511df553 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java @@ -146,7 +146,7 @@ public class WorkspaceTest extends AbstractCDOTest public void testCheckout() throws Exception { checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); - assertEquals(1 + totalObjects, dumpLocalStore(null)); // Root resource + totalObjects + assertEquals(2 + totalObjects, dumpLocalStore(null)); // Root resource + test folder + totalObjects } public void testReadObjects() throws Exception @@ -154,7 +154,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOView view = workspace.openView(); - CDOResource resource = view.getResource(RESOURCE); + CDOResource resource = view.getResource(getResourcePath(RESOURCE)); assertEquals(totalObjects, dumpObjects(null, resource)); } @@ -163,7 +163,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof Product1) @@ -183,7 +183,7 @@ public class WorkspaceTest extends AbstractCDOTest clearCache(transaction.getSession().getRevisionManager()); CDOView view = workspace.openView(); - resource = view.getResource(RESOURCE); + resource = view.getResource(getResourcePath(RESOURCE)); assertEquals(totalObjects, dumpObjects(null, resource)); for (EObject object : resource.getContents()) { @@ -200,7 +200,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (int i = 0; i < PRODUCTS; i++) { resource.getContents().add(createProduct(i)); @@ -218,7 +218,7 @@ public class WorkspaceTest extends AbstractCDOTest clearCache(transaction.getSession().getRevisionManager()); CDOView view = workspace.openView(); - resource = view.getResource(RESOURCE); + resource = view.getResource(getResourcePath(RESOURCE)); assertEquals(totalObjects + PRODUCTS, dumpObjects("--> ", resource)); } @@ -227,7 +227,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof SalesOrder) @@ -253,7 +253,7 @@ public class WorkspaceTest extends AbstractCDOTest clearCache(transaction.getSession().getRevisionManager()); CDOView view = workspace.openView(); - resource = view.getResource(RESOURCE); + resource = view.getResource(getResourcePath(RESOURCE)); assertEquals(totalObjects - ORDER_DETAILS, dumpObjects(null, resource)); for (EObject object : resource.getContents()) { @@ -272,7 +272,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof Product1) @@ -308,7 +308,7 @@ public class WorkspaceTest extends AbstractCDOTest clearCache(transaction.getSession().getRevisionManager()); CDOView view = workspace.openView(); - resource = view.getResource(RESOURCE); + resource = view.getResource(getResourcePath(RESOURCE)); assertEquals(totalObjects, dumpObjects(null, resource)); for (EObject object : resource.getContents()) { @@ -325,7 +325,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (int i = 0; i < PRODUCTS; i++) { resource.getContents().add(createProduct(i)); @@ -357,7 +357,7 @@ public class WorkspaceTest extends AbstractCDOTest clearCache(transaction.getSession().getRevisionManager()); CDOView view = workspace.openView(); - resource = view.getResource(RESOURCE); + resource = view.getResource(getResourcePath(RESOURCE)); assertEquals(totalObjects + 2 * PRODUCTS, dumpObjects("--> ", resource)); } @@ -366,7 +366,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof SalesOrder) @@ -415,7 +415,7 @@ public class WorkspaceTest extends AbstractCDOTest clearCache(transaction.getSession().getRevisionManager()); CDOView view = workspace.openView(); - resource = view.getResource(RESOURCE); + resource = view.getResource(getResourcePath(RESOURCE)); assertEquals(totalObjects - ORDER_DETAILS - SALES_ORDERS, dumpObjects(null, resource)); for (EObject object : resource.getContents()) { @@ -442,7 +442,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof Product1) @@ -465,7 +465,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (int i = 0; i < PRODUCTS; i++) { resource.getContents().add(createProduct(i)); @@ -484,7 +484,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof SalesOrder) @@ -511,7 +511,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof Product1) @@ -545,7 +545,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (int i = 0; i < PRODUCTS; i++) { resource.getContents().add(createProduct(i)); @@ -571,7 +571,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof SalesOrder) @@ -614,7 +614,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof Product1) @@ -643,7 +643,7 @@ public class WorkspaceTest extends AbstractCDOTest IOUtil.ERR().println("Checkout done"); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (int i = 0; i < PRODUCTS; i++) { resource.getContents().add(createProduct(i)); @@ -667,7 +667,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof SalesOrder) @@ -699,7 +699,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof Product1) @@ -738,7 +738,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (int i = 0; i < PRODUCTS; i++) { resource.getContents().add(createProduct(i)); @@ -769,7 +769,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof SalesOrder) @@ -817,7 +817,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof Product1) @@ -840,7 +840,7 @@ public class WorkspaceTest extends AbstractCDOTest assertEquals(info.getTimeStamp(), workspace.getTimeStamp()); transaction = workspace.openTransaction(); - resource = transaction.getResource(RESOURCE); + resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof Product1) @@ -868,7 +868,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (int i = 0; i < PRODUCTS; i++) { resource.getContents().add(createProduct(i)); @@ -887,7 +887,7 @@ public class WorkspaceTest extends AbstractCDOTest assertEquals(info.getTimeStamp(), workspace.getTimeStamp()); transaction = workspace.openTransaction(); - resource = transaction.getResource(RESOURCE); + resource = transaction.getResource(getResourcePath(RESOURCE)); for (int i = 0; i < PRODUCTS; i++) { resource.getContents().add(createProduct(i)); @@ -911,7 +911,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOTransaction transaction = workspace.openTransaction(); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof SalesOrder) @@ -938,7 +938,7 @@ public class WorkspaceTest extends AbstractCDOTest assertEquals(info.getTimeStamp(), workspace.getTimeStamp()); transaction = workspace.openTransaction(); - resource = transaction.getResource(RESOURCE); + resource = transaction.getResource(getResourcePath(RESOURCE)); for (Iterator<EObject> it = resource.getContents().iterator(); it.hasNext();) { EObject object = it.next(); @@ -971,7 +971,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); assertNotSame(CDOBranchPoint.UNSPECIFIED_DATE, workspace.getTimeStamp()); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof Product1) @@ -997,7 +997,7 @@ public class WorkspaceTest extends AbstractCDOTest assertEquals(0, workspace.getBase().getIDs().size()); CDOView view = workspace.openView(); - resource = view.getResource(RESOURCE); + resource = view.getResource(getResourcePath(RESOURCE)); assertEquals(totalObjects, dumpObjects(null, resource)); } @@ -1006,7 +1006,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); assertNotSame(CDOBranchPoint.UNSPECIFIED_DATE, workspace.getTimeStamp()); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); resource.getContents().add(createProduct(9999)); transaction.commit(); @@ -1024,7 +1024,7 @@ public class WorkspaceTest extends AbstractCDOTest assertEquals(0, workspace.getBase().getIDs().size()); CDOView view = workspace.openView(); - resource = view.getResource(RESOURCE); + resource = view.getResource(getResourcePath(RESOURCE)); assertEquals(totalObjects + 1, dumpObjects(null, resource)); } @@ -1033,7 +1033,7 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); assertNotSame(CDOBranchPoint.UNSPECIFIED_DATE, workspace.getTimeStamp()); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); for (EObject object : resource.getContents()) { if (object instanceof SalesOrder) @@ -1062,7 +1062,7 @@ public class WorkspaceTest extends AbstractCDOTest assertEquals(0, workspace.getBase().getIDs().size()); CDOView view = workspace.openView(); - resource = view.getResource(RESOURCE); + resource = view.getResource(getResourcePath(RESOURCE)); assertEquals(totalObjects - ORDER_DETAILS, dumpObjects(null, resource)); } @@ -1101,12 +1101,12 @@ public class WorkspaceTest extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); assertNotSame(CDOBranchPoint.UNSPECIFIED_DATE, workspace.getTimeStamp()); - CDOResource resource = transaction.getResource(RESOURCE); + CDOResource resource = transaction.getResource(getResourcePath(RESOURCE)); resource.getContents().add(createProduct(9999)); transaction.commit(); CDOTransaction local = workspace.openTransaction(); - resource = local.getResource(RESOURCE); + resource = local.getResource(getResourcePath(RESOURCE)); for (int i = 0; i < PRODUCTS; i++) { resource.getContents().add(createProduct(i)); @@ -1129,7 +1129,7 @@ public class WorkspaceTest extends AbstractCDOTest assertEquals(0, workspace.getBase().getIDs().size()); CDOView view = workspace.openView(); - resource = view.getResource(RESOURCE); + resource = view.getResource(getResourcePath(RESOURCE)); assertEquals(totalObjects + 1 + PRODUCTS, dumpObjects(null, resource)); } @@ -1256,7 +1256,7 @@ public class WorkspaceTest extends AbstractCDOTest private CDOResource createTestSet(CDOTransaction transaction) throws CommitException { disableConsole(); - CDOResource resource = transaction.createResource(RESOURCE); + CDOResource resource = transaction.createResource(getResourcePath(RESOURCE)); fillResource(resource); totalObjects = 1; @@ -1344,7 +1344,7 @@ public class WorkspaceTest extends AbstractCDOTest private int modifyProduct(CDOTransaction transaction, int i, String prefix) { int count = 0; - for (EObject object : transaction.getResource(RESOURCE).getContents()) + for (EObject object : transaction.getResource(getResourcePath(RESOURCE)).getContents()) { if (object instanceof Product1) { @@ -1364,7 +1364,7 @@ public class WorkspaceTest extends AbstractCDOTest private int countModifiedProduct(CDOView view) { int count = 0; - for (EObject object : view.getResource(RESOURCE).getContents()) + for (EObject object : view.getResource(getResourcePath(RESOURCE)).getContents()) { if (object instanceof Product1) { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java index 67787c6bd9..4309b65499 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java @@ -62,7 +62,7 @@ public class XRefTest extends AbstractCDOTest CDOSession session1 = openSession(); CDOTransaction transaction = session1.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(supplier); resource.getContents().add(purchaseOrder1); resource.getContents().add(purchaseOrder2); @@ -102,7 +102,7 @@ public class XRefTest extends AbstractCDOTest CDOSession session1 = openSession(); CDOTransaction transaction1 = session1.openTransaction(); - CDOResource resource = transaction1.createResource("/test1"); + CDOResource resource = transaction1.createResource(getResourcePath("/test1")); resource.getContents().add(supplier); resource.getContents().add(purchaseOrder1); resource.getContents().add(purchaseOrder2); @@ -115,7 +115,7 @@ public class XRefTest extends AbstractCDOTest CDOSession session2 = openSession(); CDOTransaction transaction2 = session2.openTransaction(); - supplier = (Supplier)transaction2.getResource("/test1").getContents().remove(0); + supplier = (Supplier)transaction2.getResource(getResourcePath("/test1")).getContents().remove(0); List<CDOObjectReference> results = transaction2.queryXRefs(Collections.singleton(CDOUtil.getCDOObject(supplier))); assertEquals(4, results.size()); @@ -177,7 +177,7 @@ public class XRefTest extends AbstractCDOTest // store objects CDOSession session1 = openSession(); CDOTransaction transaction = session1.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().addAll(Arrays.asList(obj1_1, obj1_2, obj1_3, obj1_4, obj2_1, obj2_2, obj2_3, obj2_4)); transaction.commit(); transaction.close(); @@ -293,7 +293,7 @@ public class XRefTest extends AbstractCDOTest // store objects CDOSession session1 = openSession(); CDOTransaction transaction = session1.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().addAll(Arrays.asList(obj1_1, obj1_2, obj1_3, obj1_4, obj2_1, obj2_2, obj2_3, obj2_4)); transaction.commit(); transaction.close(); @@ -387,7 +387,7 @@ public class XRefTest extends AbstractCDOTest session.getPackageRegistry().putEPackage(xref); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); EObject a1 = addObject(resource, a); EObject a2 = addObject(resource, a); @@ -465,7 +465,7 @@ public class XRefTest extends AbstractCDOTest session.getPackageRegistry().putEPackage(xref); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); EObject a1 = addObject(resource, a); EObject a2 = addObject(resource, a); @@ -538,7 +538,7 @@ public class XRefTest extends AbstractCDOTest session.getPackageRegistry().putEPackage(xref); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); EObject a1 = addObject(resource, a); EObject a2 = addObject(resource, a); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java index fdbd8768b9..ff8f081f6f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_241464_Test.java @@ -39,7 +39,7 @@ public class Bugzilla_241464_Test extends AbstractCDOTest } CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Customer customer = getModel1Factory().createCustomer(); customer.setName("customer"); @@ -51,7 +51,7 @@ public class Bugzilla_241464_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); TestRevisionManager revisionManager = (TestRevisionManager)getRepository().getRevisionManager(); revisionManager.setGetRevisionsDelay(10000L); // Make the protocol time out diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_243310_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_243310_Test.java index b474f3539d..96c02859dd 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_243310_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_243310_Test.java @@ -32,7 +32,7 @@ public class Bugzilla_243310_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); - CDOResource res = transaction1.createResource("/test1"); + CDOResource res = transaction1.createResource(getResourcePath("/test1")); Company companyTx1 = getModel1Factory().createCompany(); companyTx1.setName("Company ABC"); res.getContents().add(companyTx1); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246442_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246442_Test.java index 5ae30701cf..cf787181bc 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246442_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246442_Test.java @@ -52,7 +52,7 @@ public class Bugzilla_246442_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOObject instance = CDOUtil.getCDOObject(EcoreUtil.create(class1Class)); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(instance); transaction.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java index f054859ce1..33f848ffef 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java @@ -37,7 +37,7 @@ public class Bugzilla_246622_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); - CDOResource res = transaction1.createResource("/test1"); + CDOResource res = transaction1.createResource(getResourcePath("/test1")); Order order = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); @@ -88,7 +88,7 @@ public class Bugzilla_246622_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); - CDOResource res = transaction1.createResource("/test1"); + CDOResource res = transaction1.createResource(getResourcePath("/test1")); msg("Test set with link before"); PurchaseOrder purchaseOrder = getModel1Factory().createPurchaseOrder(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_247141_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_247141_Test.java index 9f5c45915e..7115e7780b 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_247141_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_247141_Test.java @@ -41,14 +41,14 @@ public class Bugzilla_247141_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("/test1"); + CDOResource resource1 = transaction.createResource(getResourcePath("/test1")); Customer customer1 = getModel1Factory().createCustomer(); Customer customer2 = getModel1Factory().createCustomer(); resource1.getContents().add(customer1); resource1.getContents().add(customer2); - CDOResource resource2 = transaction.createResource("/test2"); + CDOResource resource2 = transaction.createResource(getResourcePath("/test2")); Customer customer3 = getModel1Factory().createCustomer(); Customer customer4 = getModel1Factory().createCustomer(); @@ -68,7 +68,7 @@ public class Bugzilla_247141_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.getResource("/test1"); + CDOResource resource1 = transaction.getResource(getResourcePath("/test1")); EContentAdapter adapter = new CDOLazyContentAdapter(); resource1.eAdapters().add(adapter); @@ -82,7 +82,7 @@ public class Bugzilla_247141_Test extends AbstractCDOTest assertEquals(true, object2.eAdapters().contains(adapter)); // res2 should NOT be adapted, as its not in the content tree of res1 - CDOResource resource2 = transaction.getResource("/test2"); + CDOResource resource2 = transaction.getResource(getResourcePath("/test2")); // neither should its children CDOObject object3 = view.getObject(id3); CDOObject object4 = view.getObject(id4); @@ -103,7 +103,7 @@ public class Bugzilla_247141_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("/test1"); + CDOResource resource1 = transaction.createResource(getResourcePath("/test1")); Customer customer1 = getModel1Factory().createCustomer(); Customer customer2 = getModel1Factory().createCustomer(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java index 3ac2e1bf5e..7f4c6fd27f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248124_Test.java @@ -34,7 +34,7 @@ public class Bugzilla_248124_Test extends AbstractCDOTest CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); res.getContents().add(getModel1Factory().createCompany()); res.getContents().add(getModel1Factory().createCompany()); res.getContents().add(getModel1Factory().createCompany()); @@ -51,7 +51,7 @@ public class Bugzilla_248124_Test extends AbstractCDOTest CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); res.getContents().add(getModel1Factory().createCompany()); res.getContents().add(getModel1Factory().createCompany()); res.getContents().add(getModel1Factory().createCompany()); @@ -87,7 +87,7 @@ public class Bugzilla_248124_Test extends AbstractCDOTest CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); res.getContents().add(getModel1Factory().createCompany()); res.getContents().add(getModel1Factory().createCompany()); res.getContents().add(getModel1Factory().createCompany()); @@ -102,7 +102,7 @@ public class Bugzilla_248124_Test extends AbstractCDOTest CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); res.getContents().add(getModel1Factory().createCompany()); res.getContents().add(getModel1Factory().createCompany()); res.getContents().add(getModel1Factory().createCompany()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248915_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248915_Test.java index 119bdcd662..b984acfc38 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248915_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_248915_Test.java @@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; /** - * Resources fetched using CDOViewImpl.getResource(CDOID) not added to ResourceSet + * Resources fetched using CDOViewImpl.getResource(getResourcePath(CDOID)) not added to ResourceSet * <p> * See bug 248915 * @@ -40,8 +40,8 @@ public class Bugzilla_248915_Test extends AbstractCDOTest /* * Session has been established so 3) create the Supplier resource and 4) create the Purchase Order resource. */ - CDOResource supplierResource = transaction1.createResource("/supplierResource"); - CDOResource poResource = transaction1.createResource("/poResource"); + CDOResource supplierResource = transaction1.createResource(getResourcePath("/supplierResource")); + CDOResource poResource = transaction1.createResource(getResourcePath("/poResource")); /* Create the supplier and add it to its respective resource */ Supplier mySupplier = getModel1Factory().createSupplier(); @@ -76,7 +76,7 @@ public class Bugzilla_248915_Test extends AbstractCDOTest CDOTransaction transaction2 = session2.openTransaction(); /* 8) Load the supplier from transaction2, fetching it into transaction2's empty resourceSet */ - CDOResource supplierResource2 = transaction2.getResource("/supplierResource"); + CDOResource supplierResource2 = transaction2.getResource(getResourcePath("/supplierResource")); Supplier savedSupplier = (Supplier)supplierResource2.getContents().get(0); if (!isConfig(LEGACY)) @@ -112,7 +112,7 @@ public class Bugzilla_248915_Test extends AbstractCDOTest CDOSession session1 = openSession(); CDOTransaction transaction1 = session1.openTransaction(); - CDOResource supplierResource = transaction1.createResource("/supplierResource"); + CDOResource supplierResource = transaction1.createResource(getResourcePath("/supplierResource")); transaction1.commit(); CDOID resID = CDOUtil.getCDOObject(supplierResource).cdoID(); @@ -122,7 +122,7 @@ public class Bugzilla_248915_Test extends AbstractCDOTest CDOSession session2 = openSession(); CDOTransaction transaction2 = session2.openTransaction(); CDOResource resource = (CDOResource)transaction2.getObject(resID); - CDOResource resource1 = transaction2.getResource("/supplierResource"); + CDOResource resource1 = transaction2.getResource(getResourcePath("/supplierResource")); assertSame(resource, resource1); transaction2.close(); session2.close(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250036_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250036_Test.java index 84a9e8cc6e..366c70f475 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250036_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250036_Test.java @@ -42,8 +42,8 @@ public class Bugzilla_250036_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("test1"); - CDOResource resource2 = transaction.createResource("test2"); + CDOResource resource1 = transaction.createResource(getResourcePath("test1")); + CDOResource resource2 = transaction.createResource(getResourcePath("test2")); GenRefMapNonContained elementA = getModel4Factory().createGenRefMapNonContained(); resource1.getContents().add(elementA); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250757_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250757_Test.java index dd5b9244b0..05ee789665 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250757_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250757_Test.java @@ -35,7 +35,7 @@ public class Bugzilla_250757_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); res.getContents().add(getModel1Factory().createCompany()); transaction1.commit(); @@ -50,7 +50,7 @@ public class Bugzilla_250757_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); res.getContents().add(getModel1Factory().createCompany()); transaction1.commit(); @@ -72,7 +72,7 @@ public class Bugzilla_250757_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); res.getContents().add(getModel1Factory().createCompany()); transaction1.commit(); @@ -88,7 +88,7 @@ public class Bugzilla_250757_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); res.getContents().add(getModel1Factory().createCompany()); transaction1.commit(); @@ -107,7 +107,7 @@ public class Bugzilla_250757_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); res.getContents().add(getModel1Factory().createCompany()); transaction1.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250910_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250910_Test.java index 47660db760..3a60596099 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250910_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_250910_Test.java @@ -35,7 +35,7 @@ public class Bugzilla_250910_Test extends AbstractCDOTest CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); Company company = getModel1Factory().createCompany(); res.getContents().add(company); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java index 7d3836c4e2..5092836bd1 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251087_Test.java @@ -42,7 +42,7 @@ public class Bugzilla_251087_Test extends AbstractCDOTest transaction1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); Company obj2 = getModel1Factory().createCompany(); @@ -68,7 +68,7 @@ public class Bugzilla_251087_Test extends AbstractCDOTest transaction1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); Company obj2 = getModel1Factory().createCompany(); res.getContents().add(obj2); transaction1.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251263_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251263_Test.java index 9dd0a8fb5d..0263372abe 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251263_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251263_Test.java @@ -34,7 +34,7 @@ public class Bugzilla_251263_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); res.getContents().add(getModel1Factory().createCompany()); transaction1.commit(); @@ -68,7 +68,7 @@ public class Bugzilla_251263_Test extends AbstractCDOTest assertTransient(purchaseOrder2); - CDOResource resB = transaction1.createResource("testB"); + CDOResource resB = transaction1.createResource(getResourcePath("testB")); resB.getContents().add(purchaseOrder2); assertEquals(1, CDOUtil.getCDOObject(purchaseOrder2).cdoRevision().getVersion()); @@ -81,7 +81,7 @@ public class Bugzilla_251263_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); res.getContents().add(getModel1Factory().createCompany()); transaction1.commit(); @@ -108,7 +108,7 @@ public class Bugzilla_251263_Test extends AbstractCDOTest { } - CDOResource resB = transaction1.createResource("testB"); + CDOResource resB = transaction1.createResource(getResourcePath("testB")); resB.getContents().add(supplier2); transaction1.commit(); } @@ -118,7 +118,7 @@ public class Bugzilla_251263_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); res.getContents().add(getModel1Factory().createCompany()); transaction1.commit(); @@ -142,7 +142,7 @@ public class Bugzilla_251263_Test extends AbstractCDOTest { } - CDOResource resB = transaction1.createResource("testB"); + CDOResource resB = transaction1.createResource(getResourcePath("testB")); resB.getContents().add(supplier2); transaction1.commit(); } @@ -152,7 +152,7 @@ public class Bugzilla_251263_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); res.getContents().add(getModel1Factory().createCompany()); transaction1.commit(); @@ -180,7 +180,7 @@ public class Bugzilla_251263_Test extends AbstractCDOTest { } - CDOResource resB = transaction1.createResource("testB"); + CDOResource resB = transaction1.createResource(getResourcePath("testB")); resB.getContents().add(purchaseOrder2); transaction1.commit(); } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251544_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251544_Test.java index 23a267b3d5..5c89bac5ad 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251544_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251544_Test.java @@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; /** - * Resources fetched using CDOViewImpl.getResource(CDOID) not added to ResourceSet + * Resources fetched using CDOViewImpl.getResource(getResourcePath(CDOID)) not added to ResourceSet * <p> * See bug 251544 * @@ -35,7 +35,7 @@ public class Bugzilla_251544_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Order order1 = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); @@ -62,7 +62,7 @@ public class Bugzilla_251544_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Order order1 = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251752_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251752_Test.java index 007ba61286..17e8ecf382 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251752_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251752_Test.java @@ -31,12 +31,12 @@ public class Bugzilla_251752_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); - CDOResource res = transaction1.createResource("/test1"); + CDOResource res = transaction1.createResource(getResourcePath("/test1")); res.getContents().add(getModel1Factory().createCompany()); transaction1.commit(); CDOTransaction transaction2 = session.openTransaction(); - CDOResource res2 = transaction2.getResource("/test1"); + CDOResource res2 = transaction2.getResource(getResourcePath("/test1")); res.getContents().add(getModel1Factory().createCompany()); res2.getContents().add(getModel1Factory().createCompany()); transaction2.commit(); @@ -60,12 +60,12 @@ public class Bugzilla_251752_Test extends AbstractCDOTest CDOTransaction transaction1 = session.openTransaction(); CDOXATransaction xaTransaction = CDOUtil.createXATransaction(); xaTransaction.add(CDOUtil.getViewSet(transaction1.getResourceSet())); - CDOResource res = transaction1.createResource("/test1"); + CDOResource res = transaction1.createResource(getResourcePath("/test1")); res.getContents().add(getModel1Factory().createCompany()); transaction1.commit(); CDOTransaction transaction2 = session.openTransaction(); - CDOResource res2 = transaction2.getResource("/test1"); + CDOResource res2 = transaction2.getResource(getResourcePath("/test1")); res.getContents().add(getModel1Factory().createCompany()); res2.getContents().add(getModel1Factory().createCompany()); transaction2.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252214_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252214_Test.java index 25a108c09a..3f9dc1ac88 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252214_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252214_Test.java @@ -53,7 +53,7 @@ public class Bugzilla_252214_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); Company company = getModel1Factory().createCompany(); company.setName("ESC"); @@ -73,7 +73,7 @@ public class Bugzilla_252214_Test extends AbstractCDOTest CDOView audit = session.openView(commitTime1); { - CDOResource auditResource = audit.getResource("/res1"); + CDOResource auditResource = audit.getResource(getResourcePath("/res1")); Company auditCompany = (Company)auditResource.getContents().get(0); CDOObject cdoAuditCompany = CDOUtil.getCDOObject(auditCompany); CDOStateMachine.INSTANCE.invalidate((InternalCDOObject)cdoAuditCompany, null, CDOBranchPoint.UNSPECIFIED_DATE); @@ -82,7 +82,7 @@ public class Bugzilla_252214_Test extends AbstractCDOTest audit.setTimeStamp(commitTime2); { - CDOResource auditResource = audit.getResource("/res1"); + CDOResource auditResource = audit.getResource(getResourcePath("/res1")); Company auditCompany = (Company)auditResource.getContents().get(0); assertEquals("Sympedia", auditCompany.getName()); } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252909_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252909_Test.java index 7bbda561de..1aa3fd940a 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252909_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_252909_Test.java @@ -30,7 +30,7 @@ public class Bugzilla_252909_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); for (int i = 0; i < 10; i++) { Company company = getModel1Factory().createCompany(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_254489_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_254489_Test.java index 3e791391fb..ffc25ee777 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_254489_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_254489_Test.java @@ -42,14 +42,14 @@ public class Bugzilla_254489_Test extends AbstractCDOTest final CDOTransaction transaction1 = session.openTransaction(); final CDOTransaction transaction2 = session.openTransaction(); - CDOResource res1 = transaction1.createResource("/res1"); + CDOResource res1 = transaction1.createResource(getResourcePath("/res1")); final Company companyA1 = getModel1Factory().createCompany(); res1.getContents().add(companyA1); transaction1.commit(); transaction2.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); - CDOResource res2 = transaction2.getResource("/res1"); + CDOResource res2 = transaction2.getResource(getResourcePath("/res1")); Company companyA2 = (Company)res2.getContents().get(0); final TestAdapter companyA2Adapter = new TestAdapter(); companyA2.eAdapters().add(companyA2Adapter); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_255662_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_255662_Test.java index 96d39babbb..8b015441aa 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_255662_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_255662_Test.java @@ -31,7 +31,7 @@ public class Bugzilla_255662_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Customer customer = getModel1Factory().createCustomer(); customer.setName("customer"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_256141_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_256141_Test.java index 8cf8ccb97f..5f5776851d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_256141_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_256141_Test.java @@ -29,7 +29,7 @@ public class Bugzilla_256141_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("test1"); + CDOResource resource1 = transaction.createResource(getResourcePath("test1")); Class2 class2 = getModel3SubpackageFactory().createClass2(); resource1.getContents().add(class2); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258278_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258278_Test.java index fd12d83739..ddb95a8d49 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258278_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258278_Test.java @@ -30,8 +30,8 @@ public class Bugzilla_258278_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - transaction.createResource("/root/folder1/resource1"); - transaction.createResource("/root/folder1/resource2"); + transaction.createResource(getResourcePath("/root/folder1/resource1")); + transaction.createResource(getResourcePath("/root/folder1/resource2")); transaction.commit(); session.close(); } @@ -39,9 +39,9 @@ public class Bugzilla_258278_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.getResource("/root/folder1/resource1"); + CDOResource resource1 = transaction.getResource(getResourcePath("/root/folder1/resource1")); assertNotNull(resource1); - CDOResource resource2 = transaction.getResource("/root/folder1/resource2"); + CDOResource resource2 = transaction.getResource(getResourcePath("/root/folder1/resource2")); assertNotNull(resource2); } } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java index 7ff1d6d43a..cd0c3e75ab 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java @@ -113,7 +113,7 @@ public class Bugzilla_258933_Test extends AbstractCDOTest assertEquals(isSet, instance.eIsSet(feature)); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(instance); assertEquals(isSet, instance.eIsSet(feature)); @@ -136,10 +136,10 @@ public class Bugzilla_258933_Test extends AbstractCDOTest EStructuralFeature feature = class1Class.getEStructuralFeature(featureName); CDOTransaction transaction = session.openTransaction(); - CDOObject instance = CDOUtil.getCDOObject(transaction.getResource("/test1").getContents().get(0)); + CDOObject instance = CDOUtil.getCDOObject(transaction.getResource(getResourcePath("/test1")).getContents().get(0)); assertEquals(isSet, instance.eIsSet(feature)); - transaction.getResource("/test1").getContents().remove(0); + transaction.getResource(getResourcePath("/test1")).getContents().remove(0); assertEquals(isSet, instance.eIsSet(feature)); if (feature.isUnsettable()) @@ -159,7 +159,7 @@ public class Bugzilla_258933_Test extends AbstractCDOTest session.getPackageRegistry().putEPackage(getModel1Package()); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(order); assertEquals(false, order.eIsSet(getModel1Package().getOrder_OrderDetails())); @@ -173,10 +173,10 @@ public class Bugzilla_258933_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - Order instance = (Order)transaction.getResource("/test1").getContents().get(0); + Order instance = (Order)transaction.getResource(getResourcePath("/test1")).getContents().get(0); assertEquals(false, instance.eIsSet(getModel1Package().getOrder_OrderDetails())); - transaction.getResource("/test1").getContents().remove(0); + transaction.getResource(getResourcePath("/test1")).getContents().remove(0); assertEquals(false, instance.eIsSet(getModel1Package().getOrder_OrderDetails())); instance.getOrderDetails().add(getModel1Factory().createOrderDetail()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259695_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259695_Test.java index 32283e3543..2483a1df21 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259695_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259695_Test.java @@ -40,7 +40,7 @@ public class Bugzilla_259695_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("test1"); + CDOResource resource1 = transaction.createResource(getResourcePath("test1")); GenRefMapNonContained elementA = getModel4Factory().createGenRefMapNonContained(); resource1.getContents().add(elementA); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259869_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259869_Test.java index f54f23e575..42badc4f72 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259869_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259869_Test.java @@ -42,7 +42,7 @@ public class Bugzilla_259869_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("test1"); + CDOResource resource1 = transaction.createResource(getResourcePath("test1")); Company company = getModel1Factory().createCompany(); resource1.getContents().add(company); @@ -85,8 +85,8 @@ public class Bugzilla_259869_Test extends AbstractCDOTest CDOTransaction transactionA1 = sessionA.openTransaction(resourceSet); CDOTransaction transactionB1 = sessionB.openTransaction(resourceSet); - CDOResource resA = transactionA1.createResource("/resA"); - CDOResource resB = transactionB1.createResource("/resB"); + CDOResource resA = transactionA1.createResource(getResourcePath("/resA")); + CDOResource resB = transactionB1.createResource(getResourcePath("/resB")); Company companyA = getModel1Factory().createCompany(); resA.getContents().add(companyA); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259949_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259949_Test.java index 88679a0678..76b36156a7 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259949_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_259949_Test.java @@ -34,7 +34,7 @@ public class Bugzilla_259949_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -45,13 +45,13 @@ public class Bugzilla_259949_Test extends AbstractCDOTest session1.options().setPassiveUpdateEnabled(false); CDOView view1 = session1.openView(); - CDOResource res1 = view1.getResource("/test1"); + CDOResource res1 = view1.getResource(getResourcePath("/test1")); assertEquals(1, res1.getContents().size()); assertEquals("customer", ((Customer)res1.getContents().get(0)).getName()); CDOSession session2 = openSession(); CDOTransaction transaction2 = session2.openTransaction(); - CDOResource res2 = transaction2.getResource("/test1"); + CDOResource res2 = transaction2.getResource(getResourcePath("/test1")); assertEquals(1, res2.getContents().size()); assertEquals("customer", ((Customer)res2.getContents().get(0)).getName()); res2.getContents().clear(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java index 457e9ef101..9a985166a1 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260756_Test.java @@ -41,7 +41,7 @@ public class Bugzilla_260756_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("/test1"); + CDOResource resource1 = transaction.createResource(getResourcePath("/test1")); objects.add(resource1); Company company1 = getModel1Factory().createCompany(); Category category1 = getModel1Factory().createCategory(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java index bc6738dec7..1beaa62ff8 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_260764_Test.java @@ -38,7 +38,7 @@ public class Bugzilla_260764_Test extends AbstractCDOTest // ************************************************************* // msg("Opening transaction"); final CDOTransaction transaction = session.openTransaction(); - final CDOResource resourceA = transaction.createResource("/test1"); + final CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); final OrderAddress orderAddress = getModel1Factory().createOrderAddress(); resourceA.getContents().add(orderAddress); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_261218_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_261218_Test.java index 2afc899135..bb8a94b665 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_261218_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_261218_Test.java @@ -34,7 +34,7 @@ public class Bugzilla_261218_Test extends AbstractCDOTest msg("Opening session"); CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - Resource resource = transaction.getOrCreateResource("res1"); + Resource resource = transaction.getOrCreateResource(getResourcePath("res1")); Category folder = getModel1Factory().createCategory(); resource.getContents().add(folder); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_265114_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_265114_Test.java index e846706e88..60ec2317f7 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_265114_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_265114_Test.java @@ -53,7 +53,7 @@ public class Bugzilla_265114_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); Company company = getModel1Factory().createCompany(); resource.getContents().add(company); transaction.commit(); @@ -74,7 +74,7 @@ public class Bugzilla_265114_Test extends AbstractCDOTest { TransactionEditingDomainSimulatedAdapter adapter = new TransactionEditingDomainSimulatedAdapter(); rset.eAdapters().add(adapter); - URI uriResource1 = CDOURIUtil.createResourceURI(session, "res1"); + URI uriResource1 = CDOURIUtil.createResourceURI(session, getResourcePath("res1")); Resource resource1 = rset.getResource(uriResource1, true); CDOObject cdoResource = CDOUtil.getCDOObject((CDOResource)resource1); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266857_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266857_Test.java index e4fea2579a..408adb0c86 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266857_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266857_Test.java @@ -36,14 +36,14 @@ public class Bugzilla_266857_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); transaction.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); - CDOResource resource1 = transaction.createResource("test1"); + CDOResource resource1 = transaction.createResource(getResourcePath("test1")); final TestAdapter testAdapterForResource = new TestAdapter(); resource1.eAdapters().add(testAdapterForResource); transaction.commit(); CDOSession session2 = openSession(); CDOTransaction transaction2 = session2.openTransaction(); - CDOResource resource2 = transaction2.getResource("test1"); + CDOResource resource2 = transaction2.getResource(getResourcePath("test1")); Company company2 = getModel1Factory().createCompany(); resource2.getContents().add(company2); assertEquals(0, testAdapterForResource.getNotifications().length); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266982_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266982_Test.java index f91fd5247a..82a01ce2c1 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266982_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_266982_Test.java @@ -38,7 +38,7 @@ public class Bugzilla_266982_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java index 91027fad90..2c5d438810 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java @@ -54,7 +54,7 @@ public class Bugzilla_267050_Test extends AbstractCDOTest session.getPackageRegistry().putEPackage(getModel1Package()); - CDOResource res = transaction.createResource("/res"); + CDOResource res = transaction.createResource(getResourcePath("/res")); Company specialPurchaseOrder = getModel1Factory().createCompany(); res.getContents().add(specialPurchaseOrder); transaction.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267352_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267352_Test.java index 1ac5509ac2..54f7937fc0 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267352_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267352_Test.java @@ -39,7 +39,7 @@ public class Bugzilla_267352_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_270429_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_270429_Test.java index 3c9718495d..9e4f854847 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_270429_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_270429_Test.java @@ -35,7 +35,7 @@ public class Bugzilla_270429_Test extends AbstractCDOTest session.getPackageRegistry().putEPackage(model4interfacesPackage.eINSTANCE); CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.createResource("/test/1"); + CDOResource res = tx.createResource(getResourcePath("/test/1")); RefMultiContained parent = model4Factory.eINSTANCE.createRefMultiContained(); @@ -62,7 +62,7 @@ public class Bugzilla_270429_Test extends AbstractCDOTest session.getPackageRegistry().putEPackage(model4interfacesPackage.eINSTANCE); CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.getResource("/test/1"); + CDOResource res = tx.getResource(getResourcePath("/test/1")); RefMultiContained parent = (RefMultiContained)res.getContents().get(0); MultiContainedElement child1 = parent.getElements().get(0); @@ -86,7 +86,7 @@ public class Bugzilla_270429_Test extends AbstractCDOTest session.getPackageRegistry().putEPackage(model4interfacesPackage.eINSTANCE); CDOView tx = session.openView(); - CDOResource res = tx.getResource("/test/1"); + CDOResource res = tx.getResource(getResourcePath("/test/1")); RefMultiContained parent = (RefMultiContained)res.getContents().get(0); assertEquals(0, parent.getElements().size()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_272861_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_272861_Test.java index 7ca1d9b2d9..db7904481c 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_272861_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_272861_Test.java @@ -25,11 +25,11 @@ public class Bugzilla_272861_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction trans = session.openTransaction(); - CDOResource res = trans.createResource("/test/1"); + CDOResource res = trans.createResource(getResourcePath("/test/1")); trans.commit(); res.delete(null); - res = trans.createResource("/test/1"); + res = trans.createResource(getResourcePath("/test/1")); trans.commit(); trans.close(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273233_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273233_Test.java index b52e7078f3..e1ea1d9d60 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273233_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273233_Test.java @@ -29,7 +29,7 @@ public class Bugzilla_273233_Test extends AbstractCDOTest session.options().setPassiveUpdateEnabled(false); CDOTransaction trans = session.openTransaction(); - CDOResource res = trans.createResource("/test/1"); + CDOResource res = trans.createResource(getResourcePath("/test/1")); trans.commit(); Company company = getModel1Factory().createCompany(); @@ -46,14 +46,14 @@ public class Bugzilla_273233_Test extends AbstractCDOTest session.options().setPassiveUpdateEnabled(false); CDOTransaction trans = session.openTransaction(); - CDOResource res = trans.createResource("/test/1"); + CDOResource res = trans.createResource(getResourcePath("/test/1")); trans.commit(); CDOSession session2 = openSession(); session2.options().setPassiveUpdateEnabled(false); CDOTransaction trans2 = session2.openTransaction(); - CDOResource res2 = trans2.getResource("/test/1"); + CDOResource res2 = trans2.getResource(getResourcePath("/test/1")); // Add company in sess/tx #1 Company company = getModel1Factory().createCompany(); @@ -91,14 +91,14 @@ public class Bugzilla_273233_Test extends AbstractCDOTest session.options().setPassiveUpdateEnabled(false); CDOTransaction trans = session.openTransaction(); - CDOResource res = trans.createResource("/test/1"); + CDOResource res = trans.createResource(getResourcePath("/test/1")); trans.commit(); CDOSession session2 = openSession(); session2.options().setPassiveUpdateEnabled(false); CDOTransaction trans2 = session2.openTransaction(); - CDOResource res2 = trans2.getResource("/test/1"); + CDOResource res2 = trans2.getResource(getResourcePath("/test/1")); // Add company in sess/tx #1 Company company = getModel1Factory().createCompany(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273565_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273565_Test.java index 32f63983f6..ca596519fa 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273565_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273565_Test.java @@ -54,7 +54,7 @@ public class Bugzilla_273565_Test extends AbstractCDOTest final CDOSession session = openSession(); final CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(orderDetail); transaction.commit(); @@ -182,7 +182,7 @@ public class Bugzilla_273565_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(orderDetail); transaction.commit(); @@ -266,7 +266,7 @@ public class Bugzilla_273565_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(orderDetail); transaction.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273758_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273758_Test.java index 737c140464..46c89291bf 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273758_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273758_Test.java @@ -54,7 +54,7 @@ public class Bugzilla_273758_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(product); resource.getContents().add(detail1); @@ -67,7 +67,7 @@ public class Bugzilla_273758_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Product1 product2 = (Product1)resource.getContents().get(0); // Check in memory Product1 EObject reference integrity diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_276696_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_276696_Test.java index 3049d36ac4..2b7632eca0 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_276696_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_276696_Test.java @@ -30,7 +30,7 @@ public class Bugzilla_276696_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.setModified(true); EAttribute attrib = (EAttribute)resource.eClass().getEStructuralFeature("modified"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_278900_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_278900_Test.java index d8d8f95898..2591bcf89b 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_278900_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_278900_Test.java @@ -28,7 +28,7 @@ public class Bugzilla_278900_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.getOrCreateResource("/resource1"); + CDOResource res = tx.getOrCreateResource(getResourcePath("/resource1")); tx.commit(); try diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279565_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279565_Test.java index 0d6a8db5e9..8781a5f493 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279565_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279565_Test.java @@ -47,7 +47,7 @@ public class Bugzilla_279565_Test extends AbstractCDOTest try { - tx.getOrCreateResource("/test"); + tx.getOrCreateResource(getResourcePath("/test")); fail("IllegalStateException expected"); } catch (IllegalStateException sucess) @@ -81,7 +81,7 @@ public class Bugzilla_279565_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - tx.getOrCreateResource("/test"); + tx.getOrCreateResource(getResourcePath("/test")); tx.close(); new PollingTimeOuter() @@ -107,7 +107,7 @@ public class Bugzilla_279565_Test extends AbstractCDOTest } }); - tx.getOrCreateResource("/test"); + tx.getOrCreateResource(getResourcePath("/test")); tx.close(); new PollingTimeOuter() @@ -136,7 +136,7 @@ public class Bugzilla_279565_Test extends AbstractCDOTest CDOSession session2 = openSession(); CDOTransaction tx2 = session2.openTransaction(); - tx2.getOrCreateResource("/test"); + tx2.getOrCreateResource(getResourcePath("/test")); session2.close(); new PollingTimeOuter() diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279982_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279982_Test.java index 4fb5c6f2e6..cb0d7020f9 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279982_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_279982_Test.java @@ -37,7 +37,7 @@ public class Bugzilla_279982_Test extends AbstractCDOTest skipConfig(LEGACY); CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.getOrCreateResource("/resource1"); + CDOResource res = tx.getOrCreateResource(getResourcePath("/resource1")); tx.options().setStaleReferenceBehaviour(CDOStaleReferencePolicy.PROXY); GenRefSingleContained container = getModel4Factory().createGenRefSingleContained(); GenRefSingleNonContained reference = getModel4Factory().createGenRefSingleNonContained(); @@ -93,7 +93,7 @@ public class Bugzilla_279982_Test extends AbstractCDOTest // Verification that the commit is good tx = session.openTransaction(); - res = tx.getOrCreateResource("/resource1"); + res = tx.getOrCreateResource(getResourcePath("/resource1")); reference = (GenRefSingleNonContained)res.getContents().get(1); assertNull(reference.getElement()); } @@ -103,7 +103,7 @@ public class Bugzilla_279982_Test extends AbstractCDOTest skipConfig(LEGACY); CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.getOrCreateResource("/resource1"); + CDOResource res = tx.getOrCreateResource(getResourcePath("/resource1")); tx.options().setStaleReferenceBehaviour(CDOStaleReferencePolicy.PROXY); GenRefSingleContained container = getModel4Factory().createGenRefSingleContained(); GenRefMultiNonContained reference = getModel4Factory().createGenRefMultiNonContained(); @@ -143,7 +143,7 @@ public class Bugzilla_279982_Test extends AbstractCDOTest // Verification that the commit is good tx = session.openTransaction(); - res = tx.getOrCreateResource("/resource1"); + res = tx.getOrCreateResource(getResourcePath("/resource1")); reference = (GenRefMultiNonContained)res.getContents().get(1); assertEquals(0, reference.getElements().size()); } @@ -154,7 +154,7 @@ public class Bugzilla_279982_Test extends AbstractCDOTest CDOSession session = openSession(); { CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.getOrCreateResource("/resource1"); + CDOResource res = tx.getOrCreateResource(getResourcePath("/resource1")); // tx.options().setUnresolveableObjectToNullEnabled(true); GenRefSingleContained container = getModel4Factory().createGenRefSingleContained(); GenRefMultiNonContained reference = getModel4Factory().createGenRefMultiNonContained(); @@ -174,7 +174,7 @@ public class Bugzilla_279982_Test extends AbstractCDOTest clearCache(session.getRevisionManager()); CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.getOrCreateResource("/resource1"); + CDOResource res = tx.getOrCreateResource(getResourcePath("/resource1")); tx.options().setRevisionPrefetchingPolicy(CDOUtil.createRevisionPrefetchingPolicy(100)); GenRefMultiNonContained reference = (GenRefMultiNonContained)res.getContents().get(1); @@ -203,7 +203,7 @@ public class Bugzilla_279982_Test extends AbstractCDOTest // Verification that the commit is good tx = session.openTransaction(); - res = tx.getOrCreateResource("/resource1"); + res = tx.getOrCreateResource(getResourcePath("/resource1")); reference = (GenRefMultiNonContained)res.getContents().get(1); assertEquals(1, reference.getElements().size()); } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283131_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283131_Test.java index 883412e421..7491768ec6 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283131_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283131_Test.java @@ -36,7 +36,7 @@ public class Bugzilla_283131_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction();
// create initial model.
- CDOResource resource = transaction.getOrCreateResource("/test1");
+ CDOResource resource = transaction.getOrCreateResource(getResourcePath("/test1"));
Company company = getModel1Factory().createCompany();
company.setName("company1");
resource.getContents().add(company);
@@ -74,7 +74,7 @@ public class Bugzilla_283131_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction();
// create initial model.
- CDOResource resource = transaction.getOrCreateResource("/test1");
+ CDOResource resource = transaction.getOrCreateResource(getResourcePath("/test1"));
Company company = getModel1Factory().createCompany();
company.getCustomers().add(getModel1Factory().createCustomer());
resource.getContents().add(company);
@@ -113,7 +113,7 @@ public class Bugzilla_283131_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction();
// create initial model.
- CDOResource resource = transaction.getOrCreateResource("/test1");
+ CDOResource resource = transaction.getOrCreateResource(getResourcePath("/test1"));
Company company = getModel1Factory().createCompany();
company.getCustomers().add(getModel1Factory().createCustomer());
resource.getContents().add(company);
@@ -152,7 +152,7 @@ public class Bugzilla_283131_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction();
// create initial model.
- CDOResource resource = transaction.getOrCreateResource("/test1");
+ CDOResource resource = transaction.getOrCreateResource(getResourcePath("/test1"));
Company company = getModel1Factory().createCompany();
company.setName("company1");
company.setStreet("street1");
@@ -206,7 +206,7 @@ public class Bugzilla_283131_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction();
// create initial model.
- CDOResource resource = transaction.getOrCreateResource("/test1");
+ CDOResource resource = transaction.getOrCreateResource(getResourcePath("/test1"));
Company company = getModel1Factory().createCompany();
company.setName("company1");
resource.getContents().add(company);
@@ -250,7 +250,7 @@ public class Bugzilla_283131_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction();
// create initial model.
- CDOResource resource = transaction.getOrCreateResource("/test1");
+ CDOResource resource = transaction.getOrCreateResource(getResourcePath("/test1"));
Company company = getModel1Factory().createCompany();
company.setName("company1");
company.setCity("city1");
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_1_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_1_Test.java index 2f7f398fb0..f93d9f8b43 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_1_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_1_Test.java @@ -166,7 +166,7 @@ public class Bugzilla_283985_1_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.getOrCreateResource("/r1"); + CDOResource r1 = tx.getOrCreateResource(getResourcePath("/r1")); r1.getContents().clear(); // Set things up @@ -300,7 +300,7 @@ public class Bugzilla_283985_1_Test extends AbstractCDOTest session.getPackageRegistry().putEPackage(model4interfacesPackage.eINSTANCE); CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.createResource("/test/1"); + CDOResource res = tx.createResource(getResourcePath("/test/1")); GenRefMultiContained container1 = model4Factory.eINSTANCE.createGenRefMultiContained(); GenRefMultiContained container2 = model4Factory.eINSTANCE.createGenRefMultiContained(); @@ -325,7 +325,7 @@ public class Bugzilla_283985_1_Test extends AbstractCDOTest // === NEW TX === tx = session.openTransaction(); - res = tx.getResource("/test/1"); + res = tx.getResource(getResourcePath("/test/1")); container1 = (GenRefMultiContained)res.getContents().get(0); container2 = (GenRefMultiContained)res.getContents().get(1); @@ -349,7 +349,7 @@ public class Bugzilla_283985_1_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.getOrCreateResource("/r1"); + CDOResource r1 = tx.getOrCreateResource(getResourcePath("/r1")); r1.getContents().clear(); // Set things up @@ -416,7 +416,7 @@ public class Bugzilla_283985_1_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.getOrCreateResource("/r1"); + CDOResource r1 = tx.getOrCreateResource(getResourcePath("/r1")); r1.getContents().clear(); // Set things up @@ -472,7 +472,7 @@ public class Bugzilla_283985_1_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.getOrCreateResource("/r1"); + CDOResource r1 = tx.getOrCreateResource(getResourcePath("/r1")); r1.getContents().clear(); // Set things up @@ -497,7 +497,7 @@ public class Bugzilla_283985_1_Test extends AbstractCDOTest // See if the price update was incorporated in the commit { CDOView view = session.openView(); - CDOResource res = view.getResource("/r1"); + CDOResource res = view.getResource(getResourcePath("/r1")); Order order2prime = (Order)res.getContents().get(1); OrderDetail od1 = order2prime.getOrderDetails().get(0); assertEquals(PRICE, od1.getPrice()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_2_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_2_Test.java index ab16f3ca6d..4d0b2c8ff2 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_2_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_2_Test.java @@ -52,7 +52,7 @@ public class Bugzilla_283985_2_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.getOrCreateResource("/r1"); + CDOResource r1 = tx.getOrCreateResource(getResourcePath("/r1")); r1.getContents().clear(); r1.getContents().add(order1); r1.getContents().add(order2); @@ -83,7 +83,7 @@ public class Bugzilla_283985_2_Test extends AbstractCDOTest // Check if all OK if we reload in a new session CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.getResource("/r1"); + CDOResource r1 = tx.getResource(getResourcePath("/r1")); order1 = (Order)r1.getContents().get(0); order2 = (Order)r1.getContents().get(1); @@ -105,7 +105,7 @@ public class Bugzilla_283985_2_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.getOrCreateResource("/r1"); + CDOResource r1 = tx.getOrCreateResource(getResourcePath("/r1")); r1.getContents().clear(); r1.getContents().add(order1); r1.getContents().add(order2); @@ -141,7 +141,7 @@ public class Bugzilla_283985_2_Test extends AbstractCDOTest // Check if all OK if we reload in a new session CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.getResource("/r1"); + CDOResource r1 = tx.getResource(getResourcePath("/r1")); order1 = (Order)r1.getContents().get(0); order2 = (Order)r1.getContents().get(1); detail1 = (OrderDetail)CDOUtil.getEObject(tx.getObject(CDOUtil.getCDOObject(detail1).cdoID())); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_3_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_3_Test.java index 42d733920b..ce40ac7c68 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_3_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_3_Test.java @@ -60,7 +60,7 @@ public class Bugzilla_283985_3_Test extends AbstractCDOTest session = openSession(); transaction = session.openTransaction(); - resource = transaction.getOrCreateResource("/r1"); + resource = transaction.getOrCreateResource(getResourcePath("/r1")); resource.getContents().clear(); resource.getContents().add(order1); resource.getContents().add(order2); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_285008_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_285008_Test.java index 4fc6e81d8c..a4fc9f4dad 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_285008_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_285008_Test.java @@ -49,7 +49,7 @@ public class Bugzilla_285008_Test extends AbstractCDOTest } CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.createResource(RESOURCENAME); + CDOResource r1 = tx.createResource(getResourcePath(RESOURCENAME)); RefMultiNonContainedUnsettable a = f.createRefMultiNonContainedUnsettable(); MultiNonContainedUnsettableElement b = f.createMultiNonContainedUnsettableElement(); r1.getContents().add(a); @@ -74,7 +74,7 @@ public class Bugzilla_285008_Test extends AbstractCDOTest session.options().setPassiveUpdateEnabled(false); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.getResource(RESOURCENAME); + CDOResource r1 = tx.getResource(getResourcePath(RESOURCENAME)); RefMultiNonContainedUnsettable a = (RefMultiNonContainedUnsettable)r1.getContents().get(0); assertEquals(true, a.isSetElements()); @@ -106,7 +106,7 @@ public class Bugzilla_285008_Test extends AbstractCDOTest } CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.createResource(RESOURCENAME); + CDOResource r1 = tx.createResource(getResourcePath(RESOURCENAME)); RefMultiNonContainedUnsettable a = f.createRefMultiNonContainedUnsettable(); MultiNonContainedUnsettableElement b = f.createMultiNonContainedUnsettableElement(); r1.getContents().add(a); @@ -132,7 +132,7 @@ public class Bugzilla_285008_Test extends AbstractCDOTest session.options().setPassiveUpdateEnabled(false); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.getResource(RESOURCENAME); + CDOResource r1 = tx.getResource(getResourcePath(RESOURCENAME)); RefMultiNonContainedUnsettable a = (RefMultiNonContainedUnsettable)r1.getContents().get(0); MultiNonContainedUnsettableElement b = (MultiNonContainedUnsettableElement)r1.getContents().get(1); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_289932_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_289932_Test.java index 2dea871d19..14699c4d64 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_289932_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_289932_Test.java @@ -31,7 +31,7 @@ public class Bugzilla_289932_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(getModel5Package()); CDOTransaction transaction = session.openTransaction(); - CDOResource res1 = transaction.createResource("/res1"); + CDOResource res1 = transaction.createResource(getResourcePath("/res1")); TestFeatureMap testFeatureMap = getModel5Factory().createTestFeatureMap(); Doctor doctor = getModel5Factory().createDoctor(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_293283_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_293283_Test.java index 7b7cb46a6f..4d9c44320f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_293283_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_293283_Test.java @@ -38,7 +38,7 @@ public class Bugzilla_293283_Test extends AbstractCDOTest session = openSession(); tx = session.openTransaction(); - CDOResource r1 = tx.getOrCreateResource("/r1"); //$NON-NLS-1$ + CDOResource r1 = tx.getOrCreateResource(getResourcePath("/r1")); //$NON-NLS-1$ r1.getContents().clear(); order1 = getModel1Factory().createPurchaseOrder(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_294859_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_294859_Test.java index a7df4b1bce..76d6433725 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_294859_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_294859_Test.java @@ -49,7 +49,7 @@ public class Bugzilla_294859_Test extends AbstractCDOTest // Do NOT use a conflict resolver - CDOResource r1 = tx.createResource(RESOURCE_NAME); + CDOResource r1 = tx.createResource(getResourcePath(RESOURCE_NAME)); Company company1 = getModel1Factory().createCompany(); Company company2 = getModel1Factory().createCompany(); @@ -107,7 +107,7 @@ public class Bugzilla_294859_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.getResource(RESOURCE_NAME); + CDOResource r1 = tx.getResource(getResourcePath(RESOURCE_NAME)); Company c = (Company)r1.getContents().get(0); // Touch the purchaseOrder diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_296561_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_296561_Test.java index 941db76f62..4f8b46fc25 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_296561_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_296561_Test.java @@ -44,7 +44,7 @@ public class Bugzilla_296561_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -55,7 +55,7 @@ public class Bugzilla_296561_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/test1"); + CDOResource res = transaction.getResource(getResourcePath("/test1")); Customer customer = (Customer)res.getContents().get(0); customer.setName("modified"); @@ -96,7 +96,7 @@ public class Bugzilla_296561_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -107,7 +107,7 @@ public class Bugzilla_296561_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/test1"); + CDOResource res = transaction.getResource(getResourcePath("/test1")); Customer customer = (Customer)res.getContents().get(0); customer.setName("modified"); @@ -125,7 +125,7 @@ public class Bugzilla_296561_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource res = transaction.getResource("/test1"); + CDOResource res = transaction.getResource(getResourcePath("/test1")); Customer customer = (Customer)res.getContents().get(0); customer.setName("modified"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_298561_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_298561_Test.java index c707bef741..ceeeaaad6f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_298561_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_298561_Test.java @@ -41,7 +41,7 @@ public class Bugzilla_298561_Test extends AbstractCDOTest session.getPackageRegistry().putEPackage(getModel4Package()); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.createResource(RESOURCENAME); + CDOResource r1 = tx.createResource(getResourcePath(RESOURCENAME)); // Create referencee and store it ContainedElementNoOpposite referencee = getModel4Factory().createContainedElementNoOpposite(); @@ -86,7 +86,7 @@ public class Bugzilla_298561_Test extends AbstractCDOTest session.getPackageRegistry().putEPackage(getModel4Package()); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.createResource(RESOURCENAME); + CDOResource r1 = tx.createResource(getResourcePath(RESOURCENAME)); // Create referencee and referencer (but no reference yet), and store them ContainedElementNoOpposite referencee = getModel4Factory().createContainedElementNoOpposite(); @@ -129,7 +129,7 @@ public class Bugzilla_298561_Test extends AbstractCDOTest session.getPackageRegistry().putEPackage(getModel4Package()); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.createResource(RESOURCENAME); + CDOResource r1 = tx.createResource(getResourcePath(RESOURCENAME)); // Create referencee and store it ContainedElementNoOpposite referencee = getModel4Factory().createContainedElementNoOpposite(); @@ -173,7 +173,7 @@ public class Bugzilla_298561_Test extends AbstractCDOTest session.getPackageRegistry().putEPackage(getModel4Package()); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.createResource(RESOURCENAME); + CDOResource r1 = tx.createResource(getResourcePath(RESOURCENAME)); // Create referencee and referencer (but no reference yet), and store them ContainedElementNoOpposite referencee = getModel4Factory().createContainedElementNoOpposite(); @@ -214,7 +214,7 @@ public class Bugzilla_298561_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.getResource(RESOURCENAME); + CDOResource r1 = tx.getResource(getResourcePath(RESOURCENAME)); ContainedElementNoOpposite referencee = (ContainedElementNoOpposite)r1.getContents().get(0); EcoreUtil.delete(referencee); tx.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_299190_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_299190_Test.java index c71fe9b003..61e91077d8 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_299190_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_299190_Test.java @@ -40,7 +40,7 @@ public class Bugzilla_299190_Test extends AbstractCDOTest protected void doSetUp() throws Exception { super.doSetUp(); - String path1 = "/resources/folder1/" + uniqueCounter; + String path1 = getResourcePath("/resources/folder1/" + uniqueCounter); ++uniqueCounter; init(path1); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302233_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302233_Test.java index b58389854d..68c61e35e7 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302233_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302233_Test.java @@ -51,7 +51,7 @@ public class Bugzilla_302233_Test extends AbstractCDOTest session.getPackageRegistry().putEPackage(getModel1Package()); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(order); for (int i = 0; i < 10; i++) @@ -75,7 +75,7 @@ public class Bugzilla_302233_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(company); transaction.commit(); @@ -95,7 +95,7 @@ public class Bugzilla_302233_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(getModel1Factory().createCompany()); resource.getContents().add(getModel1Factory().createCompany()); resource.getContents().add(getModel1Factory().createCompany()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302414_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302414_Test.java index 79b757a933..50d38d0c82 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302414_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302414_Test.java @@ -31,7 +31,7 @@ public class Bugzilla_302414_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.createResource("/r1"); //$NON-NLS-1$ + CDOResource r1 = tx.createResource(getResourcePath("/r1")); //$NON-NLS-1$ Company company = getModel1Factory().createCompany(); r1.getContents().add(company); @@ -69,7 +69,7 @@ public class Bugzilla_302414_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.createResource("/r1"); //$NON-NLS-1$ + CDOResource r1 = tx.createResource(getResourcePath("/r1")); //$NON-NLS-1$ Company company = getModel1Factory().createCompany(); r1.getContents().add(company); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303466_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303466_Test.java index d798882653..e1fdc7a242 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303466_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303466_Test.java @@ -57,7 +57,7 @@ public class Bugzilla_303466_Test extends AbstractCDOTest assertNull(derivedClass.getEStructuralFeature("couter")); CDOTransaction tx = session.openTransaction(); - CDOResource resource2 = tx.createResource("/resource1"); + CDOResource resource2 = tx.createResource(getResourcePath("/resource1")); resource2.getContents().add(derived); try @@ -119,7 +119,7 @@ public class Bugzilla_303466_Test extends AbstractCDOTest assertNotNull(derivedClass.getEStructuralFeature("couter")); CDOTransaction tx = session.openTransaction(); - CDOResource resource3 = tx.createResource("/resource1"); + CDOResource resource3 = tx.createResource(getResourcePath("/resource1")); resource3.getContents().add(derived); try diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303807_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303807_Test.java index f766da2e2b..5323bbcae6 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303807_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303807_Test.java @@ -39,7 +39,7 @@ public class Bugzilla_303807_Test extends AbstractCDOTest // Commit to main branch a new resource CDOBranch mainBranch = session.getBranchManager().getMainBranch(); CDOTransaction transaction = session.openTransaction(mainBranch); - transaction.createResource("/test1"); + transaction.createResource(getResourcePath("/test1")); transaction.commit(); // Switch transaction to a new branch diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_305527_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_305527_Test.java index a4acc745f3..1483bfcb2c 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_305527_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_305527_Test.java @@ -42,7 +42,7 @@ public class Bugzilla_305527_Test extends AbstractCDOTest mangoValue.setName("1"); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); //$NON-NLS-1$ + CDOResource resource = transaction.createResource(getResourcePath("/res1")); //$NON-NLS-1$ resource.getContents().add(mangoValue); commitTime = transaction.commit().getTimeStamp(); @@ -52,7 +52,7 @@ public class Bugzilla_305527_Test extends AbstractCDOTest } CDOView audit = session.openView(commitTime); - CDOResource auditResource = audit.getResource("/res1"); + CDOResource auditResource = audit.getResource(getResourcePath("/res1")); MangoValue mangoValue = (MangoValue)auditResource.getContents().get(0); assertEquals("1", mangoValue.getName()); @@ -60,7 +60,7 @@ public class Bugzilla_305527_Test extends AbstractCDOTest mangoList.getValues().add(mangoValue); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/res1"); //$NON-NLS-1$ + CDOResource resource = transaction.getResource(getResourcePath("/res1")); //$NON-NLS-1$ try { @@ -80,7 +80,7 @@ public class Bugzilla_305527_Test extends AbstractCDOTest { CDOSession openSession = openSession(); CDOTransaction transaction1 = openSession.openTransaction(); - CDOResource resource1 = transaction1.createResource("test"); + CDOResource resource1 = transaction1.createResource(getResourcePath("test")); Customer customer1 = getModel1Factory().createCustomer(); Customer customer2 = getModel1Factory().createCustomer(); @@ -98,7 +98,7 @@ public class Bugzilla_305527_Test extends AbstractCDOTest transaction1.commit(); CDOTransaction transaction2 = openSession.openTransaction(); - CDOResource resource2 = transaction2.getResource("test"); + CDOResource resource2 = transaction2.getResource(getResourcePath("test")); SalesOrder salesOrderFound = (SalesOrder)resource2.getContents().get(2); resource2.getContents().add(salesOrderFound); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306710_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306710_Test.java index a70a981c6f..d3e30a4cb3 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306710_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306710_Test.java @@ -35,7 +35,7 @@ public class Bugzilla_306710_Test extends AbstractCDOTest // setup connection1. CDOSession session1 = openSession(); CDOTransaction transaction1 = session1.openTransaction(); - CDOResource resource1 = transaction1.createResource("/test1"); + CDOResource resource1 = transaction1.createResource(getResourcePath("/test1")); // add initial model. Company company1 = getModel1Factory().createCompany(); @@ -50,7 +50,7 @@ public class Bugzilla_306710_Test extends AbstractCDOTest CDOSession session2 = openSession(); CDOTransaction transaction2 = session2.openTransaction(); transaction2.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); - CDOResource resource2 = transaction2.getOrCreateResource("/test1"); + CDOResource resource2 = transaction2.getOrCreateResource(getResourcePath("/test1")); // add adapter to company2 to have sendDeltaNotification being called. Company company2 = (Company)resource2.getContents().get(0); @@ -101,7 +101,7 @@ public class Bugzilla_306710_Test extends AbstractCDOTest // setup connection1. CDOSession session1 = openSession(); CDOTransaction transaction1 = session1.openTransaction(); - CDOResource resource1 = transaction1.createResource("/test1"); + CDOResource resource1 = transaction1.createResource(getResourcePath("/test1")); // add initial model. Company company1 = getModel1Factory().createCompany(); @@ -114,7 +114,7 @@ public class Bugzilla_306710_Test extends AbstractCDOTest CDOSession session2 = openSession(); CDOTransaction transaction2 = session2.openTransaction(); transaction2.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); - CDOResource resource2 = transaction2.getOrCreateResource("/test1"); + CDOResource resource2 = transaction2.getOrCreateResource(getResourcePath("/test1")); // add adapter to company2 to have sendDeltaNotification being called. Company company2 = (Company)resource2.getContents().get(0); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306998_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306998_Test.java index f65075024f..fc32d441ba 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306998_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306998_Test.java @@ -45,7 +45,7 @@ public class Bugzilla_306998_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.createResource("/test"); + CDOResource res = tx.createResource(getResourcePath("/test")); EObject obj = EcoreUtil.create(cls); @@ -59,7 +59,7 @@ public class Bugzilla_306998_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOView view = session.openView(); - CDOResource res = view.getResource("/test"); + CDOResource res = view.getResource(getResourcePath("/test")); EObject obj = res.getContents().get(0); assertEquals(7, ((VAT)obj.eGet(att)).getValue()); @@ -89,7 +89,7 @@ public class Bugzilla_306998_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.createResource("/test"); + CDOResource res = tx.createResource(getResourcePath("/test")); EObject obj = EcoreUtil.create(cls); @@ -105,7 +105,7 @@ public class Bugzilla_306998_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOView view = session.openView(); - CDOResource res = view.getResource("/test"); + CDOResource res = view.getResource(getResourcePath("/test")); EObject obj = res.getContents().get(0); assertEquals(0, ((VAT)obj.eGet(att)).getValue()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_308895_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_308895_Test.java index 63b70217cd..f1c336b4a7 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_308895_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_308895_Test.java @@ -71,7 +71,7 @@ public class Bugzilla_308895_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.createResource("/test"); + CDOResource res = tx.createResource(getResourcePath("/test")); res.getContents().add(obj); tx.commit(); tx.close(); @@ -84,7 +84,7 @@ public class Bugzilla_308895_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOView v = session.openView(); - CDOResource res = v.getResource("/test"); + CDOResource res = v.getResource(getResourcePath("/test")); EObject persistent = res.getContents().get(0); CustomType pCustom = (CustomType)persistent.eGet(att); @@ -108,7 +108,7 @@ public class Bugzilla_308895_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.createResource("/test"); + CDOResource res = tx.createResource(getResourcePath("/test")); res.getContents().add(obj); tx.commit(); tx.close(); @@ -121,7 +121,7 @@ public class Bugzilla_308895_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOView v = session.openView(); - CDOResource res = v.getResource("/test"); + CDOResource res = v.getResource(getResourcePath("/test")); EObject persistent = res.getContents().get(0); CustomType pCustom = (CustomType)persistent.eGet(att); @@ -142,7 +142,7 @@ public class Bugzilla_308895_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.createResource("/test"); + CDOResource res = tx.createResource(getResourcePath("/test")); res.getContents().add(obj); tx.commit(); tx.close(); @@ -155,7 +155,7 @@ public class Bugzilla_308895_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOView v = session.openView(); - CDOResource res = v.getResource("/test"); + CDOResource res = v.getResource(getResourcePath("/test")); EObject persistent = res.getContents().get(0); CustomType pCustom = (CustomType)persistent.eGet(att); @@ -177,7 +177,7 @@ public class Bugzilla_308895_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.createResource("/test"); + CDOResource res = tx.createResource(getResourcePath("/test")); res.getContents().add(obj); tx.commit(); tx.close(); @@ -190,7 +190,7 @@ public class Bugzilla_308895_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOView v = session.openView(); - CDOResource res = v.getResource("/test"); + CDOResource res = v.getResource(getResourcePath("/test")); EObject persistent = res.getContents().get(0); CustomType pCustom = (CustomType)persistent.eGet(att); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_310574_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_310574_Test.java index a617add36e..322cefd2b7 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_310574_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_310574_Test.java @@ -102,7 +102,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); resource.getContents().add(company); @@ -138,7 +138,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -166,7 +166,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest // setup connection1. CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); // add initial model. Company company = getModel1Factory().createCompany(); @@ -211,7 +211,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest // setup connection1. CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("/test1"); + CDOResource resource1 = transaction.createResource(getResourcePath("/test1")); // add initial model. Company company = getModel1Factory().createCompany(); @@ -254,7 +254,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest // setup connection1. CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); // add initial model. Company company = getModel1Factory().createCompany(); @@ -298,7 +298,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction1 = session.openTransaction(); String resourcePath = "/test1"; - CDOResource res = transaction1.createResource(resourcePath); + CDOResource res = transaction1.createResource(getResourcePath(resourcePath)); res.getContents().add(getModel1Factory().createCompany()); transaction1.commit(); @@ -329,7 +329,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -368,7 +368,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -396,7 +396,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -432,7 +432,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -460,7 +460,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -495,7 +495,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -523,7 +523,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -555,7 +555,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -583,7 +583,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -614,7 +614,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -642,7 +642,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -675,7 +675,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -703,7 +703,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -735,7 +735,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -763,7 +763,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -796,7 +796,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -824,7 +824,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -864,7 +864,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -893,7 +893,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -922,7 +922,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -952,7 +952,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -980,7 +980,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -1010,7 +1010,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -1032,7 +1032,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -1062,7 +1062,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -1082,7 +1082,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -1106,7 +1106,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -1131,7 +1131,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -1155,7 +1155,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -1187,7 +1187,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); @@ -1234,7 +1234,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(customer); transaction.commit(); @@ -1342,7 +1342,7 @@ public class Bugzilla_310574_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); Customer testCustomer = (Customer)resource.getContents().get(0); EList<SalesOrder> orders = testCustomer.getSalesOrders(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java index 39b7d5370d..1eaf8a5045 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java @@ -38,7 +38,7 @@ public class Bugzilla_313326_Test extends AbstractCDOTest tr1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); // init model with a container. - final CDOResource resource = tr1.createResource("/test1"); + final CDOResource resource = tr1.createResource(getResourcePath("/test1")); RefSingleContained container = getModel4Factory().createRefSingleContained(); container.setElement(getModel4Factory().createSingleContainedElement()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313913_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313913_Test.java index 753d59b95a..d2480fbb9c 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313913_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313913_Test.java @@ -44,7 +44,7 @@ public class Bugzilla_313913_Test extends AbstractCDOTest container.getTasks().add(task); } - final CDOResource resourceA = transaction.createResource("/test1"); + final CDOResource resourceA = transaction.createResource(getResourcePath("/test1")); resourceA.getContents().add(container); transaction.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314186_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314186_Test.java index 3af4f74bf9..a131291af3 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314186_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314186_Test.java @@ -34,7 +34,7 @@ public class Bugzilla_314186_Test extends AbstractCDOTest ResourceSet resourceSet = new ResourceSetImpl(); CDOTransaction transaction = session.openTransaction(resourceSet); - CDOResource resource = transaction.createResource("/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/resource")); resource.eAdapters().add(new AdapterImpl() { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java index 7724c8c65b..fcca578eb5 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java @@ -39,7 +39,7 @@ public class Bugzilla_314264_Test extends AbstractCDOTest final CDOTransaction tr1 = session.openTransaction(); tr1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); - final CDOResource resource = tr1.createResource("/test1"); + final CDOResource resource = tr1.createResource(getResourcePath("/test1")); TaskContainer container = getModel2Factory().createTaskContainer(); resource.getContents().add(container); @@ -79,7 +79,7 @@ public class Bugzilla_314264_Test extends AbstractCDOTest final CDOTransaction tr1 = session.openTransaction(); tr1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); - final CDOResource resource = tr1.createResource("/test1"); + final CDOResource resource = tr1.createResource(getResourcePath("/test1")); TaskContainer container = getModel2Factory().createTaskContainer(); resource.getContents().add(container); tr1.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_315043_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_315043_Test.java index 0fdcea2f19..a1c0bfb71e 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_315043_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_315043_Test.java @@ -53,7 +53,7 @@ public class Bugzilla_315043_Test extends AbstractCDOTest { // create model history CDOTransaction openTransaction = initialSession.openTransaction(); - CDOResource resource = openTransaction.getOrCreateResource(RESOURCE_NAME); + CDOResource resource = openTransaction.getOrCreateResource(getResourcePath(RESOURCE_NAME)); // creating initial commit Company createdCompany = getModel1Factory().createCompany(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316145_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316145_Test.java index 9ce44dc23a..3bcfa6e91a 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316145_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316145_Test.java @@ -43,7 +43,7 @@ public class Bugzilla_316145_Test extends AbstractCDOTest // create model history CDOSession session = (CDOSession)openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getOrCreateResource(RESOURCE_NAME); + CDOResource resource = transaction.getOrCreateResource(getResourcePath(RESOURCE_NAME)); // creating initial commit Company company = getModel1Factory().createCompany(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316273_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316273_Test.java index d801027fbf..3376d55555 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316273_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316273_Test.java @@ -32,7 +32,7 @@ public class Bugzilla_316273_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Customer customer = getModel1Factory().createCustomer(); customer.setName("customer"); @@ -55,7 +55,7 @@ public class Bugzilla_316273_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); Product1 product1 = getModel1Factory().createProduct1(); product1.setName("product1"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316434_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316434_Test.java index d9ebc17b71..987bb5f854 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316434_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316434_Test.java @@ -47,7 +47,7 @@ public class Bugzilla_316434_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test1"); + CDOResource resource = transaction.createResource(getResourcePath("/test1")); resource.getContents().add(target); resource.getContents().add(source); @@ -57,7 +57,7 @@ public class Bugzilla_316434_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test1"); + CDOResource resource = transaction.getResource(getResourcePath("/test1")); resource.getContents().remove(0); try diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316444_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316444_Test.java index 9074dba379..b3e03448b1 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316444_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316444_Test.java @@ -170,7 +170,7 @@ public class Bugzilla_316444_Test extends AbstractCDOTest idInitSession = session.getSessionID(); CDOTransaction transaction = session.openTransaction(); - Resource resource = transaction.createResource(RESOURCE_PATH); + Resource resource = transaction.createResource(getResourcePath(RESOURCE_PATH)); // -------------- create graph begin ------------------------ NodeB root = createSimpleNode("root"); @@ -211,7 +211,7 @@ public class Bugzilla_316444_Test extends AbstractCDOTest CDOSession session = (CDOSession)openSession(REPOSITORY_NAME); idInitSession = session.getSessionID(); CDOTransaction transaction = session.openTransaction(); - Resource resource = transaction.getResource(RESOURCE_PATH, true); + Resource resource = transaction.getResource(getResourcePath(RESOURCE_PATH), true); NodeB root = (NodeB)resource.getContents().get(0); assertEquals("root", root.getName()); @@ -274,7 +274,7 @@ public class Bugzilla_316444_Test extends AbstractCDOTest idInitSession = session.getSessionID(); CDOTransaction transaction = session.openTransaction(); - Resource resource = transaction.createResource(resourcePath); + Resource resource = transaction.createResource(getResourcePath(resourcePath)); // -------------- create graph begin ------------------------ NodeB root = createSimpleNode("root"); @@ -414,7 +414,7 @@ public class Bugzilla_316444_Test extends AbstractCDOTest { msg("Started Thread A " + session); CDOTransaction transaction = session.openTransaction(); - Resource resource = transaction.getResource(resourcePath, true); + Resource resource = transaction.getResource(getResourcePath(resourcePath), true); NodeB root = (NodeB)resource.getContents().get(0); assertEquals("root", root.getName()); @@ -471,7 +471,7 @@ public class Bugzilla_316444_Test extends AbstractCDOTest msg("Started Thread B " + session); CDOTransaction transaction = session.openTransaction(); - Resource resource = transaction.getResource(resourcePath, true); + Resource resource = transaction.getResource(getResourcePath(resourcePath), true); NodeB root = (NodeB)resource.getContents().get(0); assertEquals("root", root.getName()); @@ -541,7 +541,7 @@ public class Bugzilla_316444_Test extends AbstractCDOTest { msg("Started Thread X" + session); CDOTransaction transaction = session.openTransaction(); - Resource resource = transaction.getResource(resourcePath, true); + Resource resource = transaction.getResource(getResourcePath(resourcePath), true); NodeB root = (NodeB)resource.getContents().get(0); assertEquals("root", root.getName()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316887_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316887_Test.java index 004fbc6e52..61d48a75ca 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316887_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316887_Test.java @@ -53,7 +53,7 @@ public class Bugzilla_316887_Test extends AbstractCDOTest final CDOSession session = openSession(); final CDOTransaction tr1 = session.openTransaction(); - final CDOResource resource = tr1.createResource("/test1"); + final CDOResource resource = tr1.createResource(getResourcePath("/test1")); TaskContainer container = getModel2Factory().createTaskContainer(); resource.getContents().add(container); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318518_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318518_Test.java index ae55e08a85..18f5c0c815 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318518_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318518_Test.java @@ -42,7 +42,7 @@ public class Bugzilla_318518_Test extends AbstractCDOTest final CDOSession session = openSession(); final CDOTransaction tr1 = session.openTransaction(); - final CDOResource resource = tr1.createResource("/test1"); + final CDOResource resource = tr1.createResource(getResourcePath("/test1")); TaskContainer container = getModel2Factory().createTaskContainer(); resource.getContents().add(container); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java index e91eb7fcbc..be5e39570c 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java @@ -35,7 +35,7 @@ public class Bugzilla_318844_Test extends AbstractCDOTest final CDOSession session = openSession(); session.options().setPassiveUpdateEnabled(false); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.createResource("/r1"); //$NON-NLS-1$ + CDOResource r1 = tx.createResource(getResourcePath("/r1")); //$NON-NLS-1$ PurchaseOrder po1 = getModel1Factory().createPurchaseOrder(); po1.setDate(new Date()); @@ -67,7 +67,7 @@ public class Bugzilla_318844_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.getResource("/r1"); //$NON-NLS-1$ + CDOResource r1 = tx.getResource(getResourcePath("/r1")); //$NON-NLS-1$ // Detach the purchaseOrder r1.getContents().remove(0); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318876_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318876_Test.java index f393bd3406..cc358a5ca3 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318876_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318876_Test.java @@ -37,7 +37,7 @@ public class Bugzilla_318876_Test extends AbstractCDOTest final CDOSession session = openSession(); session.options().setPassiveUpdateEnabled(false); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.createResource("/r1"); //$NON-NLS-1$ + CDOResource r1 = tx.createResource(getResourcePath("/r1")); //$NON-NLS-1$ PurchaseOrder po1 = getModel1Factory().createPurchaseOrder(); po1.setDate(new Date()); @@ -70,7 +70,7 @@ public class Bugzilla_318876_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource r1 = tx.getResource("/r1"); //$NON-NLS-1$ + CDOResource r1 = tx.getResource(getResourcePath("/r1")); //$NON-NLS-1$ // Detach the po PurchaseOrder po = (PurchaseOrder)r1.getContents().get(0); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318919_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318919_Test.java index 7700e5dae2..33a1e4e7ef 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318919_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318919_Test.java @@ -81,7 +81,7 @@ public class Bugzilla_318919_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); Category tree = createCategoryTree(3); expected = countObjects(tree); resource.getContents().add(tree); @@ -94,7 +94,7 @@ public class Bugzilla_318919_Test extends AbstractCDOTest TestRevisionManager revisionManager = (TestRevisionManager)session.getRevisionManager(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/res1"); + CDOResource resource = transaction.getResource(getResourcePath("/res1")); assertProxy(resource); revisionManager.resetAdditionalCounter(); @@ -110,7 +110,7 @@ public class Bugzilla_318919_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); Category tree = createCategoryTree(3); expected = countObjects(tree); resource.getContents().add(tree); @@ -123,7 +123,7 @@ public class Bugzilla_318919_Test extends AbstractCDOTest TestRevisionManager revisionManager = (TestRevisionManager)session.getRevisionManager(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/res1"); + CDOResource resource = transaction.getResource(getResourcePath("/res1")); resource.getContents().get(0); assertClean(resource, transaction); @@ -140,7 +140,7 @@ public class Bugzilla_318919_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); Category tree = createCategoryTree(3); expected = countObjects(tree); resource.getContents().add(tree); @@ -153,7 +153,7 @@ public class Bugzilla_318919_Test extends AbstractCDOTest TestRevisionManager revisionManager = (TestRevisionManager)session.getRevisionManager(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/res1"); + CDOResource resource = transaction.getResource(getResourcePath("/res1")); Category category = (Category)resource.getContents().get(0); category.getName(); // Not really needed --expected; // Tree root is not "additional" diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318998_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318998_Test.java index 31c6f117a8..e7ab0f1532 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318998_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318998_Test.java @@ -42,7 +42,7 @@ public class Bugzilla_318998_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating test data"); - CDOResource resource = transaction.createResource("/test"); + CDOResource resource = transaction.createResource(getResourcePath("/test")); RefSingleContainedNPL container = getModel4Factory().createRefSingleContainedNPL(); RefSingleNonContainedNPL nonContainer = getModel4Factory().createRefSingleNonContainedNPL(); ContainedElementNoOpposite contained = getModel4Factory().createContainedElementNoOpposite(); @@ -73,7 +73,7 @@ public class Bugzilla_318998_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); msg("Creating test data"); - CDOResource resource = transaction.createResource("/test"); + CDOResource resource = transaction.createResource(getResourcePath("/test")); RefMultiContainedNPL container = getModel4Factory().createRefMultiContainedNPL(); RefMultiNonContainedNPL nonContainer = getModel4Factory().createRefMultiNonContainedNPL(); ContainedElementNoOpposite contained = getModel4Factory().createContainedElementNoOpposite(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319836_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319836_Test.java index 95450d714b..f8b2915444 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319836_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_319836_Test.java @@ -49,7 +49,7 @@ public class Bugzilla_319836_Test extends AbstractCDOTest // Setup an initial session and a transaction. CDOSession session = openSession(); CDOTransaction tr1 = session.openTransaction(); - CDOResource resource = tr1.createResource("/test1"); + CDOResource resource = tr1.createResource(getResourcePath("/test1")); NodeA n1 = getModel3Factory().createNodeA(); NodeA n2 = getModel3Factory().createNodeA(); @@ -115,7 +115,7 @@ public class Bugzilla_319836_Test extends AbstractCDOTest // Setup a new session. The bug only does not seem to occur if we use the same session. CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("/test1"); + CDOResource resource = view.getResource(getResourcePath("/test1")); NodeA n1 = (NodeA)resource.getContents().get(0); @@ -135,7 +135,7 @@ public class Bugzilla_319836_Test extends AbstractCDOTest // Setup an initial session and a transaction. CDOSession session = openSession(); CDOTransaction tr1 = session.openTransaction(); - CDOResource resource = tr1.createResource("/test1"); + CDOResource resource = tr1.createResource(getResourcePath("/test1")); NodeA n1 = getModel3Factory().createNodeA(); NodeA n2 = getModel3Factory().createNodeA(); @@ -202,7 +202,7 @@ public class Bugzilla_319836_Test extends AbstractCDOTest // Setup a new session. The bug only does not seem to occur if we use the same session. CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("/test1"); + CDOResource resource = view.getResource(getResourcePath("/test1")); NodeA n1 = (NodeA)resource.getContents().get(0); @@ -224,7 +224,7 @@ public class Bugzilla_319836_Test extends AbstractCDOTest // Setup an initial session and a transaction. CDOSession session = openSession(); CDOTransaction tr1 = session.openTransaction(); - CDOResource resource = tr1.createResource("/test1"); + CDOResource resource = tr1.createResource(getResourcePath("/test1")); NodeA n1 = getModel3Factory().createNodeA(); NodeA n2 = getModel3Factory().createNodeA(); @@ -294,7 +294,7 @@ public class Bugzilla_319836_Test extends AbstractCDOTest // Setup a new session. The bug only does not seem to occur if we use the same session. CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource resource = view.getResource("/test1"); + CDOResource resource = view.getResource(getResourcePath("/test1")); NodeA n1 = (NodeA)resource.getContents().get(0); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_320690_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_320690_Test.java index 121527b0ec..e6394fbaae 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_320690_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_320690_Test.java @@ -43,7 +43,7 @@ public class Bugzilla_320690_Test extends AbstractCDOTest CDOTransaction transaction1 = session1.openTransaction(); msg("Creating test data"); - CDOResource resource1 = transaction1.createResource("/test"); + CDOResource resource1 = transaction1.createResource(getResourcePath("/test")); RefSingleNonContainedNPL nonContainer1 = getModel4Factory().createRefSingleNonContainedNPL(); RefSingleContainedNPL container1 = getModel4Factory().createRefSingleContainedNPL(); ContainedElementNoOpposite contained1 = getModel4Factory().createContainedElementNoOpposite(); @@ -94,7 +94,7 @@ public class Bugzilla_320690_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test"); + CDOResource resource = transaction.createResource(getResourcePath("/test")); resource.getContents().add(a); resource.getContents().add(b); @@ -124,7 +124,7 @@ public class Bugzilla_320690_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test"); + CDOResource resource = transaction.createResource(getResourcePath("/test")); resource.getContents().add(a); resource.getContents().add(b); @@ -149,7 +149,7 @@ public class Bugzilla_320690_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test"); + CDOResource resource = transaction.createResource(getResourcePath("/test")); resource.getContents().add(a); resource.getContents().add(b); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_320837_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_320837_Test.java index f79bbec8ae..fe084701e0 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_320837_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_320837_Test.java @@ -27,7 +27,7 @@ public class Bugzilla_320837_Test extends AbstractCDOTest CDOSession session1 = openSession(); CDOTransaction transaction1 = session1.openTransaction(); - CDOResource resource1 = transaction1.createResource("/test"); + CDOResource resource1 = transaction1.createResource(getResourcePath("/test")); RefSingleContainedNPL container1 = getModel4Factory().createRefSingleContainedNPL(); ContainedElementNoOpposite contained1 = getModel4Factory().createContainedElementNoOpposite(); container1.setElement(contained1); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321699_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321699_Test.java index 8480e0cb3c..4f899b9b36 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321699_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321699_Test.java @@ -31,7 +31,7 @@ public class Bugzilla_321699_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource resource = tx.createResource("/r1"); + CDOResource resource = tx.createResource(getResourcePath("/r1")); msg("Pre-commit ID of resource = " + resource.cdoID()); CDOObject fetchedObject = tx.getObject(resource.cdoID()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322754_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322754_Test.java index 84cbd66ebf..eac1acfd41 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322754_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322754_Test.java @@ -30,7 +30,7 @@ public class Bugzilla_322754_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/r1"); + CDOResource resource = transaction.createResource(getResourcePath("/r1")); msg("Fill and commit a resource"); resource.getContents().add(getModel1Factory().createCompany()); @@ -64,10 +64,10 @@ public class Bugzilla_322754_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.createResource("/r1"); + CDOResource resource1 = transaction.createResource(getResourcePath("/r1")); resource1.getContents().add(product); - CDOResource resource2 = transaction.createResource("/r2"); + CDOResource resource2 = transaction.createResource(getResourcePath("/r2")); resource2.getContents().add(orderDetail); transaction.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322804_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322804_Test.java index d267c66438..50f4dfa61f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322804_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_322804_Test.java @@ -27,7 +27,7 @@ public class Bugzilla_322804_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/r1"); + CDOResource resource = transaction.createResource(getResourcePath("/r1")); msg("Fill and commit a resource"); GenListOfIntArray object = getModel5Factory().createGenListOfIntArray(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_323930_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_323930_Test.java index b9be849bd4..de47b21c18 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_323930_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_323930_Test.java @@ -48,7 +48,7 @@ public class Bugzilla_323930_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test"); + CDOResource resource = transaction.createResource(getResourcePath("/test")); resource.getContents().add(a); resource.getContents().add(b); @@ -84,7 +84,7 @@ public class Bugzilla_323930_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test"); + CDOResource resource = transaction.createResource(getResourcePath("/test")); resource.getContents().add(a); resource.getContents().add(b); @@ -120,7 +120,7 @@ public class Bugzilla_323930_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test"); + CDOResource resource = transaction.createResource(getResourcePath("/test")); resource.getContents().add(a); resource.getContents().add(b); @@ -154,7 +154,7 @@ public class Bugzilla_323930_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test"); + CDOResource resource = transaction.createResource(getResourcePath("/test")); resource.getContents().add(a); resource.getContents().add(b); @@ -189,7 +189,7 @@ public class Bugzilla_323930_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test"); + CDOResource resource = transaction.createResource(getResourcePath("/test")); resource.getContents().add(a); resource.getContents().add(b); @@ -230,7 +230,7 @@ public class Bugzilla_323930_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/test"); + CDOResource resource = transaction.createResource(getResourcePath("/test")); resource.getContents().add(a); resource.getContents().add(b); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_323958_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_323958_Test.java index 6710d66db4..961c511107 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_323958_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_323958_Test.java @@ -40,7 +40,7 @@ public class Bugzilla_323958_Test extends AbstractCDOTest } }); - CDOResource resource = transaction.createResource("/test"); + CDOResource resource = transaction.createResource(getResourcePath("/test")); resource.getContents().add(company); transaction.commit(); @@ -49,7 +49,7 @@ public class Bugzilla_323958_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test"); + CDOResource resource = transaction.getResource(getResourcePath("/test")); Company company = (Company)resource.getContents().get(0); assertEquals("Y", company.getName()); @@ -72,7 +72,7 @@ public class Bugzilla_323958_Test extends AbstractCDOTest } }); - CDOResource resource = transaction.createResource("/test"); + CDOResource resource = transaction.createResource(getResourcePath("/test")); resource.getContents().add(company); transaction.commit(); @@ -81,7 +81,7 @@ public class Bugzilla_323958_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/test"); + CDOResource resource = transaction.getResource(getResourcePath("/test")); Company company = (Company)resource.getContents().get(0); assertEquals(1, company.getCategories().size()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java index 04d42f88fb..1759a82a0c 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java @@ -51,7 +51,7 @@ public class Bugzilla_324084_Test extends AbstractCDOTest final CDOTransaction tr1 = session.openTransaction(); tr1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); - final CDOResource resource = tr1.createResource("/test1"); + final CDOResource resource = tr1.createResource(getResourcePath("/test1")); RefSingleContained container = getModel4Factory().createRefSingleContained(); resource.getContents().add(container); @@ -88,7 +88,7 @@ public class Bugzilla_324084_Test extends AbstractCDOTest final CDOTransaction tr1 = session.openTransaction(); tr1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); - final CDOResource resource = tr1.createResource("/test1"); + final CDOResource resource = tr1.createResource(getResourcePath("/test1")); RefMultiContained container = getModel4Factory().createRefMultiContained(); resource.getContents().add(container); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324585_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324585_Test.java index 69a433c37a..5d3f965734 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324585_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324585_Test.java @@ -34,7 +34,7 @@ public class Bugzilla_324585_Test extends AbstractCDOTest // user 1 CDOSession session1 = openSession(); CDOTransaction transaction1 = session1.openTransaction(); - CDOResource resource1 = transaction1.createResource("test"); + CDOResource resource1 = transaction1.createResource(getResourcePath("test")); Category category1 = getModel1Factory().createCategory(); resource1.getContents().add(category1); @@ -45,7 +45,7 @@ public class Bugzilla_324585_Test extends AbstractCDOTest CDOSession session2 = openSession(); session2.options().setPassiveUpdateEnabled(false); CDOTransaction transaction2 = session2.openTransaction(); - CDOResource resource2 = transaction2.getResource("test"); + CDOResource resource2 = transaction2.getResource(getResourcePath("test")); EObject category2 = resource2.getContents().get(0); category2.eAdapters().add(new AdapterImpl()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java index 80ce886959..3728adba05 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324635_Test.java @@ -44,7 +44,7 @@ public class Bugzilla_324635_Test extends AbstractCDOTest s1Tr2.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); // create resource, container and 2 elements using transaction 1. - final CDOResource resource = s1Tr1.createResource("/test1"); + final CDOResource resource = s1Tr1.createResource(getResourcePath("/test1")); RefMultiContained container = getModel4Factory().createRefMultiContained(); resource.getContents().add(container); MultiContainedElement element1 = getModel4Factory().createMultiContainedElement(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324756_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324756_Test.java index eacf863b01..784e87e4db 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324756_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324756_Test.java @@ -40,7 +40,7 @@ public class Bugzilla_324756_Test extends AbstractCDOTest s1Tr1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); // create resource, container using transaction 1. - final CDOResource resource = s1Tr1.createResource("/test1"); + final CDOResource resource = s1Tr1.createResource(getResourcePath("/test1")); RefMultiContained container = getModel4Factory().createRefMultiContained(); resource.getContents().add(container); @@ -94,7 +94,7 @@ public class Bugzilla_324756_Test extends AbstractCDOTest s1Tr1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); // create resource, element using transaction 1. - final CDOResource resource = s1Tr1.createResource("/test1"); + final CDOResource resource = s1Tr1.createResource(getResourcePath("/test1")); ContainedElementNoOpposite element = getModel4Factory().createContainedElementNoOpposite(); element.setName("Version1"); resource.getContents().add(element); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325603_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325603_Test.java index 0269812e1d..7fcda83d70 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325603_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325603_Test.java @@ -28,7 +28,7 @@ public class Bugzilla_325603_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/r1"); + CDOResource resource = transaction.createResource(getResourcePath("/r1")); resource.eAdapters().add(new AdapterImpl() { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java index b658cc84fa..b3b514a73f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java @@ -52,7 +52,7 @@ public class Bugzilla_325866_Test extends AbstractCDOTest s1Tr1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); // create resource, and container tree using transaction 1. - final CDOResource resource = s1Tr1.createResource("/test1"); + final CDOResource resource = s1Tr1.createResource(getResourcePath("/test1")); GenRefMultiContained container1 = getModel4Factory().createGenRefMultiContained(); GenRefMultiContained container2 = getModel4Factory().createGenRefMultiContained(); GenRefMultiContained container3 = getModel4Factory().createGenRefMultiContained(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java index ccce136812..b5cce68bf2 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java @@ -56,7 +56,7 @@ public class Bugzilla_326518_Test extends AbstractCDOTest transaction1.options().addChangeSubscriptionPolicy(CDOAdapterPolicy.ALL); // create resource, and container using transaction 1. - final CDOResource resource = transaction1.createResource("/test1"); + final CDOResource resource = transaction1.createResource(getResourcePath("/test1")); GenRefMultiContained container = getModel4Factory().createGenRefMultiContained(); resource.getContents().add(container); ContainedElementNoOpposite element1 = getModel4Factory().createContainedElementNoOpposite(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326743_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326743_Test.java index b407801be8..b53c37bad4 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326743_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326743_Test.java @@ -73,7 +73,7 @@ public class Bugzilla_326743_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOTransaction tx = session.openTransaction(); - CDOResource res = tx.createResource("/test"); + CDOResource res = tx.createResource(getResourcePath("/test")); res.getContents().add(obj); tx.commit(); tx.close(); @@ -86,7 +86,7 @@ public class Bugzilla_326743_Test extends AbstractCDOTest CDOSession session = openSession(); session.getPackageRegistry().putEPackage(pkg); CDOView v = session.openView(); - CDOResource res = v.getResource("/test"); + CDOResource res = v.getResource(getResourcePath("/test")); EObject persistent = res.getContents().get(0); boolean pCustom = (Boolean)persistent.eGet(att); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java index 4b4f210a95..5e76244fee 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java @@ -139,7 +139,7 @@ public class Bugzilla_327604_Test extends AbstractCDOTest InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE); CDOView view = workspace.openView(); - CDOResource resource = view.getResource(RESOURCE); + CDOResource resource = view.getResource(getResourcePath(RESOURCE)); assertEquals(totalObjects, dumpObjects(null, resource)); } @@ -188,7 +188,7 @@ public class Bugzilla_327604_Test extends AbstractCDOTest private CDOResource createTestSet(CDOTransaction transaction) throws CommitException { disableConsole(); - CDOResource resource = transaction.createResource(RESOURCE); + CDOResource resource = transaction.createResource(getResourcePath(RESOURCE)); fillResource(resource); totalObjects = 1; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java index fe64b6e6f5..a597d7e4fa 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java @@ -54,7 +54,7 @@ public class Bugzilla_328790_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource resource = tx.createResource("/myUri"); + CDOResource resource = tx.createResource(getResourcePath("/myUri")); EObject object = getModel1Factory().createAddress(); resource.getContents().add(object); @@ -73,7 +73,7 @@ public class Bugzilla_328790_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource resource = tx.createResource("/myUri"); + CDOResource resource = tx.createResource(getResourcePath("/myUri")); resource.getContents().clear(); assertEquals(true, resource.isLoaded()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329254_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329254_Test.java index 491da63edf..dbfa47cddb 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329254_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329254_Test.java @@ -129,7 +129,7 @@ public class Bugzilla_329254_Test extends AbstractCDOTest CDOTransaction transaction5 = session1.openTransaction();
// create initial model.
- CDOResource resource = transaction1.createResource("/test");
+ CDOResource resource = transaction1.createResource(getResourcePath("/test"));
Company company1 = getModel1Factory().createCompany();
company1.setName("company1");
resource.getContents().add(company1);
@@ -215,7 +215,7 @@ public class Bugzilla_329254_Test extends AbstractCDOTest final CDOTransaction transaction3 = session1.openTransaction();
// create initial model.
- CDOResource resource = transaction1.createResource("/test");
+ CDOResource resource = transaction1.createResource(getResourcePath("/test"));
Company company1a = getModel1Factory().createCompany();
company1a.setName("companyA");
resource.getContents().add(company1a);
@@ -313,7 +313,7 @@ public class Bugzilla_329254_Test extends AbstractCDOTest final CDOTransaction transaction3 = session1.openTransaction();
// create initial model.
- CDOResource resource = transaction1.createResource("/test");
+ CDOResource resource = transaction1.createResource(getResourcePath("/test"));
Company company1 = getModel1Factory().createCompany();
company1.setName("company1");
resource.getContents().add(company1);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329752_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329752_Test.java index 171a53e295..7d139d16a5 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329752_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329752_Test.java @@ -36,13 +36,13 @@ public class Bugzilla_329752_Test extends AbstractCDOTest enumList.add(VAT.VAT15); String path = "/test"; - Resource resource = transaction.createResource(path); + Resource resource = transaction.createResource(getResourcePath(path)); resource.getContents().add(enumListHolder); transaction.commit(); CDOTransaction transaction2 = session.openTransaction(); - CDOResource resource2 = transaction2.getResource(path); + CDOResource resource2 = transaction2.getResource(getResourcePath(path)); EnumListHolder enumListHolder2 = (EnumListHolder)resource2.getContents().get(0); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329753_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329753_Test.java index d8b15ef7c1..567f7b2956 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329753_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329753_Test.java @@ -39,7 +39,7 @@ public class Bugzilla_329753_Test extends AbstractCDOTest orderDetail.setProduct(product1); String path = "/test"; - Resource resource = transaction.createResource(path); + Resource resource = transaction.createResource(getResourcePath(path)); resource.getContents().add(orderDetail); resource.getContents().add(product1); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329869_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329869_Test.java index 6fcf1b7a1c..37709a909b 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329869_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329869_Test.java @@ -29,7 +29,7 @@ public class Bugzilla_329869_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - Resource resource = transaction.createResource("/test"); + Resource resource = transaction.createResource(getResourcePath("/test")); RefMultiNonContainedUnsettable parent = getModel4Factory().createRefMultiNonContainedUnsettable(); MultiNonContainedUnsettableElement child = getModel4Factory().createMultiNonContainedUnsettableElement(); @@ -45,7 +45,7 @@ public class Bugzilla_329869_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction2 = session.openTransaction(); - Resource resource2 = transaction2.getResource("/test"); + Resource resource2 = transaction2.getResource(getResourcePath("/test")); RefMultiNonContainedUnsettable parent = (RefMultiNonContainedUnsettable)resource2.getContents().get(0); MultiNonContainedUnsettableElement element = getModel4Factory().createMultiNonContainedUnsettableElement(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_330052_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_330052_Test.java index 11b2468c6e..f5fb804530 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_330052_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_330052_Test.java @@ -40,7 +40,7 @@ public class Bugzilla_330052_Test extends AbstractCDOTest CDOTransaction tx = session.openTransaction(); CDOView view = session.openView(); - CDOResource resource = tx.createResource("test"); + CDOResource resource = tx.createResource(getResourcePath("test")); Address address = getModel1Factory().createAddress(); resource.getContents().add(address); tx.commit(); @@ -59,7 +59,7 @@ public class Bugzilla_330052_Test extends AbstractCDOTest session.options().setPassiveUpdateEnabled(false); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("test"); + CDOResource resource = transaction.createResource(getResourcePath("test")); Address address = getModel1Factory().createAddress(); final String testName1 = "name1"; address.setName(testName1); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_331619_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_331619_Test.java index 1e3ca37959..6f9af5ec4c 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_331619_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_331619_Test.java @@ -59,8 +59,8 @@ public class Bugzilla_331619_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource refres = tx.createResource("/test/referenced"); - CDOResource conres = tx.createResource("/test/concrete"); + CDOResource refres = tx.createResource(getResourcePath("/test/referenced")); + CDOResource conres = tx.createResource(getResourcePath("/test/concrete")); EObject[] oRef = new EObject[6]; for (int i = 0; i < 6; i++) @@ -91,7 +91,7 @@ public class Bugzilla_331619_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOView view = session.openView(); - CDOResource res = view.getResource("/test/referenced"); + CDOResource res = view.getResource(getResourcePath("/test/referenced")); EObject oRef = res.getContents().get(0); refName = (EAttribute)oRef.eClass().getEStructuralFeature("refname"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_333157_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_333157_Test.java index 7e2864d050..0fb7a3cc91 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_333157_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_333157_Test.java @@ -24,20 +24,20 @@ public class Bugzilla_333157_Test extends AbstractCDOTest { public void testResourceFolderUpdate() throws CommitException { - createResource("/testFolder/t1"); + createResource(getResourcePath("/testFolder/t1")); CDOSession session = openSession(); session.options().setPassiveUpdateEnabled(false); CDOView view = session.openView(); // Testing if resource was created - assertNotNull(view.getResource("/testFolder/t1")); + assertNotNull(view.getResource(getResourcePath("/testFolder/t1"))); - createResource("/testFolder/t2"); + createResource(getResourcePath("/testFolder/t2")); session.refresh(); // Getting created resource - "testFolder" is retrieved from local cache - CDOResource t2 = view.getResource("/testFolder/t2"); + CDOResource t2 = view.getResource(getResourcePath("/testFolder/t2")); assertNotNull(t2); } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_333299_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_333299_Test.java index 41aa05b14d..19396a64c7 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_333299_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_333299_Test.java @@ -33,7 +33,7 @@ public class Bugzilla_333299_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage(); @@ -54,7 +54,7 @@ public class Bugzilla_333299_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/res1"); + CDOResource resource = transaction.getResource(getResourcePath("/res1")); EPackage ePackage = (EPackage)resource.getContents().get(0); ePackage.getEClassifiers().remove(0); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_333950_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_333950_Test.java index 8824998a35..ccebc1bdc6 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_333950_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_333950_Test.java @@ -58,7 +58,7 @@ public class Bugzilla_333950_Test extends AbstractCDOTest // create model and commit it CDOSession openSession = openSession(); CDOTransaction openTransaction = openSession.openTransaction(); - CDOResource createResource = openTransaction.createResource("test"); + CDOResource createResource = openTransaction.createResource(getResourcePath("test")); EClass classAClass = (EClass)pkg1.getEClassifier("A"); EClass classBClass = (EClass)pkg1.getEClassifier("B"); @@ -89,7 +89,7 @@ public class Bugzilla_333950_Test extends AbstractCDOTest // open committed model and validate if transient opposite reference is available CDOSession openSession2 = openSession(); CDOTransaction openTransaction2 = openSession2.openTransaction(); - CDOResource resource = openTransaction2.getResource("test"); + CDOResource resource = openTransaction2.getResource(getResourcePath("test")); EObject eObjectA = resource.getContents().get(0); EObject eObjectB = resource.getContents().get(1); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java index 3ddb7b1986..826b8fdded 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java @@ -61,7 +61,7 @@ public class Bugzilla_334608_Test extends AbstractCDOTest // create model and commit it CDOSession openSession = openSession(); CDOTransaction transaction = openSession.openTransaction(); - CDOResource resource = transaction.createResource("test"); + CDOResource resource = transaction.createResource(getResourcePath("test")); EClass classAClass = (EClass)pkg1.getEClassifier("A"); EClass classBClass = (EClass)pkg1.getEClassifier("B"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334995_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334995_Test.java index 596d0ddd69..2f603b99ea 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334995_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334995_Test.java @@ -35,7 +35,7 @@ public class Bugzilla_334995_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/res1"); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); msg("New resource: " + resource); msg("newObjects:"); @@ -68,7 +68,7 @@ public class Bugzilla_334995_Test extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource1 = transaction.getResource("/res1"); + CDOResource resource1 = transaction.getResource(getResourcePath("/res1")); resource1.setPath("/res2"); CDOResource resource2 = (CDOResource)transaction.getObject(resourceIDs[1]); @@ -89,7 +89,7 @@ public class Bugzilla_334995_Test extends AbstractCDOTest CDOResource[] resources = new CDOResource[resourceNames.length]; for (String resourceName : resourceNames) { - resources[i++] = transaction.createResource(resourceName); + resources[i++] = transaction.createResource(getResourcePath(resourceName)); } transaction.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335004_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335004_Test.java index f1382d2ef4..882726a435 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335004_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335004_Test.java @@ -30,7 +30,7 @@ public class Bugzilla_335004_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("test"); + CDOResource resource = transaction.createResource(getResourcePath("test")); resource.getContents().add(getModel1Factory().createAddress()); transaction.commit(); session.close(); @@ -47,7 +47,7 @@ public class Bugzilla_335004_Test extends AbstractCDOTest session.options().setGeneratedPackageEmulationEnabled(true); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("test"); // We are loading nsURI from the server + CDOResource resource = transaction.getResource(getResourcePath("test")); // We are loading nsURI from the server EObject remoteObject = resource.getContents().get(0); EObject localObject = getModel1Factory().createAddress(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335675_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335675_Test.java index 1afd4ba884..8b7af8de49 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335675_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335675_Test.java @@ -72,7 +72,7 @@ public class Bugzilla_335675_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("test"); + CDOResource resource = transaction.createResource(getResourcePath("test")); classA = (EClass)pkg.getEClassifier("A"); EObject instanceA = EcoreUtil.create(classA); @@ -91,7 +91,7 @@ public class Bugzilla_335675_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("test"); + CDOResource resource = transaction.getResource(getResourcePath("test")); CDOObject cdoObject = CDOUtil.getCDOObject(resource.getContents().get(0)); classA = cdoObject.eClass(); attr1 = (EAttribute)classA.getEStructuralFeature("attr1"); @@ -126,7 +126,7 @@ public class Bugzilla_335675_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("test"); + CDOResource resource = transaction.createResource(getResourcePath("test")); Product1 product = Model1Factory.eINSTANCE.createProduct1(); product.setName("name"); @@ -148,7 +148,7 @@ public class Bugzilla_335675_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("test"); + CDOResource resource = transaction.getResource(getResourcePath("test")); CDOObject cdoObject = CDOUtil.getCDOObject(resource.getContents().get(0)); BaseCDORevision rev = (BaseCDORevision)cdoObject.cdoRevision(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335772_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335772_Test.java index 870620ed59..f61420420d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335772_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335772_Test.java @@ -120,7 +120,7 @@ public class Bugzilla_335772_Test extends AbstractCDOTest try { - customerResource = transaction.getOrCreateResource("/customer"); //$NON-NLS-1$ + customerResource = transaction.getOrCreateResource(getResourcePath("/customer")); //$NON-NLS-1$ EList<EObject> customerResourceContents = customerResource.getContents(); customerResourceContents.clear(); customerResourceContents.add(customer); @@ -140,7 +140,7 @@ public class Bugzilla_335772_Test extends AbstractCDOTest try { - customerResource = transaction.getResource("/customer"); //$NON-NLS-1$ + customerResource = transaction.getResource(getResourcePath("/customer")); //$NON-NLS-1$ Customer customer = (Customer)customerResource.getContents().get(0); EMap<Product1, SalesOrder> orderByProduct = customer.getOrderByProduct(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336314_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336314_Test.java index 5747ede3f2..f6d853544f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336314_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336314_Test.java @@ -68,7 +68,7 @@ public class Bugzilla_336314_Test extends AbstractCDOTest assertEquals(true, getModel1Package().getOrder_OrderDetails().isOrdered()); Model1Factory mf = getModel1Factory(); - CDOResource resource = tx.createResource("test"); + CDOResource resource = tx.createResource(getResourcePath("test")); OrderDetail detailY = mf.createOrderDetail(); detailY.setPrice(1.0f); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336590_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336590_Test.java index 71a30dcc17..aaae0e6815 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336590_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_336590_Test.java @@ -49,7 +49,7 @@ public class Bugzilla_336590_Test extends AbstractCDOTest CDOTransaction tx = session.openTransaction(); tx.options().addConflictResolver(new TestResolver()); - CDOResource resource = tx.createResource("test"); + CDOResource resource = tx.createResource(getResourcePath("test")); Model1Factory f = getModel1Factory(); SalesOrder order = f.createSalesOrder(); for (int i = 0; i < 3; i++) @@ -79,7 +79,7 @@ public class Bugzilla_336590_Test extends AbstractCDOTest { CDOSession session = openSession(); CDOTransaction tx = session.openTransaction(); - CDOResource resource = tx.getResource("test"); + CDOResource resource = tx.getResource(getResourcePath("test")); SalesOrder order = (SalesOrder)resource.getContents().get(0); OrderDetail removedDetail = order.getOrderDetails().get(0); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java index 71544a1022..a770df7ef7 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java @@ -282,8 +282,9 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf protected InternalRepository createRepository(String name) { IStore store = createStore(name); - Map<String, String> props = getRepositoryProperties(); - InternalRepository repository = (InternalRepository)CDOServerUtil.createRepository(name, store, props); + + Map<String, String> repoProps = getRepositoryProperties(); + InternalRepository repository = (InternalRepository)CDOServerUtil.createRepository(name, store, repoProps); InternalCDORevisionManager revisionManager = getTestRevisionManager(); if (revisionManager == null) diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java index 7bb31030a6..4af2dde453 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOAuditDefImplTest.java @@ -56,7 +56,7 @@ public class CDOAuditDefImplTest extends AbstractCDOTest cdoAuditDef.setTimeStamp(new Date()); CDOView cdoAudit = (CDOView)cdoAuditDef.getInstance(); - EObject object = cdoAudit.getResource(RESOURCE_ID).getContents().get(0); + EObject object = cdoAudit.getResource(getResourcePath(RESOURCE_ID)).getContents().get(0); assertEquals(true, object instanceof Customer && customerName.equals(customer.getName())); } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java index a2cff222cb..3f3bc91844 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/CDOTransactionDefImplTest.java @@ -80,7 +80,7 @@ public class CDOTransactionDefImplTest extends AbstractCDOTest resource.getContents().add(customer); transaction.commit(); - CDOResource resourceFetched = transaction.getResource(TEST_RESOURCE); + CDOResource resourceFetched = transaction.getResource(getResourcePath(TEST_RESOURCE)); assertEquals(true, resourceFetched.eContents().contains(customer)); transaction.getSession().close(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_312879_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_312879_Test.java index c1fd69a575..445bb9c939 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_312879_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_312879_Test.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Martin Flügge - initial API and implementation + * Martin Fl�gge - initial API and implementation */ package org.eclipse.emf.cdo.tests.offline; @@ -25,7 +25,7 @@ import org.eclipse.net4j.util.container.IManagedContainer; import org.eclipse.net4j.util.io.IOUtil; /** - * @author Martin Flügge + * @author Martin Fl�gge */ public class Bugzilla_312879_Test extends AbstractSyncingTest { @@ -80,7 +80,7 @@ public class Bugzilla_312879_Test extends AbstractSyncingTest CDOSession session = openSession(master.getName()); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Company company = getModel1Factory().createCompany(); company.setName("Test"); @@ -122,7 +122,7 @@ public class Bugzilla_312879_Test extends AbstractSyncingTest assertEquals(CDOCommonRepository.Type.MASTER, session.getRepositoryInfo().getType()); transaction = session.openTransaction(); - resource = transaction.getResource("/my/resource"); + resource = transaction.getResource(getResourcePath("/my/resource")); company = (Company)resource.getContents().get(0); checkData(company, categoryCount, "cat", "Test"); @@ -165,7 +165,7 @@ public class Bugzilla_312879_Test extends AbstractSyncingTest assertEquals(CDOCommonRepository.Type.MASTER, session.getRepositoryInfo().getType()); transaction = session.openTransaction(); - resource = transaction.getResource("/my/resource"); + resource = transaction.getResource(getResourcePath("/my/resource")); company = (Company)resource.getContents().get(0); checkData(company, categoryCount, "CHANGED", "AfterFailover-" + (i - 1)); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_319552_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_319552_Test.java index 123052d645..e8d405e9de 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_319552_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_319552_Test.java @@ -49,7 +49,7 @@ public class Bugzilla_319552_Test extends AbstractSyncingTest session.options().setPassiveUpdateMode(PassiveUpdateMode.CHANGES); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Company company = getModel1Factory().createCompany(); resource.getContents().add(company); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_325097_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_325097_Test.java index 281df63a86..0b32a131f5 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_325097_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_325097_Test.java @@ -84,7 +84,7 @@ public class Bugzilla_325097_Test extends AbstractSyncingTest CDOSession session = openSession(master.getName()); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Company company = getModel1Factory().createCompany(); company.setName("Test"); @@ -115,7 +115,7 @@ public class Bugzilla_325097_Test extends AbstractSyncingTest assertEquals(CDOCommonRepository.Type.MASTER, session.getRepositoryInfo().getType()); transaction = session.openTransaction(); - resource = transaction.getResource("/my/resource"); + resource = transaction.getResource(getResourcePath("/my/resource")); company = (Company)resource.getContents().get(0); // Create a new company diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_326047_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_326047_Test.java index d08fe00cd9..d87b2d9e13 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_326047_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_326047_Test.java @@ -55,7 +55,7 @@ public class Bugzilla_326047_Test extends AbstractSyncingTest session.options().setPassiveUpdateMode(PassiveUpdateMode.CHANGES); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Company company = getModel1Factory().createCompany(); Customer customer = getModel1Factory().createCustomer(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_328352_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_328352_Test.java index 5b214faa69..af01384100 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_328352_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_328352_Test.java @@ -73,7 +73,7 @@ public class Bugzilla_328352_Test extends AbstractSyncingTest cloneViews[NUM_CLIENT_VIEWS] = transaction; // create resource and base model. - CDOResource resource = masterTransaction.createResource("/my/resource"); + CDOResource resource = masterTransaction.createResource(getResourcePath("/my/resource")); Company company = getModel1Factory().createCompany(); Category catA = getModel1Factory().createCategory(); catA.setName("CatA"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_329014_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_329014_Test.java index aced9801c3..254b97e3a8 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_329014_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/Bugzilla_329014_Test.java @@ -64,7 +64,7 @@ public class Bugzilla_329014_Test extends AbstractSyncingTest // initial model. CDOTransaction transaction = masterSession.openTransaction(); - CDOResource resource = transaction.createResource(RESOURCE_NAME); + CDOResource resource = transaction.createResource(getResourcePath(RESOURCE_NAME)); Company company = getModel1Factory().createCompany(); company.setName("Company1"); resource.getContents().add(company); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/FailoverTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/FailoverTest.java index d7b3ae1c28..b1a3668f93 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/FailoverTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/FailoverTest.java @@ -71,7 +71,7 @@ public class FailoverTest extends AbstractSyncingTest { CDOSession session = openSession(getRepository().getName() + "_master"); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Company company = getModel1Factory().createCompany(); company.setName("Test"); @@ -114,7 +114,7 @@ public class FailoverTest extends AbstractSyncingTest { CDOSession masterSession = openSession(getRepository().getName() + "_master"); CDOTransaction transaction = masterSession.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); TestListener listener = new TestListener(); CDOSession backupSession = openSession(); @@ -172,7 +172,7 @@ public class FailoverTest extends AbstractSyncingTest waitForOnline(backupSession.getRepositoryInfo()); CDOTransaction transaction = backupSession.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(company); @@ -191,7 +191,7 @@ public class FailoverTest extends AbstractSyncingTest { CDOSession session = openSession(getRepository().getName() + "_master"); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Company company = getModel1Factory().createCompany(); company.setName("Test"); @@ -231,7 +231,7 @@ public class FailoverTest extends AbstractSyncingTest { CDOSession session = openSession(getRepository().getName() + "_master"); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Company company = getModel1Factory().createCompany(); company.setName("Test"); @@ -278,7 +278,7 @@ public class FailoverTest extends AbstractSyncingTest session.close(); session = openSession(); transaction = session.openTransaction(); - resource = transaction.getResource("/my/resource"); + resource = transaction.getResource(getResourcePath("/my/resource")); company = (Company)resource.getContents().get(0); company.setName("Commit should NOT fail"); transaction.commit(); @@ -294,7 +294,7 @@ public class FailoverTest extends AbstractSyncingTest { CDOSession session = openSession(getRepository().getName() + "_master"); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Company company = getModel1Factory().createCompany(); company.setName("Test"); @@ -321,7 +321,7 @@ public class FailoverTest extends AbstractSyncingTest session = openSession(); transaction = session.openTransaction(); - resource = transaction.getResource("/my/resource"); + resource = transaction.getResource(getResourcePath("/my/resource")); company = (Company)resource.getContents().get(0); for (int i = 0; i < 10; i++) diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineDelayedTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineDelayedTest.java index ad80024687..b6edaa620f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineDelayedTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineDelayedTest.java @@ -62,7 +62,7 @@ public class OfflineDelayedTest extends AbstractSyncingTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(company); transaction.commit(); @@ -107,7 +107,7 @@ public class OfflineDelayedTest extends AbstractSyncingTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(company); transaction.commit(); @@ -150,7 +150,7 @@ public class OfflineDelayedTest extends AbstractSyncingTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(company); transaction.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineRawTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineRawTest.java index 5f498df1ce..da68a0bcba 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineRawTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineRawTest.java @@ -51,7 +51,7 @@ public class OfflineRawTest extends OfflineTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(getModel1Factory().createCompany()); transaction.setCommitComment("resource with one company created on clone"); @@ -69,7 +69,7 @@ public class OfflineRawTest extends OfflineTest { CDOSession masterSession = openSession(clone.getName() + "_master"); CDOTransaction masterTransaction = masterSession.openTransaction(); - CDOResource masterResource = masterTransaction.getResource("/my/resource"); + CDOResource masterResource = masterTransaction.getResource(getResourcePath("/my/resource")); masterResource.getContents().add(getModel1Factory().createCompany()); masterTransaction.setCommitComment("one company added on master"); @@ -118,7 +118,7 @@ public class OfflineRawTest extends OfflineTest CDOSession session = openSession(); session.options().setPassiveUpdateMode(PassiveUpdateMode.ADDITIONS); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(getModel1Factory().createCompany()); transaction.setCommitComment("resource with one company created on clone"); @@ -136,7 +136,7 @@ public class OfflineRawTest extends OfflineTest { CDOSession masterSession = openSession(clone.getName() + "_master"); CDOTransaction masterTransaction = masterSession.openTransaction(); - CDOResource masterResource = masterTransaction.getResource("/my/resource"); + CDOResource masterResource = masterTransaction.getResource(getResourcePath("/my/resource")); masterResource.getContents().add(getModel1Factory().createCompany()); masterTransaction.setCommitComment("one company added on master"); @@ -186,7 +186,7 @@ public class OfflineRawTest extends OfflineTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(getModel1Factory().createCompany()); transaction.setCommitComment("resource with one company created on clone"); @@ -198,7 +198,7 @@ public class OfflineRawTest extends OfflineTest { CDOSession masterSession = openSession(clone.getName() + "_master"); CDOTransaction masterTransaction = masterSession.openTransaction(); - CDOResource masterResource = masterTransaction.getResource("/my/resource"); + CDOResource masterResource = masterTransaction.getResource(getResourcePath("/my/resource")); for (int i = 0; i < 100; i++) { diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineTest.java index 38b28e0fcc..d3594fe4eb 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineTest.java @@ -39,7 +39,7 @@ public class OfflineTest extends AbstractSyncingTest { CDOSession session = openSession(getRepository().getName() + "_master"); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); Company company = getModel1Factory().createCompany(); company.setName("Test"); @@ -82,7 +82,7 @@ public class OfflineTest extends AbstractSyncingTest { CDOSession masterSession = openSession(getRepository().getName() + "_master"); CDOTransaction transaction = masterSession.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); TestListener listener = new TestListener(); CDOSession cloneSession = openSession(); @@ -140,7 +140,7 @@ public class OfflineTest extends AbstractSyncingTest waitForOnline(cloneSession.getRepositoryInfo()); CDOTransaction transaction = cloneSession.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(company); transaction.commit(); @@ -184,7 +184,7 @@ public class OfflineTest extends AbstractSyncingTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(company); transaction.commit(); @@ -220,7 +220,7 @@ public class OfflineTest extends AbstractSyncingTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/master/resource"); + CDOResource resource = transaction.getResource(getResourcePath("/master/resource")); Company company = (Company)resource.getContents().get(0); assertEquals("MODIFICATION", company.getName()); @@ -253,7 +253,7 @@ public class OfflineTest extends AbstractSyncingTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.getResource("/master/resource"); + CDOResource resource = transaction.getResource(getResourcePath("/master/resource")); assertEquals(0, resource.getContents().size()); } @@ -271,7 +271,7 @@ public class OfflineTest extends AbstractSyncingTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(company); CDOCommitInfo commitInfo = transaction.commit(); @@ -286,7 +286,7 @@ public class OfflineTest extends AbstractSyncingTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(getModel1Factory().createCompany()); transaction.commit(); @@ -328,7 +328,7 @@ public class OfflineTest extends AbstractSyncingTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); resource.getContents().add(company); CDOCommitInfo commitInfo = transaction.commit(); @@ -352,7 +352,7 @@ public class OfflineTest extends AbstractSyncingTest CDOSession masterSession = openSession(clone.getName() + "_master"); CDOTransaction transaction = masterSession.openTransaction(); - CDOResource resource = transaction.createResource("/my/resource"); + CDOResource resource = transaction.createResource(getResourcePath("/my/resource")); for (int i = 0; i < 10; i++) { |