Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-08-24 15:50:47 -0400
committerEike Stepper2006-08-24 15:50:47 -0400
commitec28140a0612cd90ebd72a0016dcd9b7698573bd (patch)
tree3a997c45f7689e16f6fad0e2c13bd67b7fd0a5b3 /plugins/org.eclipse.emf.cdo.tests/src
parentb015a4b692743db6015f501b033fd600f25cfa42 (diff)
downloadcdo-ec28140a0612cd90ebd72a0016dcd9b7698573bd.tar.gz
cdo-ec28140a0612cd90ebd72a0016dcd9b7698573bd.tar.xz
cdo-ec28140a0612cd90ebd72a0016dcd9b7698573bd.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/AllSuites.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java1
2 files changed, 22 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllSuites.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllSuites.java
index 354db0b6fd..3fa460ccee 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllSuites.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllSuites.java
@@ -11,19 +11,18 @@
package org.eclipse.emf.cdo.tests;
+import org.eclipse.emf.cdo.tests.topology.ITopologyConstants;
+import org.eclipse.emf.cdo.tests.topology.TopologySuite;
+
import junit.framework.Test;
import junit.framework.TestSuite;
+
public class AllSuites extends TestSuite
{
- private static Test[] suites = new Test []{
- // list all test suites here
- org.eclipse.emf.cdo.tests.AllTests.suite()
- };
-
public static Test suite()
{
- return new AllSuites("cdo Build JUnit Test Suite");
+ return new AllSuites("CDO Build JUnit Test Suite");
}
public AllSuites()
@@ -46,9 +45,24 @@ public class AllSuites extends TestSuite
protected void populateSuite()
{
- for (int i = 0; i < suites.length; i++)
+ for (String mode : ITopologyConstants.ALL_SELF_CONTAINED_MODES)
{
- addTest(suites[i]);
+ TopologySuite topologySuite = new TopologySuite(mode);
+ Test[] suites = createPackageSuites();
+ for (int i = 0; i < suites.length; i++)
+ {
+ topologySuite.addTest(suites[i]);
+ }
+
+ addTest(topologySuite);
}
}
+
+ protected Test[] createPackageSuites()
+ {
+ return new Test[] { //
+ org.eclipse.emf.cdo.tests.AllTests.suite(), //
+ org.eclipse.emf.cdo.tests.model1.AllTests.suite() //
+ };
+ }
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java
index 1b7df5c3c0..1d26fc8df6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java
@@ -18,7 +18,6 @@ public class AllTests {
public static Test suite() {
TestSuite suite = new TestSuite("Test for org.eclipse.emf.cdo.tests");
-// TODO: add real JUnit tests here
suite.addTestSuite(SampleTest.class);
return suite;
}

Back to the top