[270716] Provide support for branching

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

2 files changed, 15 insertions, 11 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsAllConfigs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsAllConfigs.java
index 54f8c0e035..6bebc67704 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsAllConfigs.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsAllConfigs.java
@@ -106,7 +106,7 @@ public abstract class AllTestsAllConfigs extends ConfigTestSuite
     testClasses.add(ChunkingWithMEMTest.class);
     testClasses.add(PackageRegistryTest.class);
     testClasses.add(MetaTest.class);
-    testClasses.add(RevisionDeltaTest.WithDeltaSupport.class);
+    testClasses.add(RevisionDeltaTest.class);
     testClasses.add(RevisionDeltaTest.WithoutDeltaSupport.class);
     testClasses.add(RevisionHolderTest.class);
     testClasses.add(IndexReconstructionTest.class);
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 30a2e1ee9f..18c4cf0ebb 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
@@ -13,12 +13,15 @@ package org.eclipse.emf.cdo.tests;
 
 import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
+import org.eclipse.emf.cdo.common.revision.CDORevisionUtil;
 import org.eclipse.emf.cdo.common.revision.delta.CDOAddFeatureDelta;
 import org.eclipse.emf.cdo.common.revision.delta.CDOClearFeatureDelta;
 import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
 import org.eclipse.emf.cdo.common.revision.delta.CDOSetFeatureDelta;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.internal.common.revision.delta.CDOListFeatureDeltaImpl;
+import org.eclipse.emf.cdo.internal.server.mem.MEMStore;
+import org.eclipse.emf.cdo.server.IStore;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
@@ -30,6 +33,8 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.util.CDOUtil;
 import org.eclipse.emf.cdo.view.CDOView;
 
+import org.eclipse.net4j.util.io.IOUtil;
+
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
@@ -42,9 +47,9 @@ import junit.framework.Assert;
  * @see bug 201266
  * @author Simon McDuff
  */
-public abstract class RevisionDeltaTest extends AbstractCDOTest
+public class RevisionDeltaTest extends AbstractCDOTest
 {
-  protected RevisionDeltaTest()
+  public RevisionDeltaTest()
   {
   }
 
@@ -215,6 +220,13 @@ public abstract class RevisionDeltaTest extends AbstractCDOTest
     resource.getContents().add(salesOrder);
     customer.getSalesOrders().add(salesOrder);
 
+    IStore store = getRepository().getStore();
+    if (store instanceof MEMStore)
+    {
+      MEMStore memStore = (MEMStore)store;
+      CDORevisionUtil.dumpAllRevisions(memStore.getAllRevisions(), IOUtil.OUT());
+    }
+
     transaction.commit();
     transaction.close();
     session.close();
@@ -508,14 +520,6 @@ public abstract class RevisionDeltaTest extends AbstractCDOTest
    * @see bug 201266
    * @author Simon McDuff
    */
-  public static class WithDeltaSupport extends RevisionDeltaTest
-  {
-  }
-
-  /**
-   * @see bug 201266
-   * @author Simon McDuff
-   */
   public static class WithoutDeltaSupport extends RevisionDeltaTest
   {
   }