[352696] [Tests] Cleanup RepositoryConfigs

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

6 files changed, 22 insertions, 213 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java
index c0d0e3ddf4..71cea12a9c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java
@@ -11,12 +11,6 @@
  */
 package org.eclipse.emf.cdo.tests.objectivity;
 
-import org.eclipse.emf.cdo.server.IRepository;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
-
-import java.util.List;
-import java.util.Map;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -33,48 +27,6 @@ public class AllTestsObjyAudit extends ObjyDBConfigs
   @Override
   protected void initConfigSuites(TestSuite parent)
   {
-    ObjyStoreRepositoryConfig repoConfig = ObjyAuditConfig.INSTANCE;
-    addScenario(parent, COMBINED, repoConfig, JVM, NATIVE);
-  }
-
-  @Override
-  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
-  {
-    super.initTestClasses(testClasses);
-  }
-
-  @Override
-  protected boolean hasAuditSupport()
-  {
-    return true;
-  }
-
-  @Override
-  protected boolean hasBranchingSupport()
-  {
-    return false;
-  }
-
-  public static class ObjyAuditConfig extends ObjyStoreRepositoryConfig
-  {
-    private static final long serialVersionUID = 1L;
-
-    public static final AllTestsObjyAudit.ObjyAuditConfig INSTANCE = new ObjyAuditConfig("ObjectivityStore: (audit)"); //$NON-NLS-1$
-
-    public ObjyAuditConfig(String name)
-    {
-      super(name);
-
-      org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM.DEBUG.setEnabled(true);
-      org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM.INFO.setEnabled(true);
-    }
-
-    @Override
-    protected void initRepositoryProperties(Map<String, String> props)
-    {
-      super.initRepositoryProperties(props);
-      props.put(IRepository.Props.SUPPORTING_AUDITS, "true"); //$NON-NLS-1$
-      props.put(IRepository.Props.SUPPORTING_BRANCHES, "false"); //$NON-NLS-1$
-    }
+    addScenario(parent, COMBINED, new ObjyConfig(true, false), JVM, NATIVE);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java
index 17d8d5444b..663f213210 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java
@@ -11,12 +11,6 @@
  */
 package org.eclipse.emf.cdo.tests.objectivity;
 
-import org.eclipse.emf.cdo.server.IRepository;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
-
-import java.util.List;
-import java.util.Map;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -33,54 +27,6 @@ public class AllTestsObjyBranching extends ObjyDBConfigs
   @Override
   protected void initConfigSuites(TestSuite parent)
   {
-    ObjyStoreRepositoryConfig repoConfig = ObjyBranchingConfig.INSTANCE;
-    addScenario(parent, COMBINED, repoConfig, JVM, NATIVE);
-  }
-
-  @Override
-  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
-  {
-    super.initTestClasses(testClasses);
-
-    // // add branching tests for this testsuite
-    // testClasses.add(BranchingTest.class);
-    // testClasses.add(BranchingSameSessionTest.class);
-    // testClasses.add(MergingTest.class);
-  }
-
-  @Override
-  protected boolean hasAuditSupport()
-  {
-    return true;
-  }
-
-  @Override
-  protected boolean hasBranchingSupport()
-  {
-    return true;
-  }
-
-  public static class ObjyBranchingConfig extends ObjyStoreRepositoryConfig
-  {
-    private static final long serialVersionUID = 1L;
-
-    public static final AllTestsObjyBranching.ObjyBranchingConfig INSTANCE = new ObjyBranchingConfig(
-        "ObjectivityStore: (branching)"); //$NON-NLS-1$
-
-    public ObjyBranchingConfig(String name)
-    {
-      super(name);
-
-      org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM.DEBUG.setEnabled(true);
-      org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM.INFO.setEnabled(true);
-    }
-
-    @Override
-    protected void initRepositoryProperties(Map<String, String> props)
-    {
-      super.initRepositoryProperties(props);
-      props.put(IRepository.Props.SUPPORTING_AUDITS, "true"); //$NON-NLS-1$
-      props.put(IRepository.Props.SUPPORTING_BRANCHES, "true"); //$NON-NLS-1$
-    }
+    addScenario(parent, COMBINED, new ObjyConfig(true, true), JVM, NATIVE);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
index 267231a0c8..b4a7d72e79 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
@@ -11,12 +11,11 @@
  */
 package org.eclipse.emf.cdo.tests.objectivity;
 
-import org.eclipse.emf.cdo.server.IRepository;
 import org.eclipse.emf.cdo.tests.ExternalReferenceTest;
+import org.eclipse.emf.cdo.tests.config.IScenario;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
 
 import java.util.List;
-import java.util.Map;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -34,51 +33,14 @@ public class AllTestsObjyNonAudit extends ObjyDBConfigs
   @Override
   protected void initConfigSuites(TestSuite parent)
   {
-    // ObjyStoreRepositoryConfig repoConfig = ObjyNonAuditConfig.INSTANCE;
-    ObjyStoreRepositoryConfig repoConfig = new ObjyNonAuditConfig("ObjectivityStore: (non-audit)"); //$NON-NLS-1$
-    addScenario(parent, COMBINED, repoConfig, JVM, NATIVE);
+    addScenario(parent, COMBINED, new ObjyConfig(false, false), JVM, NATIVE);
   }
 
   @Override
-  protected boolean hasAuditSupport()
+  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario)
   {
-    return false;
-  }
-
-  @Override
-  protected boolean hasBranchingSupport()
-  {
-    return false;
-  }
-
-  public static class ObjyNonAuditConfig extends ObjyStoreRepositoryConfig
-  {
-    private static final long serialVersionUID = 1L;
+    super.initTestClasses(testClasses, scenario);
 
-    public static final AllTestsObjyNonAudit.ObjyNonAuditConfig INSTANCE = new ObjyNonAuditConfig(
-        "ObjectivityStore: (non-audit)"); //$NON-NLS-1$
-
-    public ObjyNonAuditConfig(String name)
-    {
-      super(name);
-
-      org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM.DEBUG.setEnabled(true);
-      org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM.INFO.setEnabled(true);
-    }
-
-    @Override
-    protected void initRepositoryProperties(Map<String, String> props)
-    {
-      super.initRepositoryProperties(props);
-      props.put(IRepository.Props.SUPPORTING_AUDITS, "false"); //$NON-NLS-1$
-      props.put(IRepository.Props.SUPPORTING_BRANCHES, "false"); //$NON-NLS-1$
-    }
-  }
-
-  @Override
-  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
-  {
-    super.initTestClasses(testClasses);
     // There is a problem with the root resource sharing, so for now we're commenting
     // out ExternalReferenceTest and Bugzilla_259869_Test
     testClasses.remove(ExternalReferenceTest.class);
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyStoreRepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyConfig.java
index e81eee762f..4374296897 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyStoreRepositoryConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyConfig.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.emf.cdo.tests.objectivity;
 
+import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation;
 import org.eclipse.emf.cdo.server.IStore;
 import org.eclipse.emf.cdo.server.internal.objectivity.ObjectivityStoreConfig;
 import org.eclipse.emf.cdo.server.objectivity.ObjyStoreUtil;
@@ -18,25 +19,18 @@ import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig;
 /**
  * @author Eike Stepper
  */
-public abstract class ObjyStoreRepositoryConfig extends RepositoryConfig
+public class ObjyConfig extends RepositoryConfig
 {
   private static final long serialVersionUID = 1L;
 
   private static ObjectivityStoreConfig storeConfig = new ObjectivityStoreConfig();
 
-  public ObjyStoreRepositoryConfig(String name)
+  public ObjyConfig(boolean supportingAudits, boolean supportingBranches)
   {
-    super(name);
-  }
+    super("Objy", supportingAudits, supportingBranches, IDGenerationLocation.STORE);
 
-  @Override
-  public void setUp() throws Exception
-  {
-    // System.out.println("ObjyStoreRepositry.setup() - STARTED");
-    // long sTime = System.currentTimeMillis();
-    super.setUp();
-    // long eTime = System.currentTimeMillis();
-    // System.out.println("ObjyStoreRepositry.setup() time: " + (eTime - sTime));
+    org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM.DEBUG.setEnabled(true);
+    org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM.INFO.setEnabled(true);
   }
 
   @Override
@@ -53,5 +47,4 @@ public abstract class ObjyStoreRepositoryConfig extends RepositoryConfig
     System.out.println("************* ObjyStore creation ****************\n");
     return ObjyStoreUtil.createStore(storeConfig);
   }
-
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyDBConfigs.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyDBConfigs.java
index a42a12f281..80baf9e8e3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyDBConfigs.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyDBConfigs.java
@@ -11,14 +11,15 @@
 package org.eclipse.emf.cdo.tests.objectivity;
 
 import org.eclipse.emf.cdo.tests.AllConfigs;
-import org.eclipse.emf.cdo.tests.AuditTest;
 import org.eclipse.emf.cdo.tests.AuditSameSessionTest;
-import org.eclipse.emf.cdo.tests.BranchingTest;
+import org.eclipse.emf.cdo.tests.AuditTest;
 import org.eclipse.emf.cdo.tests.BranchingSameSessionTest;
+import org.eclipse.emf.cdo.tests.BranchingTest;
 import org.eclipse.emf.cdo.tests.MergingTest;
 import org.eclipse.emf.cdo.tests.XATransactionTest;
 import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_252214_Test;
 import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_303807_Test;
+import org.eclipse.emf.cdo.tests.config.IScenario;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
 
 import java.util.List;
@@ -29,13 +30,13 @@ import java.util.List;
 public abstract class ObjyDBConfigs extends AllConfigs
 {
   @Override
-  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
+  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario)
   {
-    super.initTestClasses(testClasses);
+    super.initTestClasses(testClasses, scenario);
 
     // remove BranchingTests because most mappings do not support it
     // Subclasses should add Banching tests if supported
-    if (!hasBranchingSupport())
+    if (!scenario.getRepositoryConfig().isSupportingBranches())
     {
       testClasses.remove(BranchingTest.class);
       testClasses.remove(BranchingSameSessionTest.class);
@@ -43,7 +44,7 @@ public abstract class ObjyDBConfigs extends AllConfigs
       testClasses.remove(Bugzilla_303807_Test.class);
     }
 
-    if (!hasAuditSupport())
+    if (!scenario.getRepositoryConfig().isSupportingAudits())
     {
       // non-audit mode - remove audit tests
       testClasses.remove(AuditTest.class);
@@ -58,8 +59,4 @@ public abstract class ObjyDBConfigs extends AllConfigs
     // sometime cause a crash (Investigate!!)
     testClasses.remove(XATransactionTest.class);
   }
-
-  protected abstract boolean hasBranchingSupport();
-
-  protected abstract boolean hasAuditSupport();
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java
index b20c050404..8b39b361a4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java
@@ -10,7 +10,6 @@
  */
 package org.eclipse.emf.cdo.tests.objectivity;
 
-import org.eclipse.emf.cdo.server.IRepository;
 import org.eclipse.emf.cdo.tests.BranchingWithCacheClearTest;
 import org.eclipse.emf.cdo.tests.InitialTest;
 import org.eclipse.emf.cdo.tests.MergingTest;
@@ -19,10 +18,10 @@ import org.eclipse.emf.cdo.tests.RevisionDeltaCascadingBranchesTest;
 import org.eclipse.emf.cdo.tests.RevisionDeltaInBranchTest;
 import org.eclipse.emf.cdo.tests.UnsetTest;
 import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_261218_Test;
+import org.eclipse.emf.cdo.tests.config.IScenario;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
 
 import java.util.List;
-import java.util.Map;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -40,16 +39,12 @@ public class SampleTestsObjy extends ObjyDBConfigs
   @Override
   protected void initConfigSuites(TestSuite parent)
   {
-    ObjyStoreRepositoryConfig repConfig = ObjySampleConfig.INSTANCE;
-    addScenario(parent, COMBINED, repConfig, JVM, NATIVE);
+    addScenario(parent, COMBINED, new ObjyConfig(false, false), JVM, NATIVE);
   }
 
   @Override
-  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
+  protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario)
   {
-    // super.initTestClasses(testClasses);
-    // testClasses.remove(XATransactionTest.class);
-
     testClasses.clear();
 
     // testClasses.add(ComplexTest.class);
@@ -110,40 +105,4 @@ public class SampleTestsObjy extends ObjyDBConfigs
     // testClasses.add(Bugzilla_259949_Test.class);
     testClasses.add(Bugzilla_261218_Test.class);
   }
-
-  @Override
-  protected boolean hasBranchingSupport()
-  {
-    return true;
-  }
-
-  @Override
-  protected boolean hasAuditSupport()
-  {
-    return true;
-  }
-
-  public static class ObjySampleConfig extends ObjyStoreRepositoryConfig
-  {
-    private static final long serialVersionUID = 1L;
-
-    public static final SampleTestsObjy.ObjySampleConfig INSTANCE = new ObjySampleConfig("ObjectivityStore: (sample)"); //$NON-NLS-1$
-
-    public ObjySampleConfig(String name)
-    {
-      super(name);
-
-      org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM.DEBUG.setEnabled(true);
-      org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM.INFO.setEnabled(true);
-    }
-
-    @Override
-    protected void initRepositoryProperties(Map<String, String> props)
-    {
-      super.initRepositoryProperties(props);
-      props.put(IRepository.Props.SUPPORTING_AUDITS, "true");
-      props.put(IRepository.Props.SUPPORTING_BRANCHES, "true");
-    }
-  }
-
 }