[151560] Query Language for CDO

https://bugs.eclipse.org/bugs/show_bug.cgi?id=151560

3 files changed, 5 insertions, 40 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AllModel1EmbeddedTests.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AllModel1EmbeddedTests.java
deleted file mode 100644
index ea60db634e..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AllModel1EmbeddedTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- * 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.tests.topology.ITopologyConstants;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-public class AllModel1EmbeddedTests implements ITopologyConstants
-{
-  public static Test suite()
-  {
-    System.setProperty(CDO_TEST_MODE_KEY, EMBEDDED_MODE);
-    TestSuite suite = new TestSuite("Embedded Test for org.eclipse.emf.cdo.tests.model1");
-    suite.addTestSuite(BasicTest.class);
-    suite.addTestSuite(AdapterTest.class);
-    suite.addTestSuite(SerializationTest.class);
-    suite.addTestSuite(NotificationTest.class);
-    suite.addTestSuite(ExtentTest.class);
-    suite.addTestSuite(OCLTest.class);
-    suite.addTestSuite(Bugzilla154389Test.class);
-    return suite;
-  }
-}
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/AllTests.java
index ce132bf2d2..1489e3f15a 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/AllTests.java
@@ -15,7 +15,7 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 
-public class AllModel1Tests
+public class AllTests
 {
   public static Test suite()
   {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/NotificationTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/NotificationTest.java
index 3497f2069b..ea9858c853 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/NotificationTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/NotificationTest.java
@@ -26,7 +26,7 @@ public class NotificationTest extends AbstractModel1Test
     final String RESOURCE = "/test/res";
     final String ROOT = "root";
     final String NEW_ROOT = "new root";
-    final long TIME_LIMIT = 100;
+    final long TIME_LIMIT = 1000;
 
     // Client1 creates resource
     TreeNode root = createNode(ROOT);
@@ -60,7 +60,7 @@ public class NotificationTest extends AbstractModel1Test
     final String ROOT = "root";
     final String CHILD = "a";
     final String NEW_NAME = "a2";
-    final long TIME_LIMIT = 100;
+    final long TIME_LIMIT = 1000;
 
     // Client1 creates resource
     TreeNode root = createNode(ROOT);
@@ -96,7 +96,7 @@ public class NotificationTest extends AbstractModel1Test
     final String ROOT = "root";
     final String CHILD = "a";
     final String NEW_NAME = "a2";
-    final long TIME_LIMIT = 100;
+    final long TIME_LIMIT = 1000;
 
     // Client1 creates resource
     TreeNode root = createNode(ROOT);
@@ -133,7 +133,7 @@ public class NotificationTest extends AbstractModel1Test
     final String ROOT = "root";
     final String CHILD = "a";
     final String NEW_NAME = "a2";
-    final long TIME_LIMIT = 100;
+    final long TIME_LIMIT = 1000;
     final boolean[] notificationReceived = { false};
 
     // Client1 creates resource