summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2011-07-12 05:48:50 (EDT)
committerCaspar De Groot2011-07-12 05:48:50 (EDT)
commitf037a09ffb92bf2c7eecb1daa6a43e83e53dcf75 (patch)
treeddc4e7a3291d824aee95bafa455286a81289d71c
parentbc853516cb90637835abf4386ce239cdab008563 (diff)
downloadcdo-f037a09ffb92bf2c7eecb1daa6a43e83e53dcf75.zip
cdo-f037a09ffb92bf2c7eecb1daa6a43e83e53dcf75.tar.gz
cdo-f037a09ffb92bf2c7eecb1daa6a43e83e53dcf75.tar.bz2
[349921] [DB4O] Create a test config using MEMDB4OStore
https://bugs.eclipse.org/bugs/show_bug.cgi?id=349921
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db4o/CDO AllTests (DB4O).launch1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db4o/CDO AllTests (MEMDB4O).launch2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsMEMDB4O.java17
3 files changed, 3 insertions, 17 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/CDO AllTests (DB4O).launch b/plugins/org.eclipse.emf.cdo.tests.db4o/CDO AllTests (DB4O).launch
index 68293da..cb9363c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db4o/CDO AllTests (DB4O).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db4o/CDO AllTests (DB4O).launch
@@ -12,4 +12,5 @@
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.db4o.AllTestsDB4O"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests.db4o"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=128m&#10;-Xmx1024m"/>
</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/CDO AllTests (MEMDB4O).launch b/plugins/org.eclipse.emf.cdo.tests.db4o/CDO AllTests (MEMDB4O).launch
index 49a9e7a..4b73ac3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db4o/CDO AllTests (MEMDB4O).launch
+++ b/plugins/org.eclipse.emf.cdo.tests.db4o/CDO AllTests (MEMDB4O).launch
@@ -12,5 +12,5 @@
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.db4o.AllTestsMEMDB4O"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests.db4o"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=128m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=128m&#10;-Xmx1024m"/>
</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsMEMDB4O.java b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsMEMDB4O.java
index 64ccdb2..732954b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsMEMDB4O.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsMEMDB4O.java
@@ -2,19 +2,14 @@ package org.eclipse.emf.cdo.tests.db4o;
import org.eclipse.emf.cdo.server.IRepository;
import org.eclipse.emf.cdo.server.IStore;
-import org.eclipse.emf.cdo.tests.AllConfigs;
-import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_261218_Test;
-import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_324585_Test;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig;
-import java.util.List;
import java.util.Map;
import junit.framework.Test;
import junit.framework.TestSuite;
-public class AllTestsMEMDB4O extends AllConfigs
+public class AllTestsMEMDB4O extends AllTestsDB4O
{
public static Test suite()
@@ -23,16 +18,6 @@ public class AllTestsMEMDB4O extends AllConfigs
}
@Override
- protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses)
- {
- super.initTestClasses(testClasses);
-
- // Skipped because takes too much
- testClasses.remove(Bugzilla_261218_Test.class);
- testClasses.remove(Bugzilla_324585_Test.class);
- }
-
- @Override
protected void initConfigSuites(TestSuite parent)
{
addScenario(parent, COMBINED, MemDB4ORepositoryConfig.INSTANCE, JVM, NATIVE);