Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-05-21 05:22:46 -0400
committerEike Stepper2013-05-21 06:09:40 -0400
commitffcb70d4a9c57a83eeddb30375f81210d4aeb5cc (patch)
tree7c6ec4574d082aa288b7a10665a572c1b95f11da
parent264796348c5cbfacffd29f9c4ac00be22801dc12 (diff)
downloadcdo-committers/estepper/merger-3.tar.gz
cdo-committers/estepper/merger-3.tar.xz
cdo-committers/estepper/merger-3.zip
[396804] CDOMergingConflictResolver tests committers/estepper/merger-3
https://bugs.eclipse.org/bugs/show_bug.cgi?id=396804
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverExtendedTest.java7
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/DefaultCDOMerger.java7
2 files changed, 10 insertions, 4 deletions
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 46dca7f6e7..8c42998727 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.CDOState;
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 @@ import java.util.List;
/**
* @author Pascal Lehmann
*/
+// TODO Remove Me
+@Requires(IConfig.CAPABILITY_UNAVAILABLE)
+@Skips(IModelConfig.CAPABILITY_LEGACY)
@CleanRepositoriesBefore
public class ConflictResolverExtendedTest extends AbstractCDOTest
{
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 d101bc9aa9..651f02c65c 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 @@ public class DefaultCDOMerger implements CDOMerger
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 @@ public class DefaultCDOMerger implements CDOMerger
case SET:
{
- CDOSetFeatureDelta setChange = (CDOSetFeatureDelta)change;
- throw new UnsupportedOperationException();
+ throw new IllegalStateException("Unhandled change type: " + changeType);
+ // CDOSetFeatureDelta setChange = (CDOSetFeatureDelta)change;
// break;
}

Back to the top