Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2017-01-13 02:41:44 -0500
committerEike Stepper2017-01-13 03:18:31 -0500
commit226fddd44f9b402b4c2330ce32c469cdc71a61dd (patch)
tree12850a5dd1e3734ff8b17dd5413ddfdf48b6e8e6 /plugins/org.eclipse.emf.cdo.tests.hibernate
parentbb6dacda5af21995d9632c1ec9444e7d5e2a63c5 (diff)
downloadcdo-226fddd44f9b402b4c2330ce32c469cdc71a61dd.tar.gz
cdo-226fddd44f9b402b4c2330ce32c469cdc71a61dd.tar.xz
cdo-226fddd44f9b402b4c2330ce32c469cdc71a61dd.zip
[510412] DefaultCDOMerger produces incorrect results for MOVE deltas in many-valued features
https://bugs.eclipse.org/bugs/show_bug.cgi?id=510412
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.hibernate')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateConfig.java9
2 files changed, 6 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
index 12f74d9789..5356f48d77 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
@@ -94,7 +94,7 @@ public class AllTestsHibernate extends AllConfigs
super.initTestClasses(testClasses, scenario);
// TODO: find out why this does not work for non-auditing
- if (scenario.getRepositoryConfig().isSupportingAudits())
+ if (scenario.getRepositoryConfig().supportingAudits())
{
testClasses.add(HibernateBugzilla_380987_Test.class);
}
@@ -160,7 +160,7 @@ public class AllTestsHibernate extends AllConfigs
// TODO: research this
testClasses.remove(Bugzilla_416474_Test.class);
- if (scenario.getRepositoryConfig().isSupportingAudits())
+ if (scenario.getRepositoryConfig().supportingAudits())
{
// need to add additional auditing annotations
testClasses.remove(HibernateBugzilla_405191_Test.class);
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateConfig.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateConfig.java
index dd665cbb49..3c9fa8fa1e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateConfig.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.emf.cdo.tests.hibernate;
-import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation;
import org.eclipse.emf.cdo.server.IStore;
import org.eclipse.emf.cdo.server.hibernate.CDOHibernateUtil;
import org.eclipse.emf.cdo.server.hibernate.IHibernateMappingProvider;
@@ -30,9 +29,9 @@ public class HibernateConfig extends RepositoryConfig
{
public static final String STORE_NAME = "Hibernate";
- public static final HibernateConfig INSTANCE = new HibernateConfig(false);
+ public static final HibernateConfig INSTANCE = new HibernateConfig();
- public static final HibernateConfig AUDIT_INSTANCE = new HibernateConfig(true);
+ public static final HibernateConfig AUDIT_INSTANCE = (HibernateConfig)new HibernateConfig().supportingAudits(true);
public static final String MAPPING_FILE = "mappingfile";
@@ -40,9 +39,9 @@ public class HibernateConfig extends RepositoryConfig
private Map<String, String> additionalProperties = new HashMap<String, String>();
- public HibernateConfig(boolean supportAuditing)
+ public HibernateConfig()
{
- super(STORE_NAME, supportAuditing, false, IDGenerationLocation.STORE);
+ super(STORE_NAME);
}
@Override

Back to the top