Skip to main content

This CGIT instance is deprecated, and repositories have been moved to Gitlab or Github. See the repository descriptions for specific locations.

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-03-10 08:05:02 +0000
committerEike Stepper2010-03-10 08:05:02 +0000
commit320eb4a99e8dc35481aa481b0a7472b41730fe71 (patch)
treef3b938b3ec654663c3a8e6a6357388fc0277cc09 /plugins/org.eclipse.emf.cdo.tests.db
parent812b581109175231a84da65c87c0b745cf2e94d3 (diff)
downloadcdo-320eb4a99e8dc35481aa481b0a7472b41730fe71.tar.gz
cdo-320eb4a99e8dc35481aa481b0a7472b41730fe71.tar.xz
cdo-320eb4a99e8dc35481aa481b0a7472b41730fe71.zip
[304468] [DB] EEnum save in h2 db throws ClassCastException
https://bugs.eclipse.org/bugs/show_bug.cgi?id=304468
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.db')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
index 49fbddc579..fb46266072 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.server.db.CDODBUtil;
import org.eclipse.emf.cdo.server.db.mapping.IMappingStrategy;
import org.eclipse.emf.cdo.tests.BranchingTest;
import org.eclipse.emf.cdo.tests.BranchingTestSameSession;
+import org.eclipse.emf.cdo.tests.MergingTest;
import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
import org.eclipse.net4j.db.DBUtil;
@@ -60,6 +61,7 @@ public class AllTestsDBH2Branching extends DBConfigs
// add branching tests for this testsuite
testClasses.add(BranchingTest.class);
testClasses.add(BranchingTestSameSession.class);
+ testClasses.add(MergingTest.class);
super.initTestClasses(testClasses);
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java
index ed02bd57e7..50c2ad9857 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DBConfigs.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.tests.BranchingTest;
import org.eclipse.emf.cdo.tests.BranchingTestSameSession;
import org.eclipse.emf.cdo.tests.ExternalReferenceTest;
import org.eclipse.emf.cdo.tests.FeatureMapTest;
+import org.eclipse.emf.cdo.tests.MergingTest;
import org.eclipse.emf.cdo.tests.XATransactionTest;
import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_259869_Test;
import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
@@ -36,6 +37,7 @@ public abstract class DBConfigs extends AllTestsAllConfigs
// Subclasses should add Banching tests if supported
testClasses.remove(BranchingTest.class);
testClasses.remove(BranchingTestSameSession.class);
+ testClasses.remove(MergingTest.class);
testClasses.add(DBStoreTest.class);
testClasses.add(SQLQueryTest.class);

Back to the top