Bug 474132 - [Tests] Move test suite of o.e.ui.tests and migrate

progress jobs to JUnit 4 

Change-Id: Ib132779316d135ca836af16437bcb62dfaf308ed
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

12 files changed, 202 insertions, 289 deletions

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/ActivitiesTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/ActivitiesTestSuite.java
index 5747c9ae60b..839564a6a52 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/ActivitiesTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/ActivitiesTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 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,34 +7,27 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Bug 474132
  *******************************************************************************/
 package org.eclipse.ui.tests.activities;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * The ActivitiesTestSuite class runs the activities' test suites.
  */
-public class ActivitiesTestSuite extends TestSuite {
-    /**
-     * Returns the suite. This is required to use the JUnit Launcher.
-     */
-    public static Test suite() {
-        return new ActivitiesTestSuite();
-    }
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+	ImagesTest.class,
+	UtilTest.class,
+    StaticTest.class,
+    DynamicTest.class,
+    PersistanceTest.class,
+    ActivityPreferenceTest.class,
+    MenusTest.class,
+    PatternUtilTest.class
+})
+public class ActivitiesTestSuite {
 
-    /**
-     * Construct the test suite.
-     */
-    public ActivitiesTestSuite() {
-      	addTest(new TestSuite(ImagesTest.class));
-		addTest(new TestSuite(UtilTest.class));
-        addTest(new TestSuite(StaticTest.class));
-        addTest(new TestSuite(DynamicTest.class));
-        addTest(new TestSuite(PersistanceTest.class));
-        addTest(new TestSuite(ActivityPreferenceTest.class));
-        addTest(new TestSuite(MenusTest.class));
-        addTest(new TestSuite(PatternUtilTest.class));
-    }
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ApiTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ApiTestSuite.java
index b71b14e6c63..2967910d947 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ApiTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ApiTestSuite.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Bug 474132
  *******************************************************************************/
 package org.eclipse.ui.tests.api;
 
@@ -17,72 +18,58 @@ import org.eclipse.ui.tests.api.workbenchpart.RawIViewPartTest;
 import org.eclipse.ui.tests.api.workbenchpart.ViewPartTitleTest;
 import org.eclipse.ui.tests.ide.api.FileEditorInputTest;
 import org.eclipse.ui.tests.ide.api.IDETest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+	 IPageLayoutTest.class,
+     PlatformUITest.class,
+     IWorkbenchTest.class,
+     IWorkbenchWindowTest.class,
+     IWorkbenchPageTest.class,
+     IDeprecatedWorkbenchPageTest.class,
+     IActionFilterTest.class,
+     IPageListenerTest.class,
+     IAggregateWorkingSetTest.class,
+     IPageServiceTest.class,
+     IPerspectiveRegistryTest.class,
+     IPerspectiveDescriptorTest.class,
+     IFileEditorMappingTest.class,
+     IEditorDescriptorTest.class,
+     IEditorRegistryTest.class,
+     IPerspectiveListenerTest.class,
+     IWorkbenchWindowActionDelegateTest.class,
+     IViewActionDelegateTest.class,
+     IViewSiteTest.class,
+     IEditorSiteTest.class,
+     IActionBarsTest.class,
+     IViewPartTest.class,
+     IEditorPartTest.class,
+     IEditorActionBarContributorTest.class,
+     IPartServiceTest.class,
+     ISelectionServiceTest.class,
+     IWorkingSetTest.class,
+     IWorkingSetManagerTest.class,
+     IWorkingSetElementAdapterTests.class,
+     MockWorkingSetTest.class,
+     Bug42616Test.class,
+     StickyViewTest.class,
+     EditorIconTest.class,
+     RawIViewPartTest.class,
+     ViewPartTitleTest.class,
+     OverriddenTitleTest.class,
+     UIJobTest.class,
+     Bug75118Test.class,
+     FileEditorInputTest.class,
+		IDETest.class,
+     IEditorMatchingStrategyTest.class,
+     XMLMementoTest.class,
+     //IWorkbenchPartTestableTests.class,
+     ArbitraryPropertyTest.class,
+     LifecycleViewTest.class,
+     Bug407422Test.class
+})
+public class ApiTestSuite {
 
-/**
- * Test all areas of the UI API.
- */
-public class ApiTestSuite extends TestSuite {
-
-    /**
-     * Returns the suite.  This is required to
-     * use the JUnit Launcher.
-     */
-    public static Test suite() {
-        return new ApiTestSuite();
-    }
-
-    /**
-     * Construct the test suite.
-     */
-    public ApiTestSuite() {
-        addTest(new TestSuite(IPageLayoutTest.class));
-        addTest(new TestSuite(PlatformUITest.class));
-        addTest(new TestSuite(IWorkbenchTest.class));
-        addTest(new TestSuite(IWorkbenchWindowTest.class));
-        addTest(new TestSuite(IWorkbenchPageTest.class));
-        addTest(new TestSuite(IDeprecatedWorkbenchPageTest.class));
-        addTest(new TestSuite(IActionFilterTest.class));
-        addTest(new TestSuite(IPageListenerTest.class));
-        addTest(new TestSuite(IAggregateWorkingSetTest.class));
-        addTest(new TestSuite(IPageServiceTest.class));
-        addTest(new TestSuite(IPerspectiveRegistryTest.class));
-        addTest(new TestSuite(IPerspectiveDescriptorTest.class));
-        addTest(new TestSuite(IFileEditorMappingTest.class));
-        addTest(new TestSuite(IEditorDescriptorTest.class));
-        addTest(new TestSuite(IEditorRegistryTest.class));
-        addTest(new TestSuite(IPerspectiveListenerTest.class));
-        addTest(new TestSuite(IWorkbenchWindowActionDelegateTest.class));
-        addTest(new TestSuite(IViewActionDelegateTest.class));
-        addTest(new TestSuite(IViewSiteTest.class));
-        addTest(new TestSuite(IEditorSiteTest.class));
-        addTest(new TestSuite(IActionBarsTest.class));
-        addTest(new TestSuite(IViewPartTest.class));
-        addTest(new TestSuite(IEditorPartTest.class));
-        addTest(new TestSuite(IEditorActionBarContributorTest.class));
-        addTest(new TestSuite(IPartServiceTest.class));
-        addTest(new TestSuite(ISelectionServiceTest.class));
-        addTest(new TestSuite(IWorkingSetTest.class));
-        addTest(new TestSuite(IWorkingSetManagerTest.class));
-        addTest(new TestSuite(IWorkingSetElementAdapterTests.class));
-        addTest(new TestSuite(MockWorkingSetTest.class));
-        addTest(new TestSuite(Bug42616Test.class));
-        addTest(new TestSuite(StickyViewTest.class));
-        addTest(new TestSuite(EditorIconTest.class));
-        addTest(new TestSuite(RawIViewPartTest.class));
-        addTest(new TestSuite(ViewPartTitleTest.class));
-        addTest(new TestSuite(OverriddenTitleTest.class));
-        addTest(new TestSuite(UIJobTest.class));
-        addTest(new TestSuite(Bug75118Test.class));
-        addTest(new TestSuite(FileEditorInputTest.class));
-		addTest(new TestSuite(IDETest.class));
-        addTest(new TestSuite(IEditorMatchingStrategyTest.class));
-        addTest(new TestSuite(XMLMementoTest.class));
-        //addTest(new TestSuite(IWorkbenchPartTestableTests.class));
-        addTest(new TestSuite(ArbitraryPropertyTest.class));
-        addTest(new TestSuite(LifecycleViewTest.class));
-        addTest(new TestSuite(Bug407422Test.class));
-    }
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIAutomatedSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIAutomatedSuite.java
index 3757ac44765..c6391649c69 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIAutomatedSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIAutomatedSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 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,42 +7,30 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Bug 474132
  *******************************************************************************/
 package org.eclipse.ui.tests.dialogs;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.eclipse.ui.tests.compare.UIComparePreferencesAuto;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
-/**
- * Test all areas of the UI.
- */
-public class UIAutomatedSuite extends TestSuite {
+import junit.framework.TestSuite;
 
-    /**
-     * Returns the suite.  This is required to
-     * use the JUnit Launcher.
-     */
-    public static Test suite() {
-        return new UIAutomatedSuite();
-    }
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+	UIDialogsAuto.class,
+	DeprecatedUIDialogsAuto.class,
+	UIWizardsAuto.class,
+	DeprecatedUIWizardsAuto.class,
+	UIPreferencesAuto.class,
+	UIComparePreferencesAuto.class,
+	DeprecatedUIPreferencesAuto.class,
+	UIMessageDialogsAuto.class,
+	UINewWorkingSetWizardAuto.class,
+	UIEditWorkingSetWizardAuto.class,
+	SearchPatternAuto.class,
+	UIFilteredResourcesSelectionDialogAuto.class })
+public class UIAutomatedSuite extends TestSuite {
 
-	/**
-	 * Construct the test suite.
-	 */
-	public UIAutomatedSuite() {
-		addTest(new TestSuite(UIDialogsAuto.class));
-		addTest(new TestSuite(DeprecatedUIDialogsAuto.class));
-		addTest(new TestSuite(UIWizardsAuto.class));
-		addTest(new TestSuite(DeprecatedUIWizardsAuto.class));
-		addTest(new TestSuite(UIPreferencesAuto.class));
-		addTest(new TestSuite(UIComparePreferencesAuto.class));
-		addTest(new TestSuite(DeprecatedUIPreferencesAuto.class));
-		addTest(new TestSuite(UIMessageDialogsAuto.class));
-		addTest(new TestSuite(UINewWorkingSetWizardAuto.class));
-		addTest(new TestSuite(UIEditWorkingSetWizardAuto.class));
-		addTest(new TestSuite(SearchPatternAuto.class));
-		addTest(new TestSuite(UIFilteredResourcesSelectionDialogAuto.class));
-	}
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/encoding/EncodingTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/encoding/EncodingTestSuite.java
index 033882a1d6e..22247fb3df2 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/encoding/EncodingTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/encoding/EncodingTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 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,34 +7,22 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Bug 474132
  *******************************************************************************/
 package org.eclipse.ui.tests.encoding;
 
-import junit.framework.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
 import junit.framework.TestSuite;
 
 /**
  * The EncodingTestSuite is the suite for encoding tests.
  */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+ EncodingTestCase.class
+})
 public class EncodingTestSuite extends TestSuite {
 
-	/**
-	 * Returns the suite.  This is required to
-	 * use the JUnit Launcher.
-	 * @return Test
-	 */
-	public static Test suite() {
-		return new EncodingTestSuite();
-	}
-
-	/**
-	 * Create the suite.
-	 */
-	public EncodingTestSuite() {
-		super();
-		addTest(new TestSuite(EncodingTestCase.class));
-	}
-
-
-
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/fieldassist/FieldAssistTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/fieldassist/FieldAssistTestSuite.java
index 3c8da739ab7..ff6c29520bd 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/fieldassist/FieldAssistTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/fieldassist/FieldAssistTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
+ * Copyright (c) 2005, 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,31 +7,24 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Bug 474132
  *******************************************************************************/
 
 package org.eclipse.ui.tests.fieldassist;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Tests for the platform operations support.
  */
-public class FieldAssistTestSuite extends TestSuite {
-	/**
-	 * Returns the suite. This is required to use the JUnit Launcher.
-	 */
-	public static final Test suite() {
-		return new FieldAssistTestSuite();
-	}
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+ FieldAssistAPITest.class
+//temporarily disabling tests, see bug 275393
+		// aComboContentAssistCommandAdapterTest.class,
+		// aTextContentAssistCommandAdapterTest.class
 
-	/**
-	 * Construct the test suite.
-	 */
-	public FieldAssistTestSuite() {
-		addTest(new TestSuite(FieldAssistAPITest.class));
-		// temporarily disabling tests, see bug 275393
-		// addTest(new TestSuite(ComboContentAssistCommandAdapterTest.class));
-		// addTest(new TestSuite(TextContentAssistCommandAdapterTest.class));
-	}
+})
+public class FieldAssistTestSuite {
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/KeysTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/KeysTestSuite.java
index 85b09b44920..fdaad0daac6 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/KeysTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/KeysTestSuite.java
@@ -10,53 +10,43 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.keys;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Tests for all areas of the key support for the platform.
  */
-public class KeysTestSuite extends TestSuite {
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+	BindingInteractionsTest.class,
+	BindingManagerTest.class,
+	BindingPersistenceTest.class,
+	// TODO This no longer works due to focus issues related to key bindings
+	//Bug36420Test.class,
+	Bug36537Test.class,
+	//		TODO Intermittent failure.  SWT Bug 44344.  XGrabPointer?
+	//		Bug40023Test.class,
+	Bug42024Test.class,
+	Bug42035Test.class,
+	//		TODO Logging piece of fix did not go in M4.
+	//		Bug42627Test.class,
+	Bug43168Test.class,
+	Bug43321Test.class,
+	Bug43538Test.class,
+	Bug43597Test.class,
+	Bug43610Test.class,
+	Bug43800Test.class,
+	KeysCsvTest.class,
+	//		TODO disabled since it refers to the Java builder and nature,
+	//      which are not available in an RCP build
+	//		Bug44460Test.class,
+	/* TODO disabled as it fails on the Mac.
+	 * Ctrl+S doesn't save the editor, and posting MOD1+S also doesn't seem to work.
+	 */
+	//Bug53489Test.class,
+	Bug189167Test.class,
+	KeysPreferenceModelTest.class
+ })
+public class KeysTestSuite {
 
-    /**
-     * Returns the suite. This is required to use the JUnit Launcher.
-     */
-    public static Test suite() {
-        return new KeysTestSuite();
-    }
-
-    /**
-     * Construct the test suite.
-     */
-    public KeysTestSuite() {
-    	super(KeysTestSuite.class.getName());
-    	addTest(new TestSuite(BindingInteractionsTest.class));
-    	addTest(new TestSuite(BindingManagerTest.class));
-        addTest(new TestSuite(BindingPersistenceTest.class));
-        // TODO This no longer works due to focus issues related to key bindings
-        //addTest(new TestSuite(Bug36420Test.class));
-        addTest(new TestSuite(Bug36537Test.class));
-        //		TODO Intermittent failure.  SWT Bug 44344.  XGrabPointer?
-        //		addTest(new TestSuite(Bug40023Test.class));
-        addTest(new TestSuite(Bug42024Test.class));
-        addTest(new TestSuite(Bug42035Test.class));
-        //		TODO Logging piece of fix did not go in M4.
-        //		addTest(new TestSuite(Bug42627Test.class));
-        addTest(new TestSuite(Bug43168Test.class));
-        addTest(new TestSuite(Bug43321Test.class));
-        addTest(new TestSuite(Bug43538Test.class));
-        addTest(new TestSuite(Bug43597Test.class));
-        addTest(new TestSuite(Bug43610Test.class));
-        addTest(new TestSuite(Bug43800Test.class));
-        addTest(new TestSuite(KeysCsvTest.class));
-        //		TODO disabled since it refers to the Java builder and nature,
-        //      which are not available in an RCP build
-        //		addTest(new TestSuite(Bug44460Test.class));
-        /* TODO disabled as it fails on the Mac.
-         * Ctrl+S doesn't save the editor, and posting MOD1+S also doesn't seem to work.
-         */
-        //addTest(new TestSuite(Bug53489Test.class));
-        addTest(new TestSuite(Bug189167Test.class));
-        addTest(new TestSuite(KeysPreferenceModelTest.class));
-    }
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java
index 37c3065a765..abe9eef49eb 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2006 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,29 +7,18 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Bug 474132
  *******************************************************************************/
 package org.eclipse.ui.tests.navigator;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class NavigatorTestSuite extends TestSuite {
-
-    /**
-     * Returns the suite.  This is required to
-     * use the JUnit Launcher.
-     */
-    public static Test suite() {
-        return new NavigatorTestSuite();
-    }
-
-    /**
-     * Construct the test suite.
-     */
-    public NavigatorTestSuite() {
-        addTest(new TestSuite(ResourceNavigatorTest.class));
-        addTest(new TestSuite(NavigatorTest.class));
-    }
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+	ResourceNavigatorTest.class,
+	NavigatorTest.class
+})
+public class NavigatorTestSuite  {
 }
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/operations/OperationsTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/operations/OperationsTestSuite.java
index 4ef696173e8..d893feb094c 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/operations/OperationsTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/operations/OperationsTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 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,32 +7,24 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Bug 474132
  *******************************************************************************/
 
 package org.eclipse.ui.tests.operations;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Tests for the platform operations support.
  */
-public class OperationsTestSuite extends TestSuite {
-	/**
-	 * Returns the suite. This is required to use the JUnit Launcher.
-	 */
-	public static final Test suite() {
-		return new OperationsTestSuite();
-	}
-
-	/**
-	 * Construct the test suite.
-	 */
-	public OperationsTestSuite() {
-		addTest(new TestSuite(OperationsAPITest.class));
-		addTest(new TestSuite(WorkbenchOperationHistoryTests.class));
-		addTest(new TestSuite(MultiThreadedOperationsTests.class));
-		addTest(new TestSuite(WorkbenchOperationStressTests.class));
-		addTest(new TestSuite(WorkspaceOperationsTests.class));
-	}
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+	OperationsAPITest.class,
+	WorkbenchOperationHistoryTests.class,
+	MultiThreadedOperationsTests.class,
+	WorkbenchOperationStressTests.class,
+	WorkspaceOperationsTests.class
+})
+public class OperationsTestSuite {
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/preferences/PreferencesTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/preferences/PreferencesTestSuite.java
index bf9e2a029ea..ff64f1e2f19 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/preferences/PreferencesTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/preferences/PreferencesTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 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,36 +7,26 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Bug 474132
  *******************************************************************************/
 package org.eclipse.ui.tests.preferences;
 
 import org.eclipse.ui.tests.propertyPages.PropertyPageEnablementTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Test suite for preferences.
  */
-public class PreferencesTestSuite extends TestSuite {
-
-	/**
-	 * Returns the suite. This is required to use the JUnit Launcher.
-	 */
-	public static Test suite() {
-		return new PreferencesTestSuite();
-	}
 
-	/**
-	 * Construct the test suite.
-	 */
-	public PreferencesTestSuite() {
-		addTest(new TestSuite(FontPreferenceTestCase.class));
-		addTest(new TestSuite(DeprecatedFontPreferenceTestCase.class));
-		addTest(new TestSuite(ScopedPreferenceStoreTestCase.class));
-		addTest(new TestSuite(WorkingCopyPreferencesTestCase.class));
-		addTest(new TestSuite(PropertyPageEnablementTest.class));
-		addTest(new TestSuite(ListenerRemovalTestCase.class));
-		addTest(new TestSuite(PreferencesDialogTest.class));
-	}
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+	FontPreferenceTestCase.class,
+	DeprecatedFontPreferenceTestCase.class,
+	ScopedPreferenceStoreTestCase.class,
+	WorkingCopyPreferencesTestCase.class,
+	PropertyPageEnablementTest.class,
+	ListenerRemovalTestCase.class,
+	PreferencesDialogTest.class})
+public class PreferencesTestSuite {
 }
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 291c27a7dc6..1d0ea5dc935 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
@@ -23,12 +23,12 @@ import org.junit.runners.Suite;
  *
  */
 @RunWith(Suite.class)
-@Suite.SuiteClasses({ 
-	ProgressContantsTest.class, 
-	ProgressViewTests.class, 
-	JobInfoTest.class, 
+@Suite.SuiteClasses({
+	ProgressContantsTest.class,
+	ProgressViewTests.class,
+	JobInfoTest.class,
 	JobInfoTestOrdering.class,
-	ProgressAnimationItemTest.class 
+	ProgressAnimationItemTest.class
 })
 public class ProgressTestSuite {
 
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/ThemesTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/ThemesTestSuite.java
index 0dd96284543..e1cc347cd31 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/ThemesTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/ThemesTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2014 IBM Corporation and others.
+ * Copyright (c) 2004, 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,26 +7,26 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Lars Vogel <Lars.Vogel@vogella.com> - Bug 474132
  *******************************************************************************/
 package org.eclipse.ui.tests.themes;
 
-import junit.framework.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
 import junit.framework.TestSuite;
 
 /**
  * @since 3.0
  */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+	 ThemeAPITest.class,
+     JFaceThemeTest.class,
+     WorkbenchThemeChangedHandlerTest.class,
+     ThemeRegistryModifiedHandlerTest.class,
+     StylingPreferencesHandlerTest.class
+})
 public class ThemesTestSuite extends TestSuite {
 
-    public static Test suite() {
-        return new ThemesTestSuite();
-    }
-
-    public ThemesTestSuite() {
-        addTest(new TestSuite(ThemeAPITest.class));
-        addTest(new TestSuite(JFaceThemeTest.class));
-        addTest(new TestSuite(WorkbenchThemeChangedHandlerTest.class));
-        addTest(new TestSuite(ThemeRegistryModifiedHandlerTest.class));
-        addTest(new TestSuite(StylingPreferencesHandlerTest.class));
-    }
 }
diff --git a/tests/org.eclipse.ui.tests/UI Test Suite.launch b/tests/org.eclipse.ui.tests/UI Test Suite.launch
index 4bf487e1e16..e286f450657 100644
--- a/tests/org.eclipse.ui.tests/UI Test Suite.launch
+++ b/tests/org.eclipse.ui.tests/UI Test Suite.launch
@@ -31,6 +31,9 @@
 <listEntry value="1"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":1.0"/>
+</mapAttribute>
 <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=""/>