Bug 578297 - Modernize o.e.core.tests.runtime bundle Get rid of some useless suites methods. Change-Id: I066b0ce22f61f6526a294e2231557790d8fe2af8 Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.runtime/+/189819 Tested-by: Platform Bot <platform-bot@eclipse.org> Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/AllTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/AllTests.java
index 395954f..82a06af 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/AllTests.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/AllTests.java

@@ -13,36 +13,13 @@
  *******************************************************************************/
 package org.eclipse.core.tests.internal.preferences;
 
-import junit.framework.*;
 import org.eclipse.core.tests.runtime.*;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
-public class AllTests extends TestCase {
-	/**
-	 * AllTests constructor comment.
-	 */
-	public AllTests() {
-		super(null);
-	}
-
-	/**
-	 * AllTests constructor comment.
-	 * @param name java.lang.String
-	 */
-	public AllTests(String name) {
-		super(name);
-	}
-
-	@SuppressWarnings("deprecation") // the deprecated tests are testing deprecated functionality with intention
-	public static Test suite() {
-		TestSuite suite = new TestSuite(AllTests.class.getName());
-		suite.addTestSuite(EclipsePreferencesTest.class);
-		suite.addTestSuite(PreferencesServiceTest.class);
-		suite.addTestSuite(IScopeContextTest.class);
-		suite.addTest(TestBug388004.suite());
-		suite.addTest(TestBug380859.suite());
-		suite.addTestSuite(PreferenceExportTest.class);
-		suite.addTestSuite(PreferenceForwarderTest.class);
-		suite.addTestSuite(PreferencesTest.class);
-		return suite;
-	}
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ EclipsePreferencesTest.class, PreferencesServiceTest.class, IScopeContextTest.class,
+		TestBug388004.class, TestBug380859.class, PreferenceExportTest.class, PreferenceForwarderTest.class,
+		PreferencesTest.class })
+public class AllTests {
 }

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/AllTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/AllTests.java
index d7513b0..785fe0e 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/AllTests.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/AllTests.java

@@ -13,31 +13,11 @@
  *******************************************************************************/
 package org.eclipse.core.tests.internal.runtime;
 
-import junit.framework.*;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
-public class AllTests extends TestCase {
-	/**
-	 * AllTests constructor comment.
-	 * @param name java.lang.String
-	 */
-	public AllTests() {
-		super(null);
-	}
-
-	/**
-	 * AllTests constructor comment.
-	 * @param name java.lang.String
-	 */
-	public AllTests(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(AllTests.class.getName());
-		suite.addTestSuite(LogSerializationTest.class);
-		suite.addTestSuite(PlatformURLLocalTest.class);
-		suite.addTest(PlatformURLSessionTest.suite());
-		suite.addTest(FileLocatorTest.suite());
-		return suite;
-	}
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ LogSerializationTest.class, PlatformURLLocalTest.class, PlatformURLSessionTest.class,
+		FileLocatorTest.class })
+public class AllTests {
 }

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/FileLocatorTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/FileLocatorTest.java
index 593e10f..4bfcdc4 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/FileLocatorTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/FileLocatorTest.java

@@ -18,8 +18,6 @@
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
-import junit.framework.Test;
-import junit.framework.TestSuite;
 import org.eclipse.core.runtime.*;
 import org.eclipse.core.tests.harness.BundleTestingHelper;
 import org.eclipse.core.tests.harness.CoreTest;
@@ -36,10 +34,6 @@
 	private final static String lessSpecificPath = "/nl/aa/intro/messages.properties";
 	private final static String nonSpecificPath = "/intro/messages.properties";
 
-	public FileLocatorTest(String name) {
-		super(name);
-	}
-
 	public void testFileLocatorFind() throws IOException, BundleException {
 		Bundle bundle = BundleTestingHelper.installBundle("Plugin", RuntimeTestsPlugin.getContext(), RuntimeTestsPlugin.TEST_FILES_ROOT + "fileLocator/testFileLocator");
 		BundleTestingHelper.refreshPackages(RuntimeTestsPlugin.getContext(), new Bundle[] {bundle});
@@ -157,12 +151,4 @@
 		assertNotNull(hostBundle);
 		assertTrue(hostBundle.getSymbolicName().equals("fileLocatorTest.nl"));
 	}
-
-	public static Test suite() {
-		TestSuite sameSession = new TestSuite(FileLocatorTest.class.getName());
-		sameSession.addTest(new FileLocatorTest("testFileLocatorFind"));
-		sameSession.addTest(new FileLocatorTest("testFileLocatorGetBundleFile01"));
-		sameSession.addTest(new FileLocatorTest("testFileLocatorGetBundleFile02"));
-		return sameSession;
-	}
 }

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java
index 0ab2099..91b8520 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java

@@ -13,21 +13,11 @@
  *******************************************************************************/
 package org.eclipse.core.tests.runtime;
 
-import junit.framework.*;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
-public class AllTests extends TestCase {
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ PlatformTest.class })
+public class AllTests {
 
-	public AllTests() {
-		super(null);
-	}
-
-	public AllTests(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(AllTests.class.getName());
-		suite.addTestSuite(PlatformTest.class);
-		return suite;
-	}
 }

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AutomatedTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AutomatedTests.java
index 132820f..bcbb2b0 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AutomatedTests.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AutomatedTests.java

@@ -13,38 +13,17 @@
  *******************************************************************************/
 package org.eclipse.core.tests.runtime;
 
-import junit.framework.*;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
- * Runs the sniff tests for the build. All tests listed here should
- * be automated.
+ * Runs the sniff tests for the build. All tests listed here should be
+ * automated.
  */
-public class AutomatedTests extends TestCase {
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ org.eclipse.core.tests.internal.runtime.AllTests.class,
+		org.eclipse.core.tests.runtime.AllTests.class, org.eclipse.core.tests.runtime.jobs.AllTests.class,
+		org.eclipse.core.tests.internal.preferences.AllTests.class })
+public class AutomatedTests {
 
-	public AutomatedTests() {
-		super(null);
-	}
-
-	public AutomatedTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * Add all of the AllTests suites for each package to be tested.
-	 */
-	public static Test suite() {
-		TestSuite suite = new TestSuite(AutomatedTests.class.getName());
-
-		// Moved to the top: bug 124867
-		suite.addTest(org.eclipse.core.tests.internal.runtime.AllTests.suite());
-
-		suite.addTest(org.eclipse.core.tests.runtime.AllTests.suite());
-		suite.addTest(org.eclipse.core.tests.runtime.jobs.AllTests.suite());
-		suite.addTest(org.eclipse.core.tests.internal.preferences.AllTests.suite());
-
-		// Moved to the top: bug 124867
-		//suite.addTest(org.eclipse.core.tests.internal.runtime.AllTests.suite());
-
-		return suite;
-	}
 }

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AllTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AllTests.java
index 50766a7..ad137c3 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AllTests.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AllTests.java

@@ -14,44 +14,19 @@
  *******************************************************************************/
 package org.eclipse.core.tests.runtime.jobs;
 
-import junit.framework.*;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Runs all job tests
  */
-public class AllTests extends TestCase {
-	public AllTests() {
-		super(null);
-	}
-
-	public AllTests(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(AllTests.class.getName());
-		suite.addTestSuite(YieldTest.class);
-		suite.addTestSuite(IJobManagerTest.class);
-		suite.addTestSuite(JobGroupTest.class);
-		suite.addTestSuite(JobQueueTest.class);
-		suite.addTestSuite(OrderedLockTest.class);
-		suite.addTestSuite(BeginEndRuleTest.class);
-		suite.addTestSuite(JobTest.class);
-		suite.addTestSuite(DeadlockDetectionTest.class);
-		suite.addTestSuite(Bug_129551.class);
-		suite.addTestSuite(Bug_211799.class);
-		suite.addTestSuite(Bug_307282.class);
-		suite.addTestSuite(Bug_307391.class);
-		suite.addTestSuite(MultiRuleTest.class);
-		suite.addTestSuite(Bug_311756.class);
-		suite.addTestSuite(Bug_311863.class);
-		suite.addTestSuite(Bug_316839.class);
-		suite.addTestSuite(Bug_320329.class);
-		suite.addTestSuite(Bug_478634.class);
-		suite.addTestSuite(Bug_550738.class);
-		suite.addTestSuite(Bug_574883.class);
-		suite.addTest(Bug_412138.suite());
-		suite.addTestSuite(WorkerPoolTest.class);
-		return suite;
-	}
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+		YieldTest.class, IJobManagerTest.class, JobGroupTest.class, JobQueueTest.class, OrderedLockTest.class,
+		BeginEndRuleTest.class, JobTest.class, DeadlockDetectionTest.class, Bug_129551.class, Bug_211799.class,
+		Bug_307282.class, Bug_307391.class, MultiRuleTest.class, Bug_311756.class, Bug_311863.class, Bug_316839.class,
+		Bug_320329.class, Bug_478634.class, Bug_550738.class, Bug_574883.class, Bug_412138.class,
+		WorkerPoolTest.class
+})
+public class AllTests {
 }

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/BeginEndRuleTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/BeginEndRuleTest.java
index 43e6d64..8ed9d6a 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/BeginEndRuleTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/BeginEndRuleTest.java

@@ -13,7 +13,6 @@
  *******************************************************************************/
 package org.eclipse.core.tests.runtime.jobs;
 
-import junit.framework.TestSuite;
 import org.eclipse.core.runtime.*;
 import org.eclipse.core.runtime.jobs.*;
 import org.eclipse.core.tests.harness.FussyProgressMonitor;
@@ -50,21 +49,6 @@
 		}
 	}
 
-	public static TestSuite suite() {
-		return new TestSuite(BeginEndRuleTest.class);
-		//		TestSuite suite = new TestSuite();
-		//		suite.addTest(new BeginEndRuleTest("testComplexRuleStarting"));
-		//		return suite;
-	}
-
-	public BeginEndRuleTest() {
-		super();
-	}
-
-	public BeginEndRuleTest(String name) {
-		super(name);
-	}
-
 	public void testComplexRuleStarting() {
 		//test how the manager reacts when several different threads try to begin conflicting rules
 		final int NUM_THREADS = 3;
@@ -79,12 +63,14 @@
 		jobs[2] = new JobRuleRunner("ComplexJob3", new PathRule("/testComplexRuleStarting/B/C"), status, 2, NUM_REPEATS, true);
 
 		//schedule the jobs
-		for (Job job : jobs)
+		for (Job job : jobs) {
 			job.schedule();
+		}
 
 		//wait until all the jobs start
-		for (int i = 0; i < jobs.length; i++)
+		for (int i = 0; i < jobs.length; i++) {
 			TestBarrier.waitForStatus(status, i, TestBarrier.STATUS_START);
+		}
 
 		//all jobs should be running
 		//the status flag should be set to START
@@ -464,8 +450,9 @@
 		monitor.setCanceled(true);
 
 		TestBarrier.waitForStatus(status, TestBarrier.STATUS_DONE);
-		if (runner.exception != null)
+		if (runner.exception != null) {
 			fail("1.0", runner.exception);
+		}
 
 		//finally clear the rule
 		manager.endRule(rule);
@@ -665,8 +652,9 @@
 		JobChangeAdapter a = new JobChangeAdapter() {
 			@Override
 			public void running(org.eclipse.core.runtime.jobs.IJobChangeEvent event) {
-				if (event.getJob() == job)
+				if (event.getJob() == job) {
 					return;
+				}
 				count[0]++;
 			}
 		};

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_129551.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_129551.java
index ed2ec70..08e219a 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_129551.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_129551.java

@@ -13,7 +13,6 @@
  *******************************************************************************/
 package org.eclipse.core.tests.runtime.jobs;
 
-import junit.framework.TestSuite;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.core.tests.harness.TestBarrier;
 import org.eclipse.core.tests.harness.TestJob;
@@ -37,8 +36,9 @@
 		@Override
 		public boolean shouldRun() {
 			//skip everything if the test is already done
-			if (!shouldSleep[0])
+			if (!shouldSleep[0]) {
 				return true;
+			}
 			barrier.setStatus(TestBarrier.STATUS_RUNNING);
 			//wait for blocking jobs to queue up
 			barrier.waitForStatus(TestBarrier.STATUS_START);
@@ -53,17 +53,6 @@
 		}
 	}
 
-	public static TestSuite suite() {
-		return new TestSuite(Bug_129551.class);
-	}
-
-	public Bug_129551() {
-		super();
-	}
-
-	public Bug_129551(String name) {
-		super(name);
-	}
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
@@ -93,8 +82,9 @@
 		barrier.waitForStatus(TestBarrier.STATUS_DONE);
 
 		//check for failure
-		if (failure[0] != null)
+		if (failure[0] != null) {
 			fail(failure[0].getMessage());
+		}
 		//tell the job not to sleep this time around
 		shouldSleep[0] = false;
 		job.wakeUp();

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_550738.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_550738.java
index 800f8d8..c230f72 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_550738.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_550738.java

@@ -16,7 +16,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import junit.framework.TestSuite;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
@@ -67,18 +66,6 @@
 		}
 	}
 
-	public static TestSuite suite() {
-		return new TestSuite(Bug_550738.class);
-	}
-
-	public Bug_550738() {
-		super();
-	}
-
-	public Bug_550738(String name) {
-		super(name);
-	}
-
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();