Convert frameworkadmin.test bundle to JUnit 4.x.

Change-Id: I2667cfa1d0c8e0aaec10e7464d2289e061857e79
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

1 files changed, 37 insertions, 51 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java
index fb3932973..9e5893905 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java
@@ -14,59 +14,45 @@
  *******************************************************************************/
 package org.eclipse.equinox.p2.tests;
 
-import junit.framework.*;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
- * This is the master test suite for all automated provisioning tests. It runs every test
- * that is suitable for running in an automated fashion as part of a build. Some
- * tests may be excluded if they require special setup (such as generating metadata).
- * 
+ * This is the master test suite for all automated provisioning tests. It runs
+ * every test that is suitable for running in an automated fashion as part of a
+ * build. Some tests may be excluded if they require special setup (such as
+ * generating metadata).
+ *
  * PLEASE ADD SUITES IN THE PACKAGE NAME ORDER.
  */
-public class AutomatedTests extends TestCase {
-	public static Test suite() {
-		TestSuite suite = new TestSuite(AutomatedTests.class.getName());
-		suite.addTest(org.eclipse.equinox.p2.tests.publisher.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.frameworkadmin.tests.AllTests.suite());
-
-		suite.addTest(org.eclipse.equinox.p2.tests.ant.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.artifact.processors.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.artifact.repository.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.artifact.repository.processing.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.core.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.director.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.directorywatcher.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.engine.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.extensionlocation.AllTests.suite());
-		//org.eclipse.equinox.p2.tests.full - Off sequence
-		suite.addTest(org.eclipse.equinox.p2.tests.gc.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.generator.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.installer.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.jarprocessor.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.metadata.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.metadata.expression.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.metadata.repository.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.mirror.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.omniVersion.AllTests.suite());
-		//org.eclipse.equinox.p2.tests.perf -- Executed as part of the 
-		suite.addTest(org.eclipse.equinox.p2.tests.planner.AllTests.suite());
-		//org.eclipse.equinox.p2.tests.publisher.actions -- The tests found in this package are invoked from the publisher package 
-		suite.addTest(org.eclipse.equinox.p2.tests.ql.AllTests.suite());
-		//org.eclipse.equinox.p2.tests.reconciler.dropins -- Off sequence
-		suite.addTest(org.eclipse.equinox.p2.tests.repository.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.sat4j.smoke.AllTests.suite());
-		//org.eclipse.equinox.p2.tests.sharedinstall -- Off sequence
-		suite.addTest(org.eclipse.equinox.p2.tests.simpleconfigurator.SimpleConfiguratorTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.simpleconfigurator.manipulator.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.touchpoint.eclipse.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.touchpoint.natives.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.updatechecker.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.updatesite.AllTests.suite());
-
-		//Off sequence
-		suite.addTest(org.eclipse.equinox.p2.tests.reconciler.dropins.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.sharedinstall.AllTests.suite());
-		suite.addTest(org.eclipse.equinox.p2.tests.full.AllTests.suite());
-		return suite;
-	}
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ org.eclipse.equinox.p2.tests.publisher.AllTests.class,
+		org.eclipse.equinox.frameworkadmin.tests.AllTests.class,
+		org.eclipse.equinox.p2.tests.ant.AllTests.class,
+		org.eclipse.equinox.p2.tests.artifact.processors.AllTests.class,
+		org.eclipse.equinox.p2.tests.artifact.repository.AllTests.class,
+		org.eclipse.equinox.p2.tests.artifact.repository.processing.AllTests.class,
+		org.eclipse.equinox.p2.tests.core.AllTests.class, org.eclipse.equinox.p2.tests.director.AllTests.class,
+		org.eclipse.equinox.p2.tests.directorywatcher.AllTests.class,
+		org.eclipse.equinox.p2.tests.engine.AllTests.class,
+		org.eclipse.equinox.p2.tests.extensionlocation.AllTests.class, org.eclipse.equinox.p2.tests.gc.AllTests.class,
+		org.eclipse.equinox.p2.tests.generator.AllTests.class, org.eclipse.equinox.p2.tests.installer.AllTests.class,
+		org.eclipse.equinox.p2.tests.jarprocessor.AllTests.class,
+		org.eclipse.equinox.p2.tests.metadata.AllTests.class,
+		org.eclipse.equinox.p2.tests.metadata.expression.AllTests.class,
+		org.eclipse.equinox.p2.tests.metadata.repository.AllTests.class,
+		org.eclipse.equinox.p2.tests.mirror.AllTests.class, org.eclipse.equinox.p2.tests.omniVersion.AllTests.class,
+		org.eclipse.equinox.p2.tests.planner.AllTests.class, org.eclipse.equinox.p2.tests.ql.AllTests.class,
+		org.eclipse.equinox.p2.tests.repository.AllTests.class,
+		org.eclipse.equinox.p2.tests.sat4j.smoke.AllTests.class,
+		org.eclipse.equinox.p2.tests.simpleconfigurator.SimpleConfiguratorTests.class,
+		org.eclipse.equinox.p2.tests.simpleconfigurator.manipulator.AllTests.class,
+		org.eclipse.equinox.p2.tests.touchpoint.eclipse.AllTests.class,
+		org.eclipse.equinox.p2.tests.touchpoint.natives.AllTests.class,
+		org.eclipse.equinox.p2.tests.updatechecker.AllTests.class,
+		org.eclipse.equinox.p2.tests.updatesite.AllTests.class,
+		org.eclipse.equinox.p2.tests.reconciler.dropins.AllTests.class,
+		org.eclipse.equinox.p2.tests.sharedinstall.AllTests.class, org.eclipse.equinox.p2.tests.full.AllTests.class })
+public class AutomatedTests {
+	// SuiteClasses
 }