summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-08-23 16:48:02 (EDT)
committerEike Stepper2006-08-23 16:48:02 (EDT)
commitdd75668a423b99f76b2185d18b94a68ed4f3146d (patch)
tree4855ccda75dbaf7dce3fddbc330dc74895dfb3a9
parent5f7a63f633da56a443a523d05a3e21f9f3336ec3 (diff)
downloadcdo-dd75668a423b99f76b2185d18b94a68ed4f3146d.zip
cdo-dd75668a423b99f76b2185d18b94a68ed4f3146d.tar.gz
cdo-dd75668a423b99f76b2185d18b94a68ed4f3146d.tar.bz2
[151560] Query Language for CDO
https://bugs.eclipse.org/bugs/show_bug.cgi?id=151560
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/launches/CDO Adapter Test.launch38
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AdapterTest.java94
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AllModel1Tests.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/OCLTest.java4
4 files changed, 138 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/launches/CDO Adapter Test.launch b/plugins/org.eclipse.emf.cdo.tests/launches/CDO Adapter Test.launch
new file mode 100644
index 0000000..7265c12
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/launches/CDO Adapter Test.launch
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<stringAttribute key="bootstrap" value=""/>
+<booleanAttribute key="useProduct" value="false"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.net4j.examples.mvc.swt,org.eclipse.net4j.examples.prov.client.ui,org.eclipse.net4j.examples.mvc,org.eclipse.net4j.examples.prov.server,org.eclipse.emf.cdo.dbgen.edit,org.eclipse.emf.cdo.examples.library,org.eclipse.emf.cdo.examples.library.ui,org.eclipse.emf.cdo.analysis.gmf,org.eclipse.emf.cdo.mapping.editor,org.eclipse.net4j.examples.server,org.eclipse.net4j.tests,org.eclipse.emf.cdo.doc,org.eclipse.datatools.enablement.mysql,org.eclipse.net4j.spring.tests,org.eclipse.emf.cdo,org.eclipse.emf.cdo.dbgen.editor,org.eclipse.net4j.examples.prov.edit,org.eclipse.emf.cdo.utilities.migrator,org.eclipse.emf.cdo.analysis,org.eclipse.emf.cdo.examples.server,org.eclipse.datatools.enablement.mysql.dbdefinition,org.eclipse.net4j.examples.prov,org.eclipse.emf.cdo.examples.client,org.eclipse.emf.cdo.examples.ui,org.eclipse.net4j.examples.client.ui,org.eclipse.net4j.examples.client,org.eclipse.net4j.doc,org.eclipse.net4j.examples.prov.client,org.eclipse.net4j.examples.prov.editor,org.eclipse.net4j"/>
+<booleanAttribute key="tracing" value="false"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu,org.apache.ant,org.eclipse.ant.core,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.emf.common,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.osgi,org.eclipse.update.configurator,org.junit"/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="automaticValidate" value="true"/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<stringAttribute key="checked" value="[NONE]"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.jdbc,org.eclipse.net4j.spring,org.eclipse.net4j.socket,org.eclipse.net4j.core,org.eclipse.net4j.spring.db,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.ocl,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.core,org.eclipse.emf.cdo.mapping,org.eclipse.emf.cdo.client,org.eclipse.net4j.util,org.eclipse.emf.cdo.client.ocl,org.eclipse.emf.cdo.server,org.eclipse.net4j.embedded,org.eclipse.emf.cdo.jdbc.derby,org.eclipse.emf.cdo.dbgen.derby,org.eclipse.emf.cdo.dbgen.oracle,org.eclipse.emf.cdo.jdbc.hsqldb,org.eclipse.emf.cdo.jdbc.mysql,org.eclipse.emf.cdo.dbgen.ansi92,org.eclipse.emf.cdo.dbgen.mysql,org.eclipse.emf.cdo.dbgen.hsqldb"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<booleanAttribute key="clearws" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.model1.AdapterTest"/>
+<stringAttribute key="pde.version" value="3.2a"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcdo.test.mode=client-separated-server"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+</launchConfiguration>
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AdapterTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AdapterTest.java
new file mode 100644
index 0000000..249375d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AdapterTest.java
@@ -0,0 +1,94 @@
+/***************************************************************************
+ * Copyright (c) 2004, 2005, 2006 Eike Stepper, Fuggerstr. 39, 10777 Berlin, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.tests.model1;
+
+
+import org.eclipse.emf.cdo.client.CDOResource;
+import org.eclipse.emf.cdo.client.PausableChangeRecorder;
+import org.eclipse.emf.cdo.client.ResourceManager;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+
+import testmodel1.TreeNode;
+
+import java.util.Iterator;
+
+
+public class AdapterTest extends AbstractModel1Test
+{
+ public void testFiveLevels() throws Exception
+ {
+ final String RESOURCE = "/test/res";
+ final String ROOT = "root";
+ final String[] CHILDREN = { "a", "b", "c"};
+
+ TreeNode root = createNode(ROOT);
+ TreeNode[] children = createChildren(CHILDREN, root);
+ for (int i = 0; i < children.length; i++)
+ createChildren(new String[] { "a" + i, "b" + i, "c" + i}, children[i]);
+ CDOResource resource = saveRoot(root, RESOURCE);
+
+ ResourceManager resourceManager = resource.getResourceManager();
+ ResourceSet resourceSet = resourceManager.getResourceSet();
+ PausableChangeRecorder transaction = resourceManager.getTransaction();
+ assertAdapter(resourceSet, transaction);
+ }
+
+ protected void assertAdapter(Notifier notifier, Adapter adapter)
+ {
+ EList adapters = notifier.eAdapters();
+ assertNotNull(notifier.toString(), adapters);
+
+ int count = 0;
+ for (Iterator it = adapters.iterator(); it.hasNext();)
+ {
+ Adapter element = (Adapter) it.next();
+ count += element == adapter ? 1 : 0;
+ }
+ assertEquals(notifier.toString(), 1, count);
+
+ if (notifier instanceof ResourceSet)
+ {
+ ResourceSet resourceSet = (ResourceSet) notifier;
+ EList resources = resourceSet.getResources();
+ for (Iterator it = resources.iterator(); it.hasNext();)
+ {
+ Resource resource = (Resource) it.next();
+ assertAdapter(resource, adapter);
+ }
+ }
+ else if (notifier instanceof Resource)
+ {
+ Resource resource = (Resource) notifier;
+ EList contents = resource.getContents();
+ for (Iterator it = contents.iterator(); it.hasNext();)
+ {
+ EObject object = (EObject) it.next();
+ assertAdapter(object, adapter);
+ }
+ }
+ else if (notifier instanceof EObject)
+ {
+ EObject object = (EObject) notifier;
+ EList contents = object.eContents();
+ for (Iterator it = contents.iterator(); it.hasNext();)
+ {
+ EObject child = (EObject) it.next();
+ assertAdapter(child, adapter);
+ }
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AllModel1Tests.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AllModel1Tests.java
index a4a355e..ce132bf 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AllModel1Tests.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AllModel1Tests.java
@@ -21,11 +21,12 @@ public class AllModel1Tests
{
TestSuite suite = new TestSuite("Test for org.eclipse.emf.cdo.tests.model1");
suite.addTestSuite(BasicTest.class);
- suite.addTestSuite(Bugzilla154389Test.class);
- suite.addTestSuite(ExtentTest.class);
+ suite.addTestSuite(AdapterTest.class);
+ suite.addTestSuite(SerializationTest.class);
suite.addTestSuite(NotificationTest.class);
+ suite.addTestSuite(ExtentTest.class);
suite.addTestSuite(OCLTest.class);
- suite.addTestSuite(SerializationTest.class);
+ suite.addTestSuite(Bugzilla154389Test.class);
return suite;
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/OCLTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/OCLTest.java
index d37c237..6ecb807 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/OCLTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/OCLTest.java
@@ -38,7 +38,7 @@ public class OCLTest extends AbstractModel1Test
}
TreeNode root = (TreeNode) loadRoot(RESOURCE);
- IOCLHelper helper = HelperUtil.createOCLHelper();
+ IOCLHelper helper = CDOHelperUtil.createOCLHelper();
helper.setContext(root);
try
@@ -65,7 +65,7 @@ public class OCLTest extends AbstractModel1Test
}
TreeNode root = (TreeNode) loadRoot(RESOURCE);
- IOCLHelper helper = HelperUtil.createOCLHelper();
+ IOCLHelper helper = CDOHelperUtil.createOCLHelper();
helper.setContext(root);
try