Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-09-05 09:26:34 +0000
committerEike Stepper2013-09-05 09:26:34 +0000
commit6d511c682cb1a6af42fcd06ecad5e7403168cec5 (patch)
treeb6e5f0467fedaf40d20c3e37905d0d23ec9b1173
parent531e57c7a9e5ecd32e884ba5ba95b0f41345f56c (diff)
downloadcdo-6d511c682cb1a6af42fcd06ecad5e7403168cec5.tar.gz
cdo-6d511c682cb1a6af42fcd06ecad5e7403168cec5.tar.xz
cdo-6d511c682cb1a6af42fcd06ecad5e7403168cec5.zip
Fix legacy problem in PartialCommitTest
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java48
1 files changed, 24 insertions, 24 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
index f17a44c8a8..f2eba5cbe8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
@@ -292,45 +292,45 @@ public class PartialCommitTest extends AbstractCDOTest
company2.getPurchaseOrders().remove(po);
cat.getProducts().remove(product);
- assertEquals(true, tx.getDetachedObjects().containsValue(company4));
- assertEquals(true, tx.getCleanRevisions().containsKey(company4));
- assertEquals(true, tx.getDetachedObjects().containsValue(po));
- assertEquals(true, tx.getCleanRevisions().containsKey(company4));
- assertEquals(true, tx.getDetachedObjects().containsValue(product));
- assertEquals(true, tx.getCleanRevisions().containsKey(company4));
+ assertEquals(true, tx.getDetachedObjects().containsValue(CDOUtil.getCDOObject(company4)));
+ assertEquals(true, tx.getCleanRevisions().containsKey(CDOUtil.getCDOObject(company4)));
+ assertEquals(true, tx.getDetachedObjects().containsValue(CDOUtil.getCDOObject(po)));
+ assertEquals(true, tx.getCleanRevisions().containsKey(CDOUtil.getCDOObject(company4)));
+ assertEquals(true, tx.getDetachedObjects().containsValue(CDOUtil.getCDOObject(product)));
+ assertEquals(true, tx.getCleanRevisions().containsKey(CDOUtil.getCDOObject(company4)));
assertEquals(true, tx.isDirty());
tx.setCommittables(createSet(company4, resource1));
tx.commit();
- assertEquals(false, tx.getDetachedObjects().containsValue(company4));
- assertEquals(false, tx.getCleanRevisions().containsKey(company4));
- assertEquals(true, tx.getDetachedObjects().containsValue(po));
- assertEquals(true, tx.getCleanRevisions().containsKey(po));
- assertEquals(true, tx.getDetachedObjects().containsValue(product));
- assertEquals(true, tx.getCleanRevisions().containsKey(product));
+ assertEquals(false, tx.getDetachedObjects().containsValue(CDOUtil.getCDOObject(company4)));
+ assertEquals(false, tx.getCleanRevisions().containsKey(CDOUtil.getCDOObject(company4)));
+ assertEquals(true, tx.getDetachedObjects().containsValue(CDOUtil.getCDOObject(po)));
+ assertEquals(true, tx.getCleanRevisions().containsKey(CDOUtil.getCDOObject(po)));
+ assertEquals(true, tx.getDetachedObjects().containsValue(CDOUtil.getCDOObject(product)));
+ assertEquals(true, tx.getCleanRevisions().containsKey(CDOUtil.getCDOObject(product)));
assertEquals(true, tx.isDirty());
tx.setCommittables(createSet(po, company2));
tx.commit();
- assertEquals(false, tx.getDetachedObjects().containsValue(company4));
- assertEquals(false, tx.getCleanRevisions().containsKey(company4));
- assertEquals(false, tx.getDetachedObjects().containsValue(po));
- assertEquals(false, tx.getCleanRevisions().containsKey(po));
- assertEquals(true, tx.getDetachedObjects().containsValue(product));
- assertEquals(true, tx.getCleanRevisions().containsKey(product));
+ assertEquals(false, tx.getDetachedObjects().containsValue(CDOUtil.getCDOObject(company4)));
+ assertEquals(false, tx.getCleanRevisions().containsKey(CDOUtil.getCDOObject(company4)));
+ assertEquals(false, tx.getDetachedObjects().containsValue(CDOUtil.getCDOObject(po)));
+ assertEquals(false, tx.getCleanRevisions().containsKey(CDOUtil.getCDOObject(po)));
+ assertEquals(true, tx.getDetachedObjects().containsValue(CDOUtil.getCDOObject(product)));
+ assertEquals(true, tx.getCleanRevisions().containsKey(CDOUtil.getCDOObject(product)));
assertEquals(true, tx.isDirty());
tx.setCommittables(createSet(product, cat));
tx.commit();
- assertEquals(false, tx.getDetachedObjects().containsValue(company4));
- assertEquals(false, tx.getCleanRevisions().containsKey(company4));
- assertEquals(false, tx.getDetachedObjects().containsValue(po));
- assertEquals(false, tx.getCleanRevisions().containsKey(po));
- assertEquals(false, tx.getDetachedObjects().containsValue(product));
- assertEquals(false, tx.getCleanRevisions().containsKey(product));
+ assertEquals(false, tx.getDetachedObjects().containsValue(CDOUtil.getCDOObject(company4)));
+ assertEquals(false, tx.getCleanRevisions().containsKey(CDOUtil.getCDOObject(company4)));
+ assertEquals(false, tx.getDetachedObjects().containsValue(CDOUtil.getCDOObject(po)));
+ assertEquals(false, tx.getCleanRevisions().containsKey(CDOUtil.getCDOObject(po)));
+ assertEquals(false, tx.getDetachedObjects().containsValue(CDOUtil.getCDOObject(product)));
+ assertEquals(false, tx.getCleanRevisions().containsKey(CDOUtil.getCDOObject(product)));
assertEquals(true, tx.isDirty());
tx.setCommittables(createSet(company1));

Back to the top