[351078] [DB] Support raw replication in HorizontalBranchingMappingStrategyWithRanges

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

3 files changed, 17 insertions, 8 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IScenario.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IScenario.java
index 6ed0118a5c..f449aae8b0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IScenario.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IScenario.java
@@ -20,19 +20,19 @@ public interface IScenario extends ITestLifecycle, Serializable
 {
   public IContainerConfig getContainerConfig();
 
-  public void setContainerConfig(IContainerConfig containerConfig);
+  public IScenario setContainerConfig(IContainerConfig containerConfig);
 
   public IRepositoryConfig getRepositoryConfig();
 
-  public void setRepositoryConfig(IRepositoryConfig repositoryConfig);
+  public IScenario setRepositoryConfig(IRepositoryConfig repositoryConfig);
 
   public ISessionConfig getSessionConfig();
 
-  public void setSessionConfig(ISessionConfig sessionConfig);
+  public IScenario setSessionConfig(ISessionConfig sessionConfig);
 
   public IModelConfig getModelConfig();
 
-  public void setModelConfig(IModelConfig modelConfig);
+  public IScenario setModelConfig(IModelConfig modelConfig);
 
   public Set<IConfig> getConfigs();
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
index afcc65ac4c..d88da01de1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
@@ -626,6 +626,7 @@ public abstract class ConfigTest extends AbstractOMTest implements IConstants
   protected IScenario getDefaultScenario()
   {
     IScenario scenario;
+
     try
     {
       scenario = Scenario.load();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/Scenario.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/Scenario.java
index 03d2d3780c..84c479e4f1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/Scenario.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/Scenario.java
@@ -70,7 +70,7 @@ public class Scenario implements IScenario
     return containerConfig;
   }
 
-  public void setContainerConfig(IContainerConfig containerConfig)
+  public Scenario setContainerConfig(IContainerConfig containerConfig)
   {
     configs = null;
     this.containerConfig = containerConfig;
@@ -78,6 +78,8 @@ public class Scenario implements IScenario
     {
       containerConfig.setCurrentTest(currentTest);
     }
+
+    return this;
   }
 
   public IRepositoryConfig getRepositoryConfig()
@@ -85,7 +87,7 @@ public class Scenario implements IScenario
     return repositoryConfig;
   }
 
-  public void setRepositoryConfig(IRepositoryConfig repositoryConfig)
+  public Scenario setRepositoryConfig(IRepositoryConfig repositoryConfig)
   {
     configs = null;
     this.repositoryConfig = repositoryConfig;
@@ -93,6 +95,8 @@ public class Scenario implements IScenario
     {
       repositoryConfig.setCurrentTest(currentTest);
     }
+
+    return this;
   }
 
   public ISessionConfig getSessionConfig()
@@ -100,7 +104,7 @@ public class Scenario implements IScenario
     return sessionConfig;
   }
 
-  public void setSessionConfig(ISessionConfig sessionConfig)
+  public Scenario setSessionConfig(ISessionConfig sessionConfig)
   {
     configs = null;
     this.sessionConfig = sessionConfig;
@@ -108,6 +112,8 @@ public class Scenario implements IScenario
     {
       sessionConfig.setCurrentTest(currentTest);
     }
+
+    return this;
   }
 
   public IModelConfig getModelConfig()
@@ -115,7 +121,7 @@ public class Scenario implements IScenario
     return modelConfig;
   }
 
-  public void setModelConfig(IModelConfig modelConfig)
+  public Scenario setModelConfig(IModelConfig modelConfig)
   {
     configs = null;
     this.modelConfig = modelConfig;
@@ -123,6 +129,8 @@ public class Scenario implements IScenario
     {
       modelConfig.setCurrentTest(currentTest);
     }
+
+    return this;
   }
 
   @Override