ReattachModifyCommit

5 files changed, 56 insertions, 17 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AutoAttacherTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AutoAttacherTest.java
index 0d28e0efe1..272103f98b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AutoAttacherTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AutoAttacherTest.java
@@ -34,7 +34,7 @@ public class AutoAttacherTest extends AbstractCDOTest
     CDOSession session = openSession();
     CDOTransaction transaction = session.openTransaction();
     new CDOAutoAttacher(transaction);
-    CDOResource resource1 = transaction.getOrCreateResource("/test1");
+    CDOResource resource1 = transaction.getOrCreateResource(getResourcePath("/test1"));
     Product1 product = getModel1Factory().createProduct1();
     product.setName("product");
 
@@ -62,7 +62,7 @@ public class AutoAttacherTest extends AbstractCDOTest
     CDOSession session = openSession();
     CDOTransaction transaction = session.openTransaction();
     new CDOAutoAttacher(transaction);
-    CDOResource resource1 = transaction.getOrCreateResource("/test1");
+    CDOResource resource1 = transaction.getOrCreateResource(getResourcePath("/test1"));
 
     Supplier supplier = getModel1Factory().createSupplier();
     PurchaseOrder purchaseOrder = getModel1Factory().createPurchaseOrder();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverMergingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverMergingTest.java
index d02bcd67bb..b76709efbc 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverMergingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverMergingTest.java
@@ -32,14 +32,14 @@ public class ConflictResolverMergingTest extends ConflictResolverTest
     CDOSession session = openSession();
 
     CDOTransaction transaction1 = session.openTransaction();
-    EList<EObject> contents1 = transaction1.getOrCreateResource("/res1").getContents();
+    EList<EObject> contents1 = transaction1.getOrCreateResource(getResourcePath("/res1")).getContents();
 
     contents1.add(getModel1Factory().createAddress());
     transaction1.commit();
 
     CDOTransaction transaction2 = session.openTransaction();
     transaction2.options().addConflictResolver(createConflictResolver());
-    EList<EObject> contents2 = transaction2.getOrCreateResource("/res1").getContents();
+    EList<EObject> contents2 = transaction2.getOrCreateResource(getResourcePath("/res1")).getContents();
 
     // ----------------------------
     contents1.add(getModel1Factory().createAddress());
@@ -73,14 +73,14 @@ public class ConflictResolverMergingTest extends ConflictResolverTest
 
     CDOTransaction transaction1 = session.openTransaction();
     transaction1.options().addConflictResolver(createConflictResolver());
-    EList<EObject> contents1 = transaction1.getOrCreateResource("/res1").getContents();
+    EList<EObject> contents1 = transaction1.getOrCreateResource(getResourcePath("/res1")).getContents();
 
     contents1.add(getModel1Factory().createAddress());
     transaction1.commit();
 
     CDOTransaction transaction2 = session.openTransaction();
     transaction2.options().addConflictResolver(createConflictResolver());
-    EList<EObject> contents2 = transaction2.getOrCreateResource("/res1").getContents();
+    EList<EObject> contents2 = transaction2.getOrCreateResource(getResourcePath("/res1")).getContents();
 
     contents1.add(getModel1Factory().createAddress());
     contents2.add(getModel1Factory().createAddress());
@@ -104,7 +104,7 @@ public class ConflictResolverMergingTest extends ConflictResolverTest
 
     CDOTransaction transaction1 = session.openTransaction();
     transaction1.options().addConflictResolver(createConflictResolver());
-    EList<EObject> contents1 = transaction1.getOrCreateResource("/res1").getContents();
+    EList<EObject> contents1 = transaction1.getOrCreateResource(getResourcePath("/res1")).getContents();
 
     SalesOrder c1 = getModel1Factory().createSalesOrder();
     contents1.add(c1);
@@ -112,7 +112,7 @@ public class ConflictResolverMergingTest extends ConflictResolverTest
 
     CDOTransaction transaction2 = session.openTransaction();
     transaction2.options().addConflictResolver(createConflictResolver());
-    EList<EObject> contents2 = transaction2.getOrCreateResource("/res1").getContents();
+    EList<EObject> contents2 = transaction2.getOrCreateResource(getResourcePath("/res1")).getContents();
 
     SalesOrder c2 = (SalesOrder)contents2.get(0);
 
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 a45912d2ca..1969da57b8 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
@@ -763,7 +763,7 @@ public class InitialTest extends AbstractCDOTest
     CDOSession session = openSession();
     CDOTransaction transaction = session.openTransaction();
 
-    CDOResource resource1 = transaction.getOrCreateResource("/test1");
+    CDOResource resource1 = transaction.getOrCreateResource(getResourcePath("/test1"));
     // Resource resource1 = new XMIResourceImpl();
 
     Category cat1 = getModel1Factory().createCategory();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java
index 4599e9c8d4..a80bde7e07 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java
@@ -104,7 +104,7 @@ public class TransactionHandlerTest extends AbstractCDOTest
     OrderDetail orderDetail = getModel1Factory().createOrderDetail();
     order.getOrderDetails().add(orderDetail);
 
-    CDOResource resource = transaction.getOrCreateResource("/test1");
+    CDOResource resource = transaction.getOrCreateResource(getResourcePath("/test1"));
     transaction.addTransactionHandler(new CDODefaultTransactionHandler()
     {
       @Override
@@ -137,7 +137,7 @@ public class TransactionHandlerTest extends AbstractCDOTest
     CDOTransaction transaction = session.openTransaction();
     transaction.addTransactionHandler(handler);
 
-    CDOResource resource1 = transaction.getOrCreateResource("/test1");
+    CDOResource resource1 = transaction.getOrCreateResource(getResourcePath("/test1"));
     Order order = getModel1Factory().createPurchaseOrder();
     OrderDetail orderDetail = getModel1Factory().createOrderDetail();
     order.getOrderDetails().add(orderDetail);
@@ -174,7 +174,7 @@ public class TransactionHandlerTest extends AbstractCDOTest
     OrderDetail orderDetail = getModel1Factory().createOrderDetail();
     order.getOrderDetails().add(orderDetail);
 
-    CDOResource resource = transaction.getOrCreateResource("/test1");
+    CDOResource resource = transaction.getOrCreateResource(getResourcePath("/test1"));
     resource.getContents().add(order);
 
     try
@@ -200,7 +200,7 @@ public class TransactionHandlerTest extends AbstractCDOTest
     CDOTransaction transaction = session.openTransaction();
     transaction.addTransactionHandler(handler);
 
-    CDOResource resource1 = transaction.getOrCreateResource("/test1");
+    CDOResource resource1 = transaction.getOrCreateResource(getResourcePath("/test1"));
     Order order = getModel1Factory().createPurchaseOrder();
     OrderDetail orderDetail = getModel1Factory().createOrderDetail();
     order.getOrderDetails().add(orderDetail);
@@ -258,7 +258,7 @@ public class TransactionHandlerTest extends AbstractCDOTest
     OrderDetail orderDetail = getModel1Factory().createOrderDetail();
     order.getOrderDetails().add(orderDetail);
 
-    CDOResource resource = transaction.getOrCreateResource("/test1");
+    CDOResource resource = transaction.getOrCreateResource(getResourcePath("/test1"));
     resource.getContents().add(order);
 
     transaction.addTransactionHandler(new CDODefaultTransactionHandler()
@@ -309,7 +309,7 @@ public class TransactionHandlerTest extends AbstractCDOTest
     CDOTransaction transaction = session.openTransaction();
     transaction.addTransactionHandler(handler);
 
-    transaction.getOrCreateResource("/test1");
+    transaction.getOrCreateResource(getResourcePath("/test1"));
 
     transaction.rollback();
     assertEquals(1, handler.getNumberOfRollback());
@@ -328,7 +328,7 @@ public class TransactionHandlerTest extends AbstractCDOTest
     Order order = getModel1Factory().createPurchaseOrder();
     final Company company = getModel1Factory().createCompany();
 
-    final CDOResource resource = transaction.getOrCreateResource("/test1");
+    final CDOResource resource = transaction.getOrCreateResource(getResourcePath("/test1"));
     resource.getContents().add(company);
 
     transaction.addTransactionHandler(new CDOAsyncTransactionHandler(new CDOTransactionHandler()
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 71ed5d3673..1056a47bec 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
@@ -69,7 +69,7 @@ public class TransactionTest extends AbstractCDOTest
     assertEquals(false, session.isClosed());
 
     CDOTransaction transaction = session.openTransaction();
-    CDOResource resource = transaction.getOrCreateResource("/test1");
+    CDOResource resource = transaction.getOrCreateResource(getResourcePath("/test1"));
     resource.getContents().add(getModel1Factory().createCompany());
     assertEquals(true, LifecycleUtil.isActive(transaction));
     assertEquals(false, transaction.isClosed());
@@ -526,4 +526,43 @@ public class TransactionTest extends AbstractCDOTest
       ReflectUtil.setValue(field, null, 0L);
     }
   }
+
+  public void testReattachCommit() throws Exception
+  {
+    Company company = getModel1Factory().createCompany();
+
+    CDOSession session = openSession();
+    CDOTransaction transaction = session.openTransaction();
+    CDOResource resource = transaction.getOrCreateResource(getResourcePath("/test1"));
+    resource.getContents().add(company);
+    transaction.commit();
+
+    resource.getContents().remove(company);
+    resource.getContents().add(company);
+    transaction.commit();
+  }
+
+  public void testReattachModifyCommit() throws Exception
+  {
+    {
+      Company company = getModel1Factory().createCompany();
+
+      CDOSession session = openSession();
+      CDOTransaction transaction = session.openTransaction();
+      CDOResource resource = transaction.getOrCreateResource(getResourcePath("/test1"));
+      resource.getContents().add(company);
+      transaction.commit();
+
+      resource.getContents().remove(company);
+      resource.getContents().add(company);
+      company.setName("ESC");
+      transaction.commit();
+    }
+
+    CDOSession session2 = openSession();
+    CDOTransaction transaction2 = session2.openTransaction();
+    CDOResource resource2 = transaction2.getOrCreateResource(getResourcePath("/test1"));
+    Company company2 = (Company)resource2.getContents().get(0);
+    assertEquals("ESC", company2.getName());
+  }
 }