From 7360d35d7920ce876d25505a58082dfb41962be1 Mon Sep 17 00:00:00 2001 From: Eike Stepper Date: Tue, 21 May 2013 12:45:34 +0200 Subject: [396804] CDOMergingConflictResolver tests https://bugs.eclipse.org/bugs/show_bug.cgi?id=396804 --- .../emf/cdo/tests/ConflictResolverMergingTest.java | 2 + .../src/org/eclipse/emf/cdo/tests/MergingTest.java | 9 +- .../cdo/tests/bugzilla/Bugzilla_316887_Test.java | 136 --------------------- .../cdo/tests/bugzilla/Bugzilla_383370_Test.java | 5 + .../org/eclipse/emf/cdo/tests/config/IConfig.java | 2 + .../emf/cdo/tests/config/impl/Scenario.java | 1 + 6 files changed, 15 insertions(+), 140 deletions(-) delete mode 100644 plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316887_Test.java diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverMergingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverMergingTest.java index 2e00573f0a..f6e8ffbec6 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverMergingTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverMergingTest.java @@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.tests; import org.eclipse.emf.cdo.session.CDOSession; +import org.eclipse.emf.cdo.tests.config.IConfig; import org.eclipse.emf.cdo.tests.model1.OrderDetail; import org.eclipse.emf.cdo.tests.model1.SalesOrder; import org.eclipse.emf.cdo.transaction.CDOConflictResolver; @@ -67,6 +68,7 @@ public class ConflictResolverMergingTest extends ConflictResolverTest commitAndSync(transaction2, transaction1); } + @Skips(IConfig.EFFORT_MERGING) public void testMergeLocalChangesPerFeature_Bug2() throws Exception { msg("Opening session"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java index 31c5e46762..5f5eb12db0 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java @@ -18,6 +18,7 @@ import org.eclipse.emf.cdo.common.commit.CDOCommitInfo; import org.eclipse.emf.cdo.common.revision.CDORevision; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; +import org.eclipse.emf.cdo.tests.config.IConfig; import org.eclipse.emf.cdo.tests.config.IRepositoryConfig; import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.Requires; import org.eclipse.emf.cdo.tests.model1.Company; @@ -142,8 +143,8 @@ public class MergingTest extends AbstractCDOTest assertEquals(1, ((CDORevision)commitInfo1.getNewObjects().get(1)).getVersion()); } + @Skips(IConfig.EFFORT_MERGING) @SuppressWarnings("unused") - @Deprecated public void testRemergeAfterAdditionsInSource() throws Exception { CDOSession session = openSession(); @@ -190,8 +191,8 @@ public class MergingTest extends AbstractCDOTest assertEquals(false, transaction.isDirty()); } + @Skips(IConfig.EFFORT_MERGING) @SuppressWarnings("unused") - @Deprecated public void testRemergeAfterAdditionsInSource2() throws Exception { CDOSession session = openSession(); @@ -265,7 +266,7 @@ public class MergingTest extends AbstractCDOTest assertEquals(false, transaction.isDirty()); } - @Deprecated + @Skips(IConfig.EFFORT_MERGING) public void testAdditionsInSourceAndTarget() throws Exception { CDOSession session = openSession(); @@ -336,7 +337,7 @@ public class MergingTest extends AbstractCDOTest assertEquals(false, transaction.isDirty()); } - @Deprecated + @Skips(IConfig.EFFORT_MERGING) public void testRemergeAfterAdditionsInSourceAndTarget() throws Exception { CDOSession session = openSession(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316887_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316887_Test.java deleted file mode 100644 index 59fc4423c4..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316887_Test.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright (c) 2010-2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.bugzilla; - -import org.eclipse.emf.cdo.CDOObject; -import org.eclipse.emf.cdo.common.revision.CDORevision; -import org.eclipse.emf.cdo.common.revision.delta.CDOListFeatureDelta; -import org.eclipse.emf.cdo.common.revision.delta.CDOMoveFeatureDelta; -import org.eclipse.emf.cdo.common.revision.delta.CDORemoveFeatureDelta; -import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta; -import org.eclipse.emf.cdo.eresource.CDOResource; -import org.eclipse.emf.cdo.session.CDOSession; -import org.eclipse.emf.cdo.spi.common.revision.InternalCDOFeatureDelta.WithIndex; -import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.model2.Task; -import org.eclipse.emf.cdo.tests.model2.TaskContainer; -import org.eclipse.emf.cdo.tests.util.TestAdapter; -import org.eclipse.emf.cdo.transaction.CDOTransaction; - -import org.eclipse.emf.internal.cdo.view.CDOStateMachine; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.spi.cdo.InternalCDOObject; - -import java.util.Iterator; -import java.util.List; - -/** - * Databinding & CDO Notifications. - *
- * See bug 316887
- *
- * @author Cyril Jaquier
- * @since 4.0
- */
-public class Bugzilla_316887_Test extends AbstractCDOTest
-{
- /**
- * @deprecated AbstractObjectConflictResolver is deprecated
- */
- @Deprecated
- public void testResolveConflictWithAdjustedNotifcations() throws Exception
- {
- // setup transaction.
- final CDOSession session = openSession();
- final CDOTransaction tr1 = session.openTransaction();
-
- final CDOResource resource = tr1.createResource(getResourcePath("/test1"));
- TaskContainer container = getModel2Factory().createTaskContainer();
- resource.getContents().add(container);
-
- for (int i = 0; i < 7; i++)
- {
- Task task = getModel2Factory().createTask();
- task.setDescription(Integer.toString(i));
- container.getTasks().add(task);
- }
-
- tr1.commit();
-
- sleep(500);
-
- final CDOTransaction tr2 = session.openTransaction();
-
- // Adds a conflict resolver.
- tr2.options().addConflictResolver(new org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver()
- {
- @Deprecated
- @Override
- protected void resolveConflict(CDOObject conflict, CDORevision oldRemoteRevision, CDORevisionDelta localDelta,
- CDORevisionDelta remoteDelta, List