Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-10-15 16:32:10 -0400
committerEike Stepper2008-10-15 16:32:10 -0400
commitdd388529fdeec00e4fc84ac4be1fbb95dc697619 (patch)
tree8d559ddf6f242dfb0826292bee3499ff912056f7
parent4cc19933e3f022e5d28e1b8ec4e4fcb16cf35dbf (diff)
downloadcdo-dd388529fdeec00e4fc84ac4be1fbb95dc697619.tar.gz
cdo-dd388529fdeec00e4fc84ac4be1fbb95dc697619.tar.xz
cdo-dd388529fdeec00e4fc84ac4be1fbb95dc697619.zip
[249847] Store resources in a hierarchical structure
https://bugs.eclipse.org/bugs/show_bug.cgi?id=249847
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java15
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/QueryTest.java2
3 files changed, 6 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java
index 4a795b64d6..2f579a4ec6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java
@@ -249,7 +249,6 @@ public class DetachTest extends AbstractCDOTest
msg("Opening transaction");
CDOTransaction transaction = session.openTransaction();
-
ResourceSet rset = transaction.getResourceSet();
msg("Creating resource");
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java
index 84bfe1ba15..4f77c4a6aa 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.net4j.util.transaction.TransactionException;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -161,21 +162,15 @@ public class ExternalReferenceTest extends AbstractCDOTest
CDOResource resA = transactionA1.createResource("/resA");
CDOResource resB = transactionB1.createResource("/resB");
- assertEquals(2, resourceSet.getResources().size());
- // assertEquals(resA, resourceSet.getResource(CDOUtil.createResourceURI(sessionA, "/resA"), false));
- // assertEquals(resB, resourceSet.getResource(CDOUtil.createResourceURI(sessionA, "/resB"), false));
+ EList<Resource> resources = resourceSet.getResources();
+ assertEquals(4, resources.size());
- // CDOResource resC = (CDOResource)resourceSet.createResource(CDOUtil.createResourceURI(sessionA, "/resC"));
- // assertEquals(transactionA1, resC.cdoView());
CDOResource resC = transactionA1.createResource("/resC");
assertNotNull(resC);
-
- assertEquals(3, resourceSet.getResources().size());
- // assertEquals(resC, resourceSet.getResource(CDOUtil.createResourceURI(sessionA, "/resC"), false));
+ assertEquals(5, resources.size());
Resource resD = resourceSet.createResource(URI.createURI("test://1"));
-
- assertEquals(4, resourceSet.getResources().size());
+ assertEquals(6, resources.size());
assertEquals(false, resD instanceof CDOResource);
Company companyA = getModel1Factory().createCompany();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/QueryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/QueryTest.java
index 4cb4e04aa5..5c8d096a80 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/QueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/QueryTest.java
@@ -58,7 +58,7 @@ public class QueryTest extends AbstractCDOTest
CDOQuery cdoQuery = transaction.createQuery(LANGUAGE, "QUERYSTRING");
List<Object> queryResult = cdoQuery.getResult(Object.class);
- assertEquals(3, queryResult.size());
+ assertEquals(4, queryResult.size());
for (Object object : queryResult)
{
assertEquals(true, objects.contains(object));

Back to the top