commit ffcb70d4a9c57a83eeddb30375f81210d4aeb5cc
author Eike Stepper <stepper@esc-net.de> Tue May 21 11:22:46 2013 +0200
committer Eike Stepper <stepper@esc-net.de> Tue May 21 12:09:40 2013 +0200
tree 7c6ec4574d082aa288b7a10665a572c1b95f11da
parent 264796348c5cbfacffd29f9c4ac00be22801dc12

[396804] CDOMergingConflictResolver tests 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=396804

plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverExtendedTest.java

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverExtendedTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverExtendedTest.java
index 46dca7f..8c42998 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverExtendedTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverExtendedTest.java
@@ -14,7 +14,11 @@
 import org.eclipse.emf.cdo.common.CDOCommonSession;
 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.IModelConfig;
 import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.Requires;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.Skips;
 import org.eclipse.emf.cdo.tests.model6.BaseObject;
 import org.eclipse.emf.cdo.tests.model6.ContainmentObject;
 import org.eclipse.emf.cdo.tests.model6.ReferenceObject;
@@ -37,6 +41,9 @@
 /**
  * @author Pascal Lehmann
  */
+// TODO Remove Me
+@Requires(IConfig.CAPABILITY_UNAVAILABLE)
+@Skips(IModelConfig.CAPABILITY_LEGACY)
 @CleanRepositoriesBefore
 public class ConflictResolverExtendedTest extends AbstractCDOTest
 {

plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java
index d101bc9..651f02c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java
@@ -829,8 +829,7 @@
 
           case CLEAR:
           case UNSET:
-            int removeme;
-            System.out.println();
+            throw new IllegalStateException("Unhandled change type: " + changeType);
 
           default:
             throw new IllegalStateException("Illegal change type: " + changeType);
@@ -957,8 +956,8 @@
 
           case SET:
           {
-            CDOSetFeatureDelta setChange = (CDOSetFeatureDelta)change;
-            throw new UnsupportedOperationException();
+            throw new IllegalStateException("Unhandled change type: " + changeType);
+            // CDOSetFeatureDelta setChange = (CDOSetFeatureDelta)change;
             // break;
           }