Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McDuff2008-09-11 06:38:38 +0000
committerSimon McDuff2008-09-11 06:38:38 +0000
commit65087f87d7d13b3d1b79f5aa3a0086e23a137d0b (patch)
tree6cbd5ba0450b6ed791c407207033ed8fe0e18afd /plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java
parent128d02f77c213ee2aca3ecd23ef6bba7a16dfa09 (diff)
downloadcdo-65087f87d7d13b3d1b79f5aa3a0086e23a137d0b.tar.gz
cdo-65087f87d7d13b3d1b79f5aa3a0086e23a137d0b.tar.xz
cdo-65087f87d7d13b3d1b79f5aa3a0086e23a137d0b.zip
[213402] Support external references
https://bugs.eclipse.org/bugs/show_bug.cgi?id=213402
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java
index 0398f97304..b5160b138a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java
@@ -142,7 +142,8 @@ public abstract class AbstractCDOTest extends AbstractTransportTest
// assertEquals(null, object.cdoID());
// assertEquals(null, object.cdoRevision());
// assertEquals(null, object.cdoView());
- assertEquals(object.eResource(), object.cdoResource());
+ //assertEquals(bject.eResource(), object.cdoResource());
+ //assertEquals(null, object.cdoResource());
}
protected static void assertNotTransient(CDOObject object, CDOView view)
@@ -151,9 +152,9 @@ public abstract class AbstractCDOTest extends AbstractTransportTest
assertNotNull(object.cdoID());
assertNotNull(object.cdoRevision());
assertNotNull(object.cdoView());
- assertNotNull(object.cdoResource());
+ //assertNotNull(object.cdoResource());
assertNotNull(object.eResource());
- assertEquals(object.eResource(), object.cdoResource());
+ //assertEquals(object.eResource(), object.cdoResource());
assertEquals(view, object.cdoView());
assertEquals(object, view.getObject(object.cdoID(), false));
}
@@ -190,10 +191,10 @@ public abstract class AbstractCDOTest extends AbstractTransportTest
protected static void assertContent(CDOObject container, CDOObject contained)
{
assertEquals(container.eResource(), contained.eResource());
- assertEquals(container.cdoResource(), contained.cdoResource());
assertTrue(container.eContents().contains(contained));
if (container instanceof CDOResource)
{
+ assertEquals(container.eResource(), container.cdoResource());
assertEquals(null, contained.eContainer());
assertTrue(((CDOResource)container).getContents().contains(contained));
}

Back to the top