diff options
45 files changed, 62 insertions, 61 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java index 191b41733f..f839e5ca9b 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java @@ -32,7 +32,7 @@ public class AllTestsDawn extends AllTests { public static Test suite() { - return new AllTestsDawn().getTestSuite(AllTests.class.getName()); + return new AllTestsDawn().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java index dcc4a92a8f..f1733a2557 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java @@ -31,7 +31,7 @@ public class AllTestsDawnUI extends AllTests { public static Test suite() { - return new AllTestsDawnUI().getTestSuite(AllTests.class.getName()); + return new AllTestsDawnUI().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java index 587e237e45..887c443bb6 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBot.java @@ -24,7 +24,6 @@ import org.eclipse.emf.cdo.dawn.tests.ui.gmf.DawnCreationWizardSWTBotTest; import org.eclipse.emf.cdo.dawn.tests.ui.gmf.GMFLockingTest; import org.eclipse.emf.cdo.dawn.tests.ui.gmf.MultipleResourcesTest; import org.eclipse.emf.cdo.dawn.tests.ui.gmf.SimpleDiagramTest; -import org.eclipse.emf.cdo.tests.AllTests; import org.eclipse.emf.cdo.tests.config.IScenario; import org.eclipse.emf.cdo.tests.config.impl.ConfigTest; import org.eclipse.emf.cdo.tests.config.impl.ConfigTestSuite; @@ -41,7 +40,7 @@ public class AllTestsDawnUISWTBot extends ConfigTestSuite { public static Test suite() { - TestSuite testSuite = (TestSuite)new AllTestsDawnUISWTBot().getTestSuite(AllTests.class.getName()); + TestSuite testSuite = (TestSuite)new AllTestsDawnUISWTBot().getTestSuite(); // testSuite.addTest(new JUnit4TestAdapter(AllTestsDawnUISWTBotGMF.class)); return testSuite; } diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java index 980c0446fd..ad570d8c85 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/TCPConfigStarter.java @@ -27,7 +27,7 @@ public class TCPConfigStarter extends AllConfigs { public static Test suite() { - return new TCPConfigStarter().getTestSuite(AllConfigs.class.getName()); + return new TCPConfigStarter().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/AutomatedTests.java b/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/AutomatedTests.java index 48e810b947..0bfc1c5f13 100644 --- a/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/AutomatedTests.java +++ b/plugins/org.eclipse.emf.cdo.tests.all/src/org/eclipse/emf/cdo/tests/all/AutomatedTests.java @@ -24,10 +24,10 @@ public class AutomatedTests extends TestSuite { public static Test suite() { - TestSuite suite = new TestSuite("Automated Tests"); - suite.addTest(new AllTests().getTestSuite("MEMStore Tests")); - suite.addTest(new AllTestsDBH2All().getTestSuite("DBStore Tests")); - suite.addTest(new AllTestsDBH2Offline().getTestSuite("DBStore Offline Tests")); + TestSuite suite = new TestSuite(AutomatedTests.class.getName()); + suite.addTest(new AllTests().getTestSuite()); + suite.addTest(new AllTestsDBH2All().getTestSuite()); + suite.addTest(new AllTestsDBH2Offline().getTestSuite()); return suite; } } diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBDerby.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBDerby.java index 8e066825e4..6f60309b92 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBDerby.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBDerby.java @@ -22,7 +22,7 @@ public class AllTestsDBDerby extends DBConfigs { public static Test suite() { - return new AllTestsDBDerby().getTestSuite("CDO Tests (DBStore Derby Horizontal)"); + return new AllTestsDBDerby().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2All.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2All.java index 5973e08b79..03f772512a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2All.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2All.java @@ -23,7 +23,7 @@ public class AllTestsDBH2All extends DBConfigs { public static Test suite() { - return new AllTestsDBH2All().getTestSuite("CDO Tests (DBStore H2 All)"); + return new AllTestsDBH2All().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java index 58cf583b62..dd143b9c0c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Audit.java @@ -24,7 +24,7 @@ public class AllTestsDBH2Audit extends DBConfigs { public static Test suite() { - return new AllTestsDBH2Audit().getTestSuite("CDO Tests (DBStore H2 Horizontal)"); + return new AllTestsDBH2Audit().getTestSuite(); } public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent, IDGenerationLocation idGenerationLocation) diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java index e8fcdd5364..a9d0fc010c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2Branching.java @@ -23,7 +23,7 @@ public class AllTestsDBH2Branching extends DBConfigs { public static Test suite() { - return new AllTestsDBH2Branching().getTestSuite("CDO Tests (DBStore H2 Horizontal - branching mode)"); + return new AllTestsDBH2Branching().getTestSuite(); } public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent, IDGenerationLocation idGenerationLocation) diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2BranchingUUIDs.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2BranchingUUIDs.java index 0398114056..e30be306a5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2BranchingUUIDs.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2BranchingUUIDs.java @@ -22,7 +22,7 @@ public class AllTestsDBH2BranchingUUIDs extends DBConfigs { public static Test suite() { - return new AllTestsDBH2BranchingUUIDs().getTestSuite("CDO Tests (DBStore H2 Horizontal - branching mode, UUIDs)"); + return new AllTestsDBH2BranchingUUIDs().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java index 1adb183e45..d3688d3634 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBH2NonAudit.java @@ -23,7 +23,7 @@ public class AllTestsDBH2NonAudit extends DBConfigs { public static Test suite() { - return new AllTestsDBH2NonAudit().getTestSuite("CDO Tests (DBStore H2 Horizontal - non-audit mode)"); + return new AllTestsDBH2NonAudit().getTestSuite(); } public static void initConfigSuites(ConfigTestSuite suite, TestSuite parent, IDGenerationLocation idGenerationLocation) diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java index 9a636611be..f24482618b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldb.java @@ -27,7 +27,7 @@ public class AllTestsDBHsqldb extends DBConfigs { public static Test suite() { - return new AllTestsDBHsqldb().getTestSuite("CDO Tests (DBStore Hsql Horizontal)"); + return new AllTestsDBHsqldb().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldbNonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldbNonAudit.java index 3e57dd03b7..fc4e2f6688 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldbNonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBHsqldbNonAudit.java @@ -27,7 +27,7 @@ public class AllTestsDBHsqldbNonAudit extends DBConfigs { public static Test suite() { - return new AllTestsDBHsqldbNonAudit().getTestSuite("CDO Tests (DBStore Hsql Horizontal Non-audit)"); + return new AllTestsDBHsqldbNonAudit().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java index d06bc38642..060e484fab 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBMysql.java @@ -30,7 +30,7 @@ public class AllTestsDBMysql extends DBConfigs { public static Test suite() { - return new AllTestsDBMysql().getTestSuite("CDO Tests (DBStore MySql Horizontal)"); + return new AllTestsDBMysql().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java index f1727851c2..b91675e8fd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java @@ -24,14 +24,14 @@ import junit.framework.TestSuite; * <li>create databases cdodb1, authrepo, repo2 * </ol> * Database creation/removal is avoided because it takes too long and makes the test-suite impractical. - * + * * @author Victor Roldan Betancort */ public class AllTestsDBPsql extends DBConfigs { public static Test suite() { - return new AllTestsDBPsql().getTestSuite("CDO Tests (DBStore PSQL Horizontal)"); + return new AllTestsDBPsql().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBH2Offline.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBH2Offline.java index 67c1e0a3f4..55cfb29560 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBH2Offline.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBH2Offline.java @@ -39,7 +39,7 @@ public class AllTestsDBH2Offline extends DBConfigs { public static Test suite() { - return new AllTestsDBH2Offline().getTestSuite("CDO Tests (DBStore H2 Horizontal - offline mode)"); + return new AllTestsDBH2Offline().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBMysqlOffline.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBMysqlOffline.java index bc535b6e46..0e7676a76a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBMysqlOffline.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/offline/AllTestsDBMysqlOffline.java @@ -39,7 +39,7 @@ public class AllTestsDBMysqlOffline extends DBConfigs { public static Test suite() { - return new AllTestsDBMysqlOffline().getTestSuite("CDO Tests (DBStore Mysql Horizontal - offline mode)"); + return new AllTestsDBMysqlOffline().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/performance/AllPerformanceTestsH2NonAudit.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/performance/AllPerformanceTestsH2NonAudit.java index 6ab3eef220..89ef12d0a4 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/performance/AllPerformanceTestsH2NonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/performance/AllPerformanceTestsH2NonAudit.java @@ -4,7 +4,7 @@ * 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: * Stefan Winkler - initial API and implementation */ @@ -24,7 +24,7 @@ public class AllPerformanceTestsH2NonAudit extends AllPerformanceTests { public static Test suite() { - return new AllPerformanceTestsH2NonAudit().getTestSuite(AllPerformanceTestsH2NonAudit.class.getName()); + return new AllPerformanceTestsH2NonAudit().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF index 61e1c89756..7c556deaab 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.tests.db4o -Bundle-Version: 4.0.100.qualifier +Bundle-Version: 4.0.200.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.server.db4o;bundle-version="[4.0.0,5.0.0)" Bundle-Vendor: %providerName -Export-Package: org.eclipse.emf.cdo.tests.db4o;version="4.0.100";x-internal:=true +Export-Package: org.eclipse.emf.cdo.tests.db4o;version="4.0.200";x-internal:=true Bundle-Localization: plugin Import-Package: com.db4o;version="[7.4.0,8.0.0)", com.db4o.ext;version="[7.4.0,8.0.0)" diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4O.java b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4O.java index 331c325b36..a21d9b0cf6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4O.java +++ b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4O.java @@ -31,7 +31,7 @@ public class AllTestsDB4O extends AllConfigs { public static Test suite() { - return new AllTestsDB4O().getTestSuite("CDO Tests (DB4O)"); + return new AllTestsDB4O().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4OMem.java b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4OMem.java index c07b73ee1c..fd37df2e44 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4OMem.java +++ b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/AllTestsDB4OMem.java @@ -20,7 +20,7 @@ public class AllTestsDB4OMem extends AllTestsDB4O { public static Test suite() { - return new AllTestsDB4OMem().getTestSuite("CDO Tests (DB4OMem)"); + return new AllTestsDB4OMem().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java index 50195c56b2..e5062b5f9a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java @@ -64,7 +64,7 @@ public class AllTestsHibernate extends AllConfigs { public static Test suite() { - return new AllTestsHibernate().getTestSuite("CDO Tests (Hibernate)"); + return new AllTestsHibernate().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.lissome/src/org/eclipse/emf/cdo/tests/lissome/AllTestsLissome.java b/plugins/org.eclipse.emf.cdo.tests.lissome/src/org/eclipse/emf/cdo/tests/lissome/AllTestsLissome.java index 937d2c389e..40ca4b71cd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.lissome/src/org/eclipse/emf/cdo/tests/lissome/AllTestsLissome.java +++ b/plugins/org.eclipse.emf.cdo.tests.lissome/src/org/eclipse/emf/cdo/tests/lissome/AllTestsLissome.java @@ -22,7 +22,7 @@ public class AllTestsLissome extends AllConfigs { public static Test suite() { - return new AllTestsLissome().getTestSuite(AllConfigs.class.getName()); + return new AllTestsLissome().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF index 7f43f891d9..6a60aed4cc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.mongodb;singleton:=true -Bundle-Version: 4.0.100.qualifier +Bundle-Version: 4.0.200.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -20,5 +20,5 @@ Import-Package: com.mongodb;version="[2.0.0,3.0.0)", org.bson.io;version="[2.0.0,3.0.0)", org.bson.types;version="[2.0.0,3.0.0)", org.bson.util;version="[2.0.0,3.0.0)" -Export-Package: org.eclipse.emf.cdo.tests.mongodb;version="4.0.100";x-internal:=true, - org.eclipse.emf.cdo.tests.mongodb.bundle;version="4.0.100";x-internal:=true +Export-Package: org.eclipse.emf.cdo.tests.mongodb;version="4.0.200";x-internal:=true, + org.eclipse.emf.cdo.tests.mongodb.bundle;version="4.0.200";x-internal:=true diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/AllTestsMongoDB.java b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/AllTestsMongoDB.java index 3b65159a04..c7a18330fb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/AllTestsMongoDB.java +++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/AllTestsMongoDB.java @@ -29,7 +29,7 @@ public class AllTestsMongoDB extends AllConfigs { public static Test suite() { - return new AllTestsMongoDB().getTestSuite("CDO Tests (MongoDB)"); + return new AllTestsMongoDB().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java index 51bb399efe..368e6ce003 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyAudit.java @@ -21,7 +21,7 @@ public class AllTestsObjyAudit extends ObjyDBConfigs { public static Test suite() { - return new AllTestsObjyAudit().getTestSuite("CDO Tests (ObjectivityStore - audit mode)"); //$NON-NLS-1$ + return new AllTestsObjyAudit().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java index 468ec86cb9..95e3dd42b3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyBranching.java @@ -21,7 +21,7 @@ public class AllTestsObjyBranching extends ObjyDBConfigs { public static Test suite() { - return new AllTestsObjyBranching().getTestSuite("CDO Tests (ObjectivityStore - branching mode)"); //$NON-NLS-1$ + return new AllTestsObjyBranching().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java index 6218eafb46..dfb84c54af 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/AllTestsObjyNonAudit.java @@ -27,7 +27,7 @@ public class AllTestsObjyNonAudit extends ObjyDBConfigs { public static Test suite() { - return new AllTestsObjyNonAudit().getTestSuite("CDO Tests (ObjectivityStore - non-audit mode)"); //$NON-NLS-1$ + return new AllTestsObjyNonAudit().getTestSuite(); } @Override @@ -45,5 +45,4 @@ public class AllTestsObjyNonAudit extends ObjyDBConfigs // out ExternalReferenceTest and Bugzilla_259869_Test testClasses.remove(ExternalReferenceTest.class); } - } diff --git a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java index 72ffe06759..9a52fb1c5e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java +++ b/plugins/org.eclipse.emf.cdo.tests.objectivity/src/org/eclipse/emf/cdo/tests/objectivity/SampleTestsObjy.java @@ -33,7 +33,7 @@ public class SampleTestsObjy extends ObjyDBConfigs { public static Test suite() { - return new SampleTestsObjy().getTestSuite("CDO Tests (DBStoreRepositoryConfig Objectivity/DB)"); + return new SampleTestsObjy().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF index 9ad43147e8..cd45041b29 100644 --- a/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests.ui/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.ui;singleton:=true -Bundle-Version: 4.0.100.qualifier +Bundle-Version: 4.0.200.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -19,5 +19,5 @@ Require-Bundle: org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)";vis org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)" Eclipse-BuddyPolicy: -Export-Package: org.eclipse.emf.cdo.tests.ui;version="4.0.100";x-friends:="org.eclipse.emf.cdo.dawn.tests", - org.eclipse.emf.cdo.tests.ui.bundle;version="4.0.100";x-internal:=true +Export-Package: org.eclipse.emf.cdo.tests.ui;version="4.0.200";x-friends:="org.eclipse.emf.cdo.dawn.tests", + org.eclipse.emf.cdo.tests.ui.bundle;version="4.0.200";x-internal:=true diff --git a/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/AllTestsCDOUISWTBot.java b/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/AllTestsCDOUISWTBot.java index c4aaf6ab3c..f3a1fa7ddf 100644 --- a/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/AllTestsCDOUISWTBot.java +++ b/plugins/org.eclipse.emf.cdo.tests.ui/src/org/eclipse/emf/cdo/tests/ui/AllTestsCDOUISWTBot.java @@ -10,7 +10,6 @@ */ package org.eclipse.emf.cdo.tests.ui; -import org.eclipse.emf.cdo.tests.AllTests; import org.eclipse.emf.cdo.tests.config.IScenario; import org.eclipse.emf.cdo.tests.config.impl.ConfigTest; import org.eclipse.emf.cdo.tests.config.impl.ConfigTestSuite; @@ -22,15 +21,14 @@ import junit.framework.TestSuite; /** * This test suite should be executed as SWTBot test. - * + * * @author Martin Fluegge */ public class AllTestsCDOUISWTBot extends ConfigTestSuite { public static Test suite() { - TestSuite testSuite = (TestSuite)new AllTestsCDOUISWTBot().getTestSuite(AllTests.class.getName()); - return testSuite; + return new AllTestsCDOUISWTBot().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/AllUMLTests.java b/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/AllUMLTests.java index a34497c006..9f3a90b622 100644 --- a/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/AllUMLTests.java +++ b/plugins/org.eclipse.emf.cdo.tests.uml/src/org/eclipse/emf/cdo/tests/uml/AllUMLTests.java @@ -26,7 +26,7 @@ public class AllUMLTests extends ConfigTestSuite { public static Test suite() { - return new AllUMLTests().getTestSuite("All Tests for UML"); + return new AllUMLTests().getTestSuite(); } @Override 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 2572676a61..47d7dd81c5 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 @@ -20,7 +20,7 @@ public class AllTests extends AllConfigs { public static Test suite() { - return new AllTests().getTestSuite(AllConfigs.class.getName()); + return new AllTests().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMAudit.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMAudit.java index d2607e50ef..276b2b3b4d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMAudit.java @@ -20,7 +20,7 @@ public class AllTestsMEMAudit extends AllConfigs { public static Test suite() { - return new AllTestsMEMAudit().getTestSuite(AllConfigs.class.getName()); + return new AllTestsMEMAudit().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranches.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranches.java index 9e1e1a700e..5c1bdfa907 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranches.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranches.java @@ -20,7 +20,7 @@ public class AllTestsMEMBranches extends AllConfigs { public static Test suite() { - return new AllTestsMEMBranches().getTestSuite(AllConfigs.class.getName()); + return new AllTestsMEMBranches().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesSSL.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesSSL.java index 8922571fa3..9ea1377574 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesSSL.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesSSL.java @@ -20,7 +20,7 @@ public class AllTestsMEMBranchesSSL extends AllConfigs { public static Test suite() { - return new AllTestsMEMBranchesSSL().getTestSuite(AllConfigs.class.getName()); + return new AllTestsMEMBranchesSSL().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesTCP.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesTCP.java index fc3121e411..ed9e5abf36 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesTCP.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesTCP.java @@ -20,7 +20,7 @@ public class AllTestsMEMBranchesTCP extends AllConfigs { public static Test suite() { - return new AllTestsMEMBranchesTCP().getTestSuite(AllConfigs.class.getName()); + return new AllTestsMEMBranchesTCP().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesUUIDs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesUUIDs.java index bd995035b5..a2c7afae2e 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesUUIDs.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesUUIDs.java @@ -20,7 +20,7 @@ public class AllTestsMEMBranchesUUIDs extends AllConfigs { public static Test suite() { - return new AllTestsMEMBranchesUUIDs().getTestSuite(AllConfigs.class.getName()); + return new AllTestsMEMBranchesUUIDs().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMEmbedded.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMEmbedded.java index 28f924b725..374b06bffa 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMEmbedded.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMEmbedded.java @@ -22,7 +22,7 @@ public class AllTestsMEMEmbedded extends AllConfigs { public static Test suite() { - return new AllTestsMEMEmbedded().getTestSuite(AllConfigs.class.getName()); + return new AllTestsMEMEmbedded().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMLegacy.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMLegacy.java index f9e760ad31..d3885ec276 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMLegacy.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMLegacy.java @@ -20,7 +20,7 @@ public class AllTestsMEMLegacy extends AllConfigs { public static Test suite() { - return new AllTestsMEMLegacy().getTestSuite(AllConfigs.class.getName()); + return new AllTestsMEMLegacy().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMNonAudit.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMNonAudit.java index 299f078c32..e89cb857c1 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMNonAudit.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMNonAudit.java @@ -20,7 +20,7 @@ public class AllTestsMEMNonAudit extends AllConfigs { public static Test suite() { - return new AllTestsMEMNonAudit().getTestSuite(AllConfigs.class.getName()); + return new AllTestsMEMNonAudit().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMOffline.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMOffline.java index 57628e407c..0e1a2b557d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMOffline.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMOffline.java @@ -30,7 +30,7 @@ public class AllTestsMEMOffline extends AllConfigs { public static Test suite() { - return new AllTestsMEMOffline().getTestSuite(AllConfigs.class.getName()); + return new AllTestsMEMOffline().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java index ba5a645482..e644ca15eb 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTestSuite.java @@ -4,7 +4,7 @@ * 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 */ @@ -40,6 +40,11 @@ public abstract class ConfigTestSuite implements IConstants { } + public Test getTestSuite() + { + return getTestSuite(getClass().getName()); + } + public Test getTestSuite(String name) { TestSuite suite = new MainSuite(name); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java index 57cd8f0c27..c8de26e40a 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/defs/AllTestsCDODefs.java @@ -27,7 +27,7 @@ public class AllTestsCDODefs extends ConfigTestSuite { public static Test suite() { - return new AllTestsCDODefs().getTestSuite("CDO Defs Tests"); + return new AllTestsCDODefs().getTestSuite(); } @Override diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/AllPerformanceTestsMemStore.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/AllPerformanceTestsMemStore.java index c51b8fb50e..d37df3d366 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/AllPerformanceTestsMemStore.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/performance/AllPerformanceTestsMemStore.java @@ -4,7 +4,7 @@ * 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 */ @@ -26,7 +26,7 @@ public class AllPerformanceTestsMemStore extends AllPerformanceTests { public static Test suite() { - return new AllPerformanceTestsMemStore().getTestSuite(AllPerformanceTestsMemStore.class.getName()); + return new AllPerformanceTestsMemStore().getTestSuite(); } @Override |