diff options
Diffstat (limited to 'plugins')
5 files changed, 197 insertions, 127 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/embedded/net4j-embedded.properties b/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/embedded/net4j-embedded.properties index c5cac7c15c..d527a246dc 100644 --- a/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/embedded/net4j-embedded.properties +++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/embedded/net4j-embedded.properties @@ -10,5 +10,5 @@ auth.users.file=plugin:/META-INF/auth.users # Internal randomizer.algorithm=SHA1PRNG bufferPool.bufferSize=4096 -channel.responseTimeoutMillis=250000 +channel.responseTimeoutMillis=2000 connectionManager.maxConnections=50 diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/net4j.properties b/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/net4j.properties index 3d2f81ba85..451c04300d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/net4j.properties +++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/net4j/net4j.properties @@ -1,4 +1,4 @@ # Internal randomizer.algorithm=SHA1PRNG bufferPool.bufferSize=4096 -channel.responseTimeoutMillis=250000 +channel.responseTimeoutMillis=2000 diff --git a/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Model1 Tests.launch b/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Model1 Tests.launch new file mode 100644 index 0000000000..13d8e6e57e --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Model1 Tests.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="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.mapping,org.eclipse.emf.cdo.core,org.eclipse.emf.cdo.client,org.eclipse.net4j.util,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.client.ocl,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="location" value="${workspace_loc}/../junit-workspace"/> +<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> +<booleanAttribute key="clearws" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.model1.AllModel1Tests"/> +<stringAttribute key="pde.version" value="3.2a"/> +<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcdo.test.mode=client-separated-server"/> +<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/AllModel1Tests.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AllModel1Tests.java new file mode 100644 index 0000000000..a4a355e026 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AllModel1Tests.java @@ -0,0 +1,31 @@ +/*************************************************************************** + * 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 junit.framework.Test; +import junit.framework.TestSuite; + + +public class AllModel1Tests +{ + public static Test suite() + { + 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(NotificationTest.class); + suite.addTestSuite(OCLTest.class); + suite.addTestSuite(SerializationTest.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 5cb0a9bf01..740b54b0c1 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 @@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.tests.model1; import org.eclipse.emf.cdo.client.ocl.CDOHelperUtil; +import org.eclipse.emf.ocl.helper.HelperUtil; import org.eclipse.emf.ocl.helper.IOCLHelper; import testmodel1.TreeNode; @@ -22,131 +23,131 @@ import java.util.Set; public class OCLTest extends AbstractModel1Test { - // public void testNotEmpty() throws Exception - // { - // final String RESOURCE = "/test/res"; - // final String ROOT = "root"; - // final String[] CHILDREN = { "a", "b", "c"}; - // final String EXPR = "self.children->isEmpty()"; - // - // { // Create CDO resource - // TreeNode root = createNode(ROOT); - // createChildren(CHILDREN, root); - // saveRoot(root, RESOURCE); - // } - // - // TreeNode root = (TreeNode) loadRoot(RESOURCE); - // IOCLHelper helper = HelperUtil.createOCLHelper(); - // helper.setContext(root); - // - // try - // { - // Object result = helper.evaluate(root, EXPR); - // assertFalse(result); - // } - // catch (Exception ex) - // { - // ex.printStackTrace(); - // fail("Parse failed: " + ex.getLocalizedMessage()); - // } - // } - // - // public void testEmpty() throws Exception - // { - // final String RESOURCE = "/test/res"; - // final String ROOT = "root"; - // final String EXPR = "self.children->isEmpty()"; - // - // { // Create CDO resource - // TreeNode root = createNode(ROOT); - // saveRoot(root, RESOURCE); - // } - // - // TreeNode root = (TreeNode) loadRoot(RESOURCE); - // IOCLHelper helper = HelperUtil.createOCLHelper(); - // helper.setContext(root); - // - // try - // { - // Object result = helper.evaluate(root, EXPR); - // assertTrue(result); - // } - // catch (Exception ex) - // { - // ex.printStackTrace(); - // fail("Parse failed: " + ex.getLocalizedMessage()); - // } - // } - // - // public void testExtendedNodeExtent() throws Exception - // { - // final String RESOURCE = "/test/res"; - // - // { // Create CDO resource - // TreeNode root = createNode("root"); - // TreeNode a = createNode("a", root); - // TreeNode b = createNode("b", root); - // TreeNode c = createNode("c", root); - // createNode("a1", a); - // createNode("b1", b); - // createNode("c1", c); - // createExtended("a2", a); - // createExtended("b2", b); - // createExtended("c2", c); - // saveRoot(root, RESOURCE); - // } - // - // TreeNode root = (TreeNode) loadRoot(RESOURCE); - // // CDOResource resource = root.cdoGetResource(); - // IOCLHelper helper = CDOHelperUtil.createOCLHelper(); - // helper.setContext(root); - // - // try - // { - // Set result = (Set) helper.evaluate(root, "ExtendedNode.allInstances()"); - // assertEquals(3, result.size()); - // } - // catch (Exception ex) - // { - // ex.printStackTrace(); - // fail("Parse failed: " + ex.getLocalizedMessage()); - // } - // } - // - // public void testTreeNodeExtent() throws Exception - // { - // final String RESOURCE = "/test/res"; - // - // { // Create CDO resource - // TreeNode root = createNode("root"); - // TreeNode a = createNode("a", root); - // TreeNode b = createNode("b", root); - // TreeNode c = createNode("c", root); - // createNode("a1", a); - // createNode("b1", b); - // createNode("c1", c); - // createExtended("a2", a); - // createExtended("b2", b); - // createExtended("c2", c); - // saveRoot(root, RESOURCE); - // } - // - // TreeNode root = (TreeNode) loadRoot(RESOURCE); - // // CDOResource resource = root.cdoGetResource(); - // IOCLHelper helper = CDOHelperUtil.createOCLHelper(); - // helper.setContext(root); - // - // try - // { - // Set result = (Set) helper.evaluate(root, "TreeNode.allInstances()"); - // assertEquals(10, result.size()); - // } - // catch (Exception ex) - // { - // ex.printStackTrace(); - // fail("Parse failed: " + ex.getLocalizedMessage()); - // } - // } + public void testNotEmpty() throws Exception + { + final String RESOURCE = "/test/res"; + final String ROOT = "root"; + final String[] CHILDREN = { "a", "b", "c"}; + final String EXPR = "self.children->isEmpty()"; + + { // Create CDO resource + TreeNode root = createNode(ROOT); + createChildren(CHILDREN, root); + saveRoot(root, RESOURCE); + } + + TreeNode root = (TreeNode) loadRoot(RESOURCE); + IOCLHelper helper = HelperUtil.createOCLHelper(); + helper.setContext(root); + + try + { + Object result = helper.evaluate(root, EXPR); + assertFalse(result); + } + catch (Exception ex) + { + ex.printStackTrace(); + fail("Parse failed: " + ex.getLocalizedMessage()); + } + } + + public void testEmpty() throws Exception + { + final String RESOURCE = "/test/res"; + final String ROOT = "root"; + final String EXPR = "self.children->isEmpty()"; + + { // Create CDO resource + TreeNode root = createNode(ROOT); + saveRoot(root, RESOURCE); + } + + TreeNode root = (TreeNode) loadRoot(RESOURCE); + IOCLHelper helper = HelperUtil.createOCLHelper(); + helper.setContext(root); + + try + { + Object result = helper.evaluate(root, EXPR); + assertTrue(result); + } + catch (Exception ex) + { + ex.printStackTrace(); + fail("Parse failed: " + ex.getLocalizedMessage()); + } + } + + public void testExtendedNodeExtent() throws Exception + { + final String RESOURCE = "/test/res"; + + { // Create CDO resource + TreeNode root = createNode("root"); + TreeNode a = createNode("a", root); + TreeNode b = createNode("b", root); + TreeNode c = createNode("c", root); + createNode("a1", a); + createNode("b1", b); + createNode("c1", c); + createExtended("a2", a); + createExtended("b2", b); + createExtended("c2", c); + saveRoot(root, RESOURCE); + } + + TreeNode root = (TreeNode) loadRoot(RESOURCE); + // CDOResource resource = root.cdoGetResource(); + IOCLHelper helper = CDOHelperUtil.createOCLHelper(); + helper.setContext(root); + + try + { + Set result = (Set) helper.evaluate(root, "ExtendedNode.allInstances()"); + assertEquals(3, result.size()); + } + catch (Exception ex) + { + ex.printStackTrace(); + fail("Parse failed: " + ex.getLocalizedMessage()); + } + } + + public void testTreeNodeExtent() throws Exception + { + final String RESOURCE = "/test/res"; + + { // Create CDO resource + TreeNode root = createNode("root"); + TreeNode a = createNode("a", root); + TreeNode b = createNode("b", root); + TreeNode c = createNode("c", root); + createNode("a1", a); + createNode("b1", b); + createNode("c1", c); + createExtended("a2", a); + createExtended("b2", b); + createExtended("c2", c); + saveRoot(root, RESOURCE); + } + + TreeNode root = (TreeNode) loadRoot(RESOURCE); + // CDOResource resource = root.cdoGetResource(); + IOCLHelper helper = CDOHelperUtil.createOCLHelper(); + helper.setContext(root); + + try + { + Set result = (Set) helper.evaluate(root, "TreeNode.allInstances()"); + assertEquals(10, result.size()); + } + catch (Exception ex) + { + ex.printStackTrace(); + fail("Parse failed: " + ex.getLocalizedMessage()); + } + } public void testExtentTwoResources() throws Exception { |