diff options
author | Eike Stepper | 2006-08-22 13:48:30 +0000 |
---|---|---|
committer | Eike Stepper | 2006-08-22 13:48:30 +0000 |
commit | 295816aeecff3d02f26f4d4ccad67be11ea20fe1 (patch) | |
tree | cb8ca75c4977d9d3d48929109eab0b944a7650ac /plugins/org.eclipse.emf.cdo.tests/src | |
parent | 9e5a6dab72136d47a9293a0e79f859dd5b86c60b (diff) | |
download | cdo-295816aeecff3d02f26f4d4ccad67be11ea20fe1.tar.gz cdo-295816aeecff3d02f26f4d4ccad67be11ea20fe1.tar.xz cdo-295816aeecff3d02f26f4d4ccad67be11ea20fe1.zip |
[151560] Query Language for CDO
https://bugs.eclipse.org/bugs/show_bug.cgi?id=151560
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/src')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/ExtentTest.java | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/ExtentTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/ExtentTest.java index f6d6ffa9cf..066fad1f80 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/ExtentTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/ExtentTest.java @@ -12,14 +12,7 @@ package org.eclipse.emf.cdo.tests.model1; import org.eclipse.emf.cdo.client.CDOResource; -import org.eclipse.emf.cdo.client.ClassInfo; -import org.eclipse.emf.cdo.client.PackageManager; import org.eclipse.emf.cdo.client.ResourceManager; -import org.eclipse.emf.cdo.client.protocol.ClientCDOProtocolImpl; - -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.net4j.core.Channel; import testmodel1.ExtendedNode; import testmodel1.TestModel1Package; @@ -43,14 +36,7 @@ public class ExtentTest extends AbstractModel1Test CDOResource resource = saveRoot(root, RESOURCE); ResourceManager resourceManager = resource.getResourceManager(); - Channel channel = resourceManager.getChannel(); - - PackageManager packageManager = resourceManager.getPackageManager(); - EClass eClass = TestModel1Package.eINSTANCE.getTreeNode(); - ClassInfo classInfo = packageManager.getClassInfo(eClass); - int cid = classInfo.getCID(); - - Set extent = ClientCDOProtocolImpl.requestQueryExtent(channel, cid, true); + Set extent = resourceManager.queryExtent(TestModel1Package.eINSTANCE.getTreeNode()); assertEquals(1 + CHILDREN.length, extent.size()); assertTrue(extent.contains(root)); @@ -76,14 +62,7 @@ public class ExtentTest extends AbstractModel1Test CDOResource resource = saveRoot(root, RESOURCE); ResourceManager resourceManager = resource.getResourceManager(); - Channel channel = resourceManager.getChannel(); - - PackageManager packageManager = resourceManager.getPackageManager(); - EClass eClass = TestModel1Package.eINSTANCE.getTreeNode(); - ClassInfo classInfo = packageManager.getClassInfo(eClass); - int cid = classInfo.getCID(); - - Set extent = ClientCDOProtocolImpl.requestQueryExtent(channel, cid, false); + Set extent = resourceManager.queryExtent(TestModel1Package.eINSTANCE.getTreeNode(), true, null); assertEquals(2 + CHILDREN.length, extent.size()); assertTrue(extent.contains(root)); |