Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-07-21 05:36:09 +0000
committerEike Stepper2011-07-21 05:36:09 +0000
commit64cfda3a65168e961b20afaafc7b629261bce605 (patch)
tree46713cd6f781ad76638da81e5422b4da565c0f4c /plugins/org.eclipse.emf.cdo.tests.mongodb
parentaf719ba16912427971a462cf41f6245cde962ab6 (diff)
downloadcdo-64cfda3a65168e961b20afaafc7b629261bce605.tar.gz
cdo-64cfda3a65168e961b20afaafc7b629261bce605.tar.xz
cdo-64cfda3a65168e961b20afaafc7b629261bce605.zip
[352696] [Tests] Cleanup RepositoryConfigs
https://bugs.eclipse.org/bugs/show_bug.cgi?id=352696
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.mongodb')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/AllTestsMongoDB.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/MongoDBConfig.java (renamed from plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/MongoDBStoreRepositoryConfig.java)46
2 files changed, 10 insertions, 46 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/AllTestsMongoDB.java b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/AllTestsMongoDB.java
index 4b7d6b8fae..93e506a4a5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/AllTestsMongoDB.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/AllTestsMongoDB.java
@@ -11,8 +11,10 @@
*/
package org.eclipse.emf.cdo.tests.mongodb;
+import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation;
import org.eclipse.emf.cdo.tests.AllConfigs;
import org.eclipse.emf.cdo.tests.MEMStoreQueryTest;
+import org.eclipse.emf.cdo.tests.config.IScenario;
import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
import java.util.List;
@@ -33,16 +35,16 @@ public class AllTestsMongoDB extends AllConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, COMBINED, MongoDBStoreRepositoryConfig.INSTANCE, JVM, NATIVE);
- addScenario(parent, COMBINED, MongoDBStoreRepositoryConfig.AUDITING, JVM, NATIVE);
+ addScenario(parent, COMBINED, new MongoDBConfig(false, false, IDGenerationLocation.STORE), JVM, NATIVE);
+ addScenario(parent, COMBINED, new MongoDBConfig(true, false, IDGenerationLocation.STORE), JVM, NATIVE);
// addScenario(parent, COMBINED, MongoDBStoreRepositoryConfig.BRANCHING, JVM, NATIVE);
}
@Override
- protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
+ protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario)
{
testClasses.add(MongoDBInitialTest.class);
- super.initTestClasses(testClasses);
+ super.initTestClasses(testClasses, scenario);
testClasses.remove(MEMStoreQueryTest.class);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/MongoDBStoreRepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/MongoDBConfig.java
index 073300d861..c1d85751ee 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/MongoDBStoreRepositoryConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/MongoDBConfig.java
@@ -10,10 +10,8 @@
*/
package org.eclipse.emf.cdo.tests.mongodb;
-import org.eclipse.emf.cdo.server.CDOServerBrowser;
-import org.eclipse.emf.cdo.server.IRepository;
+import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation;
import org.eclipse.emf.cdo.server.IStore;
-import org.eclipse.emf.cdo.server.internal.mongodb.MongoDBStore;
import org.eclipse.emf.cdo.server.mongodb.CDOMongoDBUtil;
import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig;
@@ -24,53 +22,25 @@ import com.mongodb.DB;
import com.mongodb.Mongo;
import com.mongodb.MongoURI;
-import java.util.Map;
-
/**
* @author Eike Stepper
*/
-public class MongoDBStoreRepositoryConfig extends RepositoryConfig
+public class MongoDBConfig extends RepositoryConfig
{
- public static final MongoDBStoreRepositoryConfig INSTANCE = new MongoDBStoreRepositoryConfig(false, false);
-
- public static final MongoDBStoreRepositoryConfig AUDITING = new MongoDBStoreRepositoryConfig(true, false);
-
- public static final MongoDBStoreRepositoryConfig BRANCHING = new MongoDBStoreRepositoryConfig(true, true);
-
private static final long serialVersionUID = 1L;
- private boolean auditing;
-
- private boolean branching;
-
- private transient CDOServerBrowser mongoBrowser;
-
- public MongoDBStoreRepositoryConfig(boolean auditing, boolean branching)
+ public MongoDBConfig(boolean supportingAudits, boolean supportingBranches, IDGenerationLocation idGenerationLocation)
{
- super("MongoDBStore" + (branching ? " (branching)" : auditing ? " (auditing)" : ""));
- this.auditing = auditing;
- this.branching = branching;
+ super("MongoDB", supportingAudits, supportingBranches, idGenerationLocation);
}
@Override
public void setUp() throws Exception
{
CDOMongoDBUtil.prepareContainer(IPluginContainer.INSTANCE);
-
- mongoBrowser = new CDOServerBrowser(MongoDBStore.REPOS);
- mongoBrowser.setPort(7778);
- mongoBrowser.activate();
-
super.setUp();
}
- @Override
- public void tearDown() throws Exception
- {
- mongoBrowser.deactivate();
- super.tearDown();
- }
-
public IStore createStore(String repoName)
{
MongoURI mongoURI = new MongoURI("mongodb://localhost");
@@ -107,12 +77,4 @@ public class MongoDBStoreRepositoryConfig extends RepositoryConfig
}
}
}
-
- @Override
- protected void initRepositoryProperties(Map<String, String> props)
- {
- super.initRepositoryProperties(props);
- props.put(IRepository.Props.SUPPORTING_AUDITS, Boolean.toString(auditing));
- props.put(IRepository.Props.SUPPORTING_BRANCHES, Boolean.toString(branching));
- }
}

Back to the top