Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2017-01-13 07:41:44 +0000
committerEike Stepper2017-01-13 08:18:31 +0000
commit226fddd44f9b402b4c2330ce32c469cdc71a61dd (patch)
tree12850a5dd1e3734ff8b17dd5413ddfdf48b6e8e6 /plugins/org.eclipse.emf.cdo.tests.objectivity
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.objectivity')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyConfig.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyDBConfigs.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java2
6 files changed, 8 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java
index 61e5be9dfc..bda75d0579 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java
@@ -27,6 +27,6 @@ public class AllTestsObjyAudit extends ObjyDBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, new ObjyConfig(true, false), JVM, NATIVE);
+ addScenario(parent, new ObjyConfig().supportingAudits(true), JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java
index 6439067302..2c20de5dde 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java
@@ -27,6 +27,6 @@ public class AllTestsObjyBranching extends ObjyDBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, new ObjyConfig(true, true), JVM, NATIVE);
+ addScenario(parent, new ObjyConfig().supportingBranches(true), JVM, NATIVE);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
index 314049a47f..c8fd22623f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java
@@ -33,7 +33,7 @@ public class AllTestsObjyNonAudit extends ObjyDBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, new ObjyConfig(false, false), JVM, NATIVE);
+ addScenario(parent, new ObjyConfig(), JVM, NATIVE);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyConfig.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyConfig.java
index 21fa12f3e3..707885cfde 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyConfig.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.emf.cdo.tests.objectivity;
-import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation;
import org.eclipse.emf.cdo.server.IStore;
import org.eclipse.emf.cdo.server.internal.objectivity.ObjectivityStoreConfig;
import org.eclipse.emf.cdo.server.objectivity.ObjyStoreUtil;
@@ -27,9 +26,9 @@ public class ObjyConfig extends RepositoryConfig
private static ObjectivityStoreConfig storeConfig = new ObjectivityStoreConfig();
- public ObjyConfig(boolean supportingAudits, boolean supportingBranches)
+ public ObjyConfig()
{
- super(STORE_NAME, supportingAudits, supportingBranches, IDGenerationLocation.STORE);
+ super(STORE_NAME);
org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM.DEBUG.setEnabled(true);
org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM.INFO.setEnabled(true);
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyDBConfigs.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyDBConfigs.java
index bcce5fb794..8daf1096e6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyDBConfigs.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/ObjyDBConfigs.java
@@ -36,7 +36,7 @@ public abstract class ObjyDBConfigs extends AllConfigs
// remove BranchingTests because most mappings do not support it
// Subclasses should add Banching tests if supported
- if (!scenario.getRepositoryConfig().isSupportingBranches())
+ if (!scenario.getRepositoryConfig().supportingBranches())
{
testClasses.remove(BranchingTest.class);
testClasses.remove(BranchingSameSessionTest.class);
@@ -44,7 +44,7 @@ public abstract class ObjyDBConfigs extends AllConfigs
testClasses.remove(Bugzilla_303807_Test.class);
}
- if (!scenario.getRepositoryConfig().isSupportingAudits())
+ if (!scenario.getRepositoryConfig().supportingAudits())
{
// non-audit mode - remove audit tests
testClasses.remove(AuditTest.class);
diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java
index 98df84415f..3d30c58115 100644
--- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java
+++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java
@@ -39,7 +39,7 @@ public class SampleTestsObjy extends ObjyDBConfigs
@Override
protected void initConfigSuites(TestSuite parent)
{
- addScenario(parent, new ObjyConfig(false, false), JVM, NATIVE);
+ addScenario(parent, new ObjyConfig(), JVM, NATIVE);
}
@Override

Back to the top