Bug 474132 - [Tests] Move test suite of o.e.ui.tests and migrate progress jobs to JUnit 4

Migrate tests from ProgressTestSuite that extend TestCase directly and
the test suite itself.

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

6 files changed, 141 insertions, 152 deletions

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java
index 25d98b2a3e0..8ff144f9da0 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * 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
@@ -7,12 +7,10 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Red Hat Inc. - Bug 474132
  *******************************************************************************/
 package org.eclipse.ui.tests;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.eclipse.ui.tests.activities.ActivitiesTestSuite;
 import org.eclipse.ui.tests.api.ApiTestSuite;
 import org.eclipse.ui.tests.api.StartupTest;
@@ -28,59 +26,50 @@ import org.eclipse.ui.tests.preferences.PreferencesTestSuite;
 import org.eclipse.ui.tests.progress.ProgressTestSuite;
 import org.eclipse.ui.tests.services.ServicesTestSuite;
 import org.eclipse.ui.tests.themes.ThemesTestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Test all areas of the UI.
  */
-public class UiTestSuite extends TestSuite {
-
-	/**
-	 * Returns the suite. This is required to use the JUnit Launcher.
-	 */
-	public static Test suite() {
-		return new UiTestSuite();
-	}
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+	StartupTest.class,
+	UIAutomatedSuite.class,
+	ApiTestSuite.class,
+	NavigatorTestSuite.class,
+	DecoratorsTestSuite.class,
+	DataTransferTestSuite.class,
+	PreferencesTestSuite.class,
+	KeysTestSuite.class,
+	ActivitiesTestSuite.class,
+	ThemesTestSuite.class,
+	EncodingTestSuite.class,
+	OperationsTestSuite.class,
+	FieldAssistTestSuite.class,
+	ServicesTestSuite.class,
+	ProgressTestSuite.class
+})
+public class UiTestSuite {
 
-	/**
-	 * Construct the test suite.
-	 */
-	public UiTestSuite() {
-		// run the StartupTest first, since we need to check early that the
-		// tests
-		// run only after early startup has completed (bug 93518).
-		addTest(new TestSuite(StartupTest.class));
-		addTest(new UIAutomatedSuite());
-		addTest(new ApiTestSuite());
-		// addTest(new PropertySheetTestSuite());
-		// addTest(new QuickAccessTestSuite());
-		// addTest(new InternalTestSuite());
-		addTest(new NavigatorTestSuite());
-		addTest(new DecoratorsTestSuite());
-		// addTest(new AdaptableTestSuite());
-		// addTest(new ZoomTestSuite());
-		addTest(new DataTransferTestSuite());
-		addTest(new PreferencesTestSuite());
-		// addTest(new DynamicPluginsTestSuite());
-		addTest(new KeysTestSuite());
-		// addTest(new MultiPageEditorTestSuite());
-		addTest(new ActivitiesTestSuite());
-		// addTest(new CommandsTestSuite());
-		// addTest(new ContextsTestSuite());
-		// addTest(new DragTestSuite());
-		addTest(new ThemesTestSuite());
-		// addTest(new IntroTestSuite());
-		// addTest(new MenusTestSuite());
-		addTest(new EncodingTestSuite());
-		// addTest(new PresentationsTestSuite());
-		// addTest(new TestSuite(LeakTests.class));
-		// addTest(new ConcurrencyTestSuite());
-		addTest(new OperationsTestSuite());
-		addTest(new FieldAssistTestSuite());
-		// addTest(new MultiEditorTestSuite());
-		// addTest(new TestSuite(FilteredTreeTests.class));
-		addTest(new ServicesTestSuite());
-		// addTest(new StatusHandlingTestSuite());
-		// addTest(OpenSystemInPlaceEditorTest.suite());
-		addTest(new ProgressTestSuite());
-	}
+	// Not enabled tests:
+	// PropertySheetTestSuite.class,
+	// QuickAccessTestSuite.class,
+	// InternalTestSuite.class,
+	// AdaptableTestSuite.class,
+	// ZoomTestSuite.class,
+	// DynamicPluginsTestSuite.class,
+	// MultiPageEditorTestSuite.class,
+	// CommandsTestSuite.class,
+	// ContextsTestSuite.class,
+	// DragTestSuite.class,
+	// IntroTestSuite.class,
+	// MenusTestSuite.class,
+	// PresentationsTestSuite.class,
+	// LeakTests.class,
+	// ConcurrencyTestSuite.class,
+	// MultiEditorTestSuite.class,
+	// FilteredTreeTests.class,
+	// StatusHandlingTestSuite.class,
+	// OpenSystemInPlaceEditorTest..class,
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/JobInfoTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/JobInfoTest.java
index 9e63e8cfab2..b12f695a1dd 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/JobInfoTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/JobInfoTest.java
@@ -8,19 +8,23 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Martin W. Kirst <martin.kirst@s1998.tu-chemnitz.de> - jUnit test for Bug 361121 [Progress] DetailedProgressViewer's comparator violates its general contract
+ *     Red Hat Inc. - Bug 474132
  ******************************************************************************/
 
 package org.eclipse.ui.tests.progress;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.ui.internal.progress.JobInfo;
+import org.junit.Before;
+import org.junit.Test;
 
-public class JobInfoTest extends TestCase {
+public class JobInfoTest {
 
 
 	/**
@@ -42,11 +46,8 @@ public class JobInfoTest extends TestCase {
 
 	private List jobinfos = new ArrayList();
 
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@Override
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() throws Exception {
 		int counter = 0;
 		counter = createAndAddJobInfos(false, false, ABOUT_TO_RUN, counter);
 		counter = createAndAddJobInfos(false, true,  ABOUT_TO_RUN, counter);
@@ -79,6 +80,7 @@ public class JobInfoTest extends TestCase {
 	 * Test that {@link org.eclipse.ui.internal.progress.JobInfo#compareTo(Object)}
 	 * is valid implemented and complies to the interface method contract.
 	 */
+	@Test
 	public void testCompareToContractCompliance() {
 		for(int xi = 0; xi<this.jobinfos.size(); xi++) {
 			JobInfo x = (JobInfo) jobinfos.get(xi);
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/JobInfoTestOrdering.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/JobInfoTestOrdering.java
index bfd6cd62697..7d6ebe4f969 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/JobInfoTestOrdering.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/JobInfoTestOrdering.java
@@ -8,28 +8,28 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Martin W. Kirst <martin.kirst@s1998.tu-chemnitz.de> - jUnit test for Bug 361121 [Progress] DetailedProgressViewer's comparator violates its general contract
+ *     Red Hat Inc. - Bug 474132
  ******************************************************************************/
 
 package org.eclipse.ui.tests.progress;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.ui.internal.progress.JobInfo;
+import org.junit.Before;
+import org.junit.Test;
 
-public class JobInfoTestOrdering extends TestCase {
+public class JobInfoTestOrdering {
 
 	private List jobinfos = new ArrayList();
 
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@Override
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() throws Exception {
 		jobinfos.clear();
 		int counter = 0;
 		TestJob job;
@@ -73,6 +73,7 @@ public class JobInfoTestOrdering extends TestCase {
 	 * Test that checks when jobs sorted by their state, the running ones
 	 * are ordered to first place
 	 */
+	@Test
 	public void testJobStateOrdering() {
 		Collections.sort(jobinfos);
 		assertEquals(Job.RUNNING,  ((JobInfo)jobinfos.get(0)).getJob().getState());
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/ProgressAnimationItemTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/ProgressAnimationItemTest.java
index 76f0e608f89..d209ae65b50 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/ProgressAnimationItemTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/ProgressAnimationItemTest.java
@@ -7,10 +7,12 @@
  *
  * Contributors:
  *     Tasktop Technologies - initial API and implementation
- *     Red Hat Inc. - Bug 474127
+ *     Red Hat Inc. - Bugs 474127, 474132
  *******************************************************************************/
 package org.eclipse.ui.tests.progress;
 
+import static org.junit.Assert.assertEquals;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Collection;
@@ -30,19 +32,16 @@ import org.eclipse.ui.internal.progress.ProgressAnimationItem;
 import org.eclipse.ui.internal.progress.ProgressManager;
 import org.eclipse.ui.internal.progress.ProgressRegion;
 import org.eclipse.ui.progress.IProgressConstants;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
-import junit.framework.TestCase;
-
-public class ProgressAnimationItemTest extends TestCase {
+public class ProgressAnimationItemTest {
 	private Shell shell;
 	private ProgressAnimationItem animationItem;
 
-	public ProgressAnimationItemTest(String testName) {
-		super(testName);
-	}
-
-	@Override
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() {
 		Display display = PlatformUI.getWorkbench().getDisplay();
 		shell = new Shell(display);
 		shell.setSize(400, 300);
@@ -52,12 +51,13 @@ public class ProgressAnimationItemTest extends TestCase {
 		animationItem = createProgressAnimationItem(composite);
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
+	@After
+	public void tearDown() {
 		FinishedJobs.getInstance().clearAll();
 		shell.dispose();
 	}
 
+	@Test
 	public void testSingleJobRefreshOnce() throws Exception {
 		createAndScheduleJob();
 
@@ -66,6 +66,7 @@ public class ProgressAnimationItemTest extends TestCase {
 		assertSingleAccessibleListener();
 	}
 
+	@Test
 	public void testTwoJobsRefreshOnce() throws Exception {
 		createAndScheduleJob();
 		createAndScheduleJob();
@@ -75,6 +76,7 @@ public class ProgressAnimationItemTest extends TestCase {
 		assertSingleAccessibleListener();
 	}
 
+	@Test
 	public void testSingleJobRefreshTwice() throws Exception {
 		createAndScheduleJob();
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/ProgressTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/ProgressTestSuite.java
index 4ec449b1278..291c27a7dc6 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/ProgressTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/progress/ProgressTestSuite.java
@@ -7,12 +7,13 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Red Hat Inc. - Bug 474132
  ******************************************************************************/
 
 package org.eclipse.ui.tests.progress;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for the Progress View and related API
@@ -21,20 +22,14 @@ import junit.framework.TestSuite;
  * @author Prakash G.R. (grprakash@in.ibm.com)
  *
  */
-public class ProgressTestSuite extends TestSuite {
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ 
+	ProgressContantsTest.class, 
+	ProgressViewTests.class, 
+	JobInfoTest.class, 
+	JobInfoTestOrdering.class,
+	ProgressAnimationItemTest.class 
+})
+public class ProgressTestSuite {
 
-	/**
-	 * Returns the suite. This is required to use the JUnit Launcher.
-	 */
-	public static final Test suite() {
-		return new ProgressTestSuite();
-	}
-
-	public ProgressTestSuite() {
-		addTest(new TestSuite(ProgressContantsTest.class));
-		addTest(new TestSuite(ProgressViewTests.class));
-		addTest(new TestSuite(JobInfoTest.class));
-		addTest(new TestSuite(JobInfoTestOrdering.class));
-		addTest(new TestSuite(ProgressAnimationItemTest.class));
-	}
 }
diff --git a/tests/org.eclipse.ui.tests/UI Test Suite.launch b/tests/org.eclipse.ui.tests/UI Test Suite.launch
index 395c696b74d..4bf487e1e16 100644
--- a/tests/org.eclipse.ui.tests/UI Test Suite.launch
+++ b/tests/org.eclipse.ui.tests/UI Test Suite.launch
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<booleanAttribute key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION" value="true"/>

-<listAttribute key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS">

-<listEntry value="/org.eclipse.ui.win32/bin"/>

-<listEntry value="/org.eclipse.ui.workbench/bin"/>

-<listEntry value="/org.eclipse.ui.workbench.compatibility/bin"/>

-<listEntry value="/org.eclipse.ui/bin"/>

-<listEntry value="/org.eclipse.ui.views/bin"/>

-<listEntry value="/org.eclipse.ui.ide.application/bin"/>

-<listEntry value="/org.eclipse.core.commands/bin"/>

-<listEntry value="/org.eclipse.jface/bin"/>

-<listEntry value="/org.eclipse.ui.ide/bin"/>

-</listAttribute>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ui.tests.UiTestSuite"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ui.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms128m -Xmx512m"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<stringAttribute key="templateConfig" value=""/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<booleanAttribute key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION" value="true"/>
+<listAttribute key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS">
+<listEntry value="/org.eclipse.ui.win32/bin"/>
+<listEntry value="/org.eclipse.ui.workbench/bin"/>
+<listEntry value="/org.eclipse.ui.workbench.compatibility/bin"/>
+<listEntry value="/org.eclipse.ui/bin"/>
+<listEntry value="/org.eclipse.ui.views/bin"/>
+<listEntry value="/org.eclipse.ui.ide.application/bin"/>
+<listEntry value="/org.eclipse.core.commands/bin"/>
+<listEntry value="/org.eclipse.jface/bin"/>
+<listEntry value="/org.eclipse.ui.ide/bin"/>
+</listAttribute>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ui.tests.UiTestSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ui.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms128m -Xmx512m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value=""/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>