1 files changed, 26 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
index a90c7d7961..890dc4daa7 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.cdo.tests.db;
 
 import org.eclipse.emf.cdo.server.IRepository;
-import org.eclipse.emf.cdo.server.db.CDODBUtil;
 import org.eclipse.emf.cdo.server.db.mapping.IMappingStrategy;
 import org.eclipse.emf.cdo.tests.BranchingTest;
 import org.eclipse.emf.cdo.tests.BranchingTestSameSession;
@@ -52,7 +51,8 @@ public class AllTestsDBH2Branching extends DBConfigs
   @Override
   protected void initConfigSuites(TestSuite parent)
   {
-    addScenario(parent, COMBINED, H2Branching.ReusableFolder.INSTANCE, JVM, NATIVE);
+    // addScenario(parent, COMBINED, H2Branching.ReusableFolder.INSTANCE, JVM, NATIVE);
+    addScenario(parent, COMBINED, H2Branching.ReusableFolder.RANGE_INSTANCE, JVM, NATIVE);
   }
 
   @Override
@@ -85,13 +85,17 @@ public class AllTestsDBH2Branching extends DBConfigs
   {
     private static final long serialVersionUID = 1L;
 
-    public static final H2Branching INSTANCE = new H2Branching("DBStore: H2 (branching)");
+    public static final H2Branching INSTANCE = new H2Branching("DBStore: H2 (branching)",
+        "org.eclipse.emf.cdo.server.internal.db.mapping.horizontal.HorizontalBranchingMappingStrategy");
 
     protected transient File dbFolder;
 
-    public H2Branching(String name)
+    private String mappingStrategy;
+
+    public H2Branching(String name, String mappingStrategy)
     {
       super(name);
+      this.mappingStrategy = mappingStrategy;
     }
 
     @Override
@@ -102,10 +106,19 @@ public class AllTestsDBH2Branching extends DBConfigs
       props.put(IRepository.Props.SUPPORTING_BRANCHES, "true");
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     protected IMappingStrategy createMappingStrategy()
     {
-      return CDODBUtil.createHorizontalMappingStrategy(true, true);
+      try
+      {
+        Class<IMappingStrategy> clazz = (Class<IMappingStrategy>)Class.forName(mappingStrategy);
+        return clazz.newInstance();
+      }
+      catch (Exception ex)
+      {
+        throw WrappedException.wrap(ex);
+      }
     }
 
     @Override
@@ -145,7 +158,12 @@ public class AllTestsDBH2Branching extends DBConfigs
     {
       private static final long serialVersionUID = 1L;
 
-      public static final ReusableFolder INSTANCE = new ReusableFolder("DBStore: H2 (branching)");
+      public static final ReusableFolder INSTANCE = new ReusableFolder("DBStore: H2 (branching)",
+          "org.eclipse.emf.cdo.server.internal.db.mapping.horizontal.HorizontalBranchingMappingStrategy");
+
+      public static final ReusableFolder RANGE_INSTANCE = new ReusableFolder(
+          "DBStore: H2 (Reusable Folder, branching, range-based mapping strategy)",
+          "org.eclipse.emf.cdo.server.internal.db.mapping.horizontal.HorizontalBranchingMappingStrategyWithRanges");
 
       private static File reusableFolder;
 
@@ -153,9 +171,9 @@ public class AllTestsDBH2Branching extends DBConfigs
 
       private transient ArrayList<String> repoNames = new ArrayList<String>();
 
-      public ReusableFolder(String name)
+      public ReusableFolder(String name, String mappingStrategy)
       {
-        super(name);
+        super(name, mappingStrategy);
       }
 
       @Override