Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-02-02 11:39:48 +0000
committerEike Stepper2010-02-02 11:39:48 +0000
commitdc758eb87d5c2f0e802e49de4ca6173d3d94a2c8 (patch)
treeee1091aac506313694923c73871275551cbc714d /plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java
parent09f6a7f80829204abd2c2bf2511ba3b4e65c81c8 (diff)
downloadcdo-dc758eb87d5c2f0e802e49de4ca6173d3d94a2c8.tar.gz
cdo-dc758eb87d5c2f0e802e49de4ca6173d3d94a2c8.tar.xz
cdo-dc758eb87d5c2f0e802e49de4ca6173d3d94a2c8.zip
[270716] Provide support for branching
https://bugs.eclipse.org/bugs/show_bug.cgi?id=270716
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.java10
1 files changed, 2 insertions, 8 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 3a54278108..5b49d3d78f 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
@@ -15,7 +15,6 @@ import org.eclipse.emf.cdo.CDOState;
import org.eclipse.emf.cdo.common.model.CDOPackageTypeRegistry;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.tests.config.impl.ConfigTest;
-import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.cdo.view.CDOView;
@@ -140,17 +139,12 @@ public abstract class AbstractCDOTest extends ConfigTest
assertEquals(false, CDOLegacyWrapper.isLegacyProxy(object));
}
- protected static void assertCreatedTime(EObject eObject)
+ protected static void assertCreatedTime(EObject eObject, long timeStamp)
{
CDOObject object = CDOUtil.getCDOObject(eObject);
if (object != null)
{
- CDOView view = object.cdoView();
- if (view instanceof CDOTransaction)
- {
- CDOTransaction transaction = (CDOTransaction)view;
- assertEquals(transaction.getLastCommitTime(), object.cdoRevision().getCreated());
- }
+ assertEquals(timeStamp, object.cdoRevision().getTimeStamp());
}
}
}

Back to the top