[247817] Develop configurable test bed

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

6 files changed, 17 insertions, 75 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbCDOAutomaticPackageRefTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbCDOAutomaticPackageRefTest.java
index 1a7a41b3ed..cc537c682d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbCDOAutomaticPackageRefTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbCDOAutomaticPackageRefTest.java
@@ -1,12 +1,10 @@
 package org.eclipse.emf.cdo.tests.hibernate;
 
 import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.CDOSessionConfiguration;
 import org.eclipse.emf.cdo.CDOTransaction;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
 import org.eclipse.emf.cdo.tests.StoreRepositoryProvider;
-import org.eclipse.emf.cdo.util.CDOUtil;
 
 import base.BaseFactory;
 import base.BasePackage;
@@ -24,21 +22,11 @@ public class HbCDOAutomaticPackageRefTest extends AbstractCDOTest
     StoreRepositoryProvider.setInstance(HbStoreRepositoryProvider.getInstance());
   }
 
-  @Override
-  protected CDOSession openSession()
-  {
-    CDOSessionConfiguration configuration = CDOUtil.createSessionConfiguration();
-    configuration.setConnector(getConnector());
-    configuration.setRepositoryName(REPOSITORY_NAME);
-    configuration.setLazyPackageRegistry();
-    return configuration.openSession();
-  }
-
   public void testPutPackage() throws Exception
   {
     try
     {
-      CDOSession session = openSession();
+      CDOSession session = openLazySession();
       session.getPackageRegistry().putEPackage(InterfacePackage.eINSTANCE);
       session.getPackageRegistry().putEPackage(ReferencePackage.eINSTANCE);
 
@@ -58,7 +46,7 @@ public class HbCDOAutomaticPackageRefTest extends AbstractCDOTest
   {
     try
     {
-      CDOSession session = openSession();
+      CDOSession session = openLazySession();
       session.getPackageRegistry().putEPackage(InterfacePackage.eINSTANCE);
       session.getPackageRegistry().putEPackage(ReferencePackage.eINSTANCE);
 
@@ -79,7 +67,7 @@ public class HbCDOAutomaticPackageRefTest extends AbstractCDOTest
   {
     try
     {
-      CDOSession session = openSession();
+      CDOSession session = openLazySession();
       session.getPackageRegistry().putEPackage(InterfacePackage.eINSTANCE);
       session.getPackageRegistry().putEPackage(ReferencePackage.eINSTANCE);
 
@@ -99,7 +87,7 @@ public class HbCDOAutomaticPackageRefTest extends AbstractCDOTest
   {
     try
     {
-      CDOSession session = openSession();
+      CDOSession session = openLazySession();
       session.getPackageRegistry().putEPackage(InterfacePackage.eINSTANCE);
       session.getPackageRegistry().putEPackage(ReferencePackage.eINSTANCE);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbCDOPackageRefTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbCDOPackageRefTest.java
index c2567de338..bfe54a1709 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbCDOPackageRefTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbCDOPackageRefTest.java
@@ -1,12 +1,10 @@
 package org.eclipse.emf.cdo.tests.hibernate;
 
 import org.eclipse.emf.cdo.CDOSession;
-import org.eclipse.emf.cdo.CDOSessionConfiguration;
 import org.eclipse.emf.cdo.CDOTransaction;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
 import org.eclipse.emf.cdo.tests.StoreRepositoryProvider;
-import org.eclipse.emf.cdo.util.CDOUtil;
 
 import reference.ReferenceFactory;
 import reference.ReferencePackage;
@@ -21,21 +19,11 @@ public class HbCDOPackageRefTest extends AbstractCDOTest
     StoreRepositoryProvider.setInstance(HbStoreRepositoryProvider.getInstance());
   }
 
-  @Override
-  protected CDOSession openSession()
-  {
-    CDOSessionConfiguration configuration = CDOUtil.createSessionConfiguration();
-    configuration.setConnector(getConnector());
-    configuration.setRepositoryName(REPOSITORY_NAME);
-    configuration.setLazyPackageRegistry();
-    return configuration.openSession();
-  }
-
   public void testOnlyReference() throws Exception
   {
     try
     {
-      CDOSession session = openSession();
+      CDOSession session = openLazySession();
       session.getPackageRegistry().putEPackage(InterfacePackage.eINSTANCE);
       session.getPackageRegistry().putEPackage(ReferencePackage.eINSTANCE);
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbPackageRegistryTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbPackageRegistryTest.java
index 592b5e7645..75552d1fc5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbPackageRegistryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbPackageRegistryTest.java
@@ -14,7 +14,6 @@ package org.eclipse.emf.cdo.tests.hibernate;
 import org.eclipse.emf.cdo.tests.PackageRegistryTest;
 import org.eclipse.emf.cdo.tests.StoreRepositoryProvider;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -31,15 +30,15 @@ public class HbPackageRegistryTest extends PackageRegistryTest
     StoreRepositoryProvider.setInstance(HbStoreRepositoryProvider.getInstance());
   }
 
-  // allows a testcase to pass specific properties
   @Override
-  protected Map<String, String> getTestProperties()
+  public Map<String, Object> getTestProperties()
   {
-    final Map<String, String> testProperties = new HashMap<String, String>();
+    Map<String, Object> testProperties = super.getTestProperties();
     if (getHbm2ddlValue() != null)
     {
       testProperties.put("hibernate.hbm2ddl.auto", getHbm2ddlValue());
     }
+
     return testProperties;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbResourceTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbResourceTest.java
index 71b305bee0..8136be135c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbResourceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbResourceTest.java
@@ -14,7 +14,6 @@ package org.eclipse.emf.cdo.tests.hibernate;
 import org.eclipse.emf.cdo.tests.ResourceTest;
 import org.eclipse.emf.cdo.tests.StoreRepositoryProvider;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -27,11 +26,10 @@ public class HbResourceTest extends ResourceTest
     StoreRepositoryProvider.setInstance(HbStoreRepositoryProvider.getInstance());
   }
 
-  // allows a testcase to pass specific properties
   @Override
-  protected Map<String, String> getTestProperties()
+  public Map<String, Object> getTestProperties()
   {
-    final Map<String, String> testProperties = new HashMap<String, String>();
+    Map<String, Object> testProperties = super.getTestProperties();
     testProperties.put("hibernate.hbm2ddl.auto", "update");
     return testProperties;
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbRevisionDeltaTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbRevisionDeltaTest.java
index 44d3ee0f18..9ef60f5b84 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbRevisionDeltaTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbRevisionDeltaTest.java
@@ -11,12 +11,8 @@
  **************************************************************************/
 package org.eclipse.emf.cdo.tests.hibernate;
 
-import org.eclipse.emf.cdo.internal.server.Repository;
-import org.eclipse.emf.cdo.internal.server.RevisionManager;
-import org.eclipse.emf.cdo.server.IRepository;
-import org.eclipse.emf.cdo.server.IStore;
 import org.eclipse.emf.cdo.tests.RevisionDeltaWithoutDeltaSupportTest;
-import org.eclipse.emf.cdo.tests.StoreRepositoryProvider;
+import org.eclipse.emf.cdo.tests.config.RepositoryConfig;
 
 import java.util.Map;
 
@@ -27,36 +23,11 @@ import java.util.Map;
  */
 public class HbRevisionDeltaTest extends RevisionDeltaWithoutDeltaSupportTest
 {
-  public HbRevisionDeltaTest()
-  {
-    StoreRepositoryProvider.setInstance(LocalHbStoreRepositoryProvider.getInstance());
-  }
-
   @Override
-  protected Repository createRepository()
+  public Map<String, Object> getTestProperties()
   {
-    LocalHbStoreRepositoryProvider provider = new LocalHbStoreRepositoryProvider();
-    return (Repository)provider.createRepository(REPOSITORY_NAME, getTestProperties());
-  }
-
-  private class LocalHbStoreRepositoryProvider extends HbStoreRepositoryProvider
-  {
-    @Override
-    protected IRepository createRepository(String name, IStore store, Map<String, String> props)
-    {
-      Repository repository = new Repository()
-      {
-        @Override
-        protected RevisionManager createRevisionManager()
-        {
-          return new TestRevisionManager(this);
-        }
-      };
-
-      repository.setName(name);
-      repository.setProperties(props);
-      repository.setStore(store);
-      return repository;
-    }
+    Map<String, Object> testProperties = super.getTestProperties();
+    testProperties.put(RepositoryConfig.PROP_TEST_REVISION_MANAGER, new TestRevisionManager());
+    return testProperties;
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbTransactionDeadLockTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbTransactionDeadLockTest.java
index 7eb4af7f77..c02ac32dd0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbTransactionDeadLockTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HbTransactionDeadLockTest.java
@@ -14,7 +14,6 @@ package org.eclipse.emf.cdo.tests.hibernate;
 import org.eclipse.emf.cdo.tests.StoreRepositoryProvider;
 import org.eclipse.emf.cdo.tests.TransactionDeadLockTest;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -35,11 +34,10 @@ public class HbTransactionDeadLockTest extends TransactionDeadLockTest
     StoreRepositoryProvider.setInstance(HbStoreRepositoryProvider.getInstance());
   }
 
-  // allows a testcase to pass specific properties
   @Override
-  protected Map<String, String> getTestProperties()
+  public Map<String, Object> getTestProperties()
   {
-    final Map<String, String> testProperties = new HashMap<String, String>();
+    Map<String, Object> testProperties = super.getTestProperties();
     testProperties.put("hibernate.hbm2ddl.auto", "update");
     return testProperties;
   }