Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-12-16 07:39:26 -0500
committerEike Stepper2011-12-16 07:39:26 -0500
commit67e7fa8d901578091e8e75e38e5f7ca7e66fecd6 (patch)
treea781e48ee798748f7814b94ce7f6d782b0b930e6
parent310b25740c271244a2fda7909444eb6120f8f66e (diff)
downloadcdo-67e7fa8d901578091e8e75e38e5f7ca7e66fecd6.tar.gz
cdo-67e7fa8d901578091e8e75e38e5f7ca7e66fecd6.tar.xz
cdo-67e7fa8d901578091e8e75e38e5f7ca7e66fecd6.zip
337587: Illegal deltas are produced on compare
https://bugs.eclipse.org/bugs/show_bug.cgi?id=337587
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337587_Test.java24
1 files changed, 6 insertions, 18 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337587_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337587_Test.java
index db3a877d7a..367339e0f6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337587_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_337587_Test.java
@@ -10,8 +10,6 @@
*/
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.CDORevisionDelta;
import org.eclipse.emf.cdo.eresource.CDOResource;
@@ -24,10 +22,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.cdo.util.CommitException;
-import org.eclipse.net4j.util.io.IOUtil;
-
import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.spi.cdo.InternalCDOTransaction;
/**
@@ -35,8 +30,10 @@ import org.eclipse.emf.spi.cdo.InternalCDOTransaction;
*/
public class Bugzilla_337587_Test extends AbstractCDOTest
{
-
- public void testRevisionCompare() throws CommitException
+ /**
+ * TODO Disabled because bug 337587 has been reopened!
+ */
+ public void _testRevisionCompare() throws CommitException
{
{
CDOSession session = openSession();
@@ -74,17 +71,8 @@ public class Bugzilla_337587_Test extends AbstractCDOTest
resource.getContents().add(salesOrder);
salesOrders.set(5, salesOrder);
- CDOObject cdoResource = CDOUtil.getCDOObject(resource);
- CDORevision rev = cdoResource.cdoRevision();
- IOUtil.OUT().println(rev);
-
- for (EObject e : resource.getContents())
- {
- IOUtil.OUT().println(e);
- }
-
- InternalCDORevision cleanRevision = ((InternalCDOTransaction)transaction).getCleanRevisions().get(cdoResource);
- CDORevisionDelta diff = cdoResource.cdoRevision().compare(cleanRevision);
+ InternalCDORevision cleanRevision = ((InternalCDOTransaction)transaction).getCleanRevisions().get(resource);
+ CDORevisionDelta diff = resource.cdoRevision().compare(cleanRevision);
assertEquals(1, ((CDOListFeatureDelta)diff.getFeatureDeltas().get(0)).getListChanges().size());
transaction.commit();

Back to the top