[155508] Do not invalidate changed objects

https://bugs.eclipse.org/bugs/show_bug.cgi?id=155508

1 files changed, 83 insertions, 0 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/RollbackTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/RollbackTest.java
new file mode 100644
index 0000000000..bdbbc5cef9
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/RollbackTest.java
@@ -0,0 +1,83 @@
+/***************************************************************************
+ * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.tests.model1;
+
+
+import org.eclipse.emf.cdo.client.OptimisticControlException;
+
+import testmodel1.TreeNode;
+
+
+public class RollbackTest extends AbstractModel1Test
+{
+  public void testNoNotification() throws Exception
+  {
+    final String RESOURCE = "/test/res";
+    final String ROOT = "root";
+    final String NEW_ROOT1 = "new root 1";
+    final String NEW_ROOT2 = "new root 2";
+    final long TIME_LIMIT = 1000;
+
+    // Client1 creates resource
+    TreeNode root = createNode(ROOT);
+    saveRoot(root, RESOURCE);
+
+    // Client2 loads and modifies resource
+    TreeNode loaded = (TreeNode) loadRoot(RESOURCE);
+    loaded.setStringFeature(NEW_ROOT2);
+
+    // Client1 modifies and commits resource
+    root.setStringFeature(NEW_ROOT1);
+    root.eResource().save(null);
+
+    // Give server and client2 enough time to get notified
+    long start = System.currentTimeMillis();
+    while (System.currentTimeMillis() - start < TIME_LIMIT)
+    {
+      assertNode(NEW_ROOT2, loaded);
+      Thread.sleep(1);
+    }
+  }
+
+  public void testOptimisticControlException() throws Exception
+  {
+    final String RESOURCE = "/test/res";
+    final String ROOT = "root";
+    final String NEW_ROOT1 = "new root 1";
+    final String NEW_ROOT2 = "new root 2";
+
+    // Client1 creates resource
+    TreeNode root = createNode(ROOT);
+    saveRoot(root, RESOURCE);
+
+    // Client2 loads and modifies resource
+    TreeNode loaded = (TreeNode) loadRoot(RESOURCE);
+    loaded.setStringFeature(NEW_ROOT2);
+
+    // Client1 modifies and commits resource
+    root.setStringFeature(NEW_ROOT1);
+    root.eResource().save(null);
+
+    // Client2 commits resource
+    try
+    {
+      loaded.eResource().save(null);
+      fail("OptimisticControlException did not occur");
+    }
+    catch (OptimisticControlException ex)
+    {
+      ; // This is the expected case
+    }
+
+    // Verify that client2 is properly rolled back
+    assertNode(NEW_ROOT1, loaded);
+  }
+}