summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2011-07-27 04:58:15 (EDT)
committerCaspar De Groot2011-07-27 04:58:15 (EDT)
commitb2044d502d4481e0b34a18311ff6739b16890ca2 (patch)
treef653ac14b15354c3fc76b65073c60fc148643425
parent824dcb277ead0e319037c1cadef5337df76c9c4d (diff)
downloadcdo-b2044d502d4481e0b34a18311ff6739b16890ca2.zip
cdo-b2044d502d4481e0b34a18311ff6739b16890ca2.tar.gz
cdo-b2044d502d4481e0b34a18311ff6739b16890ca2.tar.bz2
[352561] Support client assigned CDOIDs (UUIDs)
https://bugs.eclipse.org/bugs/show_bug.cgi?id=352561
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineTest.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineTest.java
index 11380d8..5c84850 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/offline/OfflineTest.java
@@ -11,6 +11,7 @@
package org.eclipse.emf.cdo.tests.offline;
import org.eclipse.emf.cdo.CDOObject;
+import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation;
import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler;
import org.eclipse.emf.cdo.common.id.CDOID;
@@ -308,7 +309,10 @@ public class OfflineTest extends AbstractSyncingTest
assertEquals(1, transaction.getNewObjects().size());
CDOObject offlineCompany = transaction.getNewObjects().values().iterator().next();
- assertEquals(CDOID.Type.TEMP_OBJECT, offlineCompany.cdoID().getType());
+ if (getRepositoryConfig().getIDGenerationLocation() != IDGenerationLocation.CLIENT)
+ {
+ assertEquals(CDOID.Type.TEMP_OBJECT, offlineCompany.cdoID().getType());
+ }
commitInfo = transaction.commit();
assertEquals(CDOID.Type.OBJECT, offlineCompany.cdoID().getType());