Migrate test suites in org.eclipse.ui.tests to JUnit 5

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/internal/ide/DirectoryProposalContentAssistTestSuite.java

@@ -13,11 +13,13 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.ide;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ DirectoryProposalContentAssistTest.class })
+@Suite
+@SelectClasses({ //
+		DirectoryProposalContentAssistTest.class //
+})
 public class DirectoryProposalContentAssistTestSuite {
 
 }

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java

@@ -58,56 +58,56 @@
 import org.eclipse.ui.tests.systeminplaceeditor.OpenSystemInPlaceEditorTest;
 import org.eclipse.ui.tests.themes.ThemesTestSuite;
 import org.eclipse.ui.tests.zoom.ZoomTestSuite;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * Test all areas of the UI.
  */
-@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,
-	PluginActivationTests.class,
-	ProgressTestSuite.class,
-	PropertySheetTestSuite.class,
-	AdaptableTestSuite.class,
-	MultiPageEditorTestSuite.class,
-	CommandsTestSuite.class,
-	ContextsTestSuite.class,
-	ConcurrencyTestSuite.class,
-	FilteredTableTests.class,
-	FilteredTreeTests.class,
-	PatternFilterTest.class,
-	StatusHandlingTestSuite.class,
-	MenusTestSuite.class,
-	QuickAccessTestSuite.class,
-	FilteredResourcesSelectionDialogTestSuite.class,
-	DirectoryProposalContentAssistTestSuite.class,
-	InternalTestSuite.class,
-	LeaksTestSuite.class,
-	StyledStringHighlighterTest.class,
-	ZoomTestSuite.class,
-	DynamicPluginsTestSuite.class,
-	IntroTestSuite.class,
-	MultiEditorTestSuite.class,
-	OpenSystemInPlaceEditorTest.class,
-	WorkbenchDatabindingTest.class,
-	ChooseWorkspaceDialogTests.class,
-	ViewerItemsLimitTest.class,
-	OpenCloseTest.class
+@Suite
+@SelectClasses({ //
+		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, //
+		PluginActivationTests.class, //
+		ProgressTestSuite.class, //
+		PropertySheetTestSuite.class, //
+		AdaptableTestSuite.class, //
+		MultiPageEditorTestSuite.class, //
+		CommandsTestSuite.class, //
+		ContextsTestSuite.class, //
+		ConcurrencyTestSuite.class, //
+		FilteredTableTests.class, //
+		FilteredTreeTests.class, //
+		PatternFilterTest.class, //
+		StatusHandlingTestSuite.class, //
+		MenusTestSuite.class, //
+		QuickAccessTestSuite.class, //
+		FilteredResourcesSelectionDialogTestSuite.class, //
+		DirectoryProposalContentAssistTestSuite.class, //
+		InternalTestSuite.class, //
+		LeaksTestSuite.class, //
+		StyledStringHighlighterTest.class, //
+		ZoomTestSuite.class, //
+		DynamicPluginsTestSuite.class, //
+		IntroTestSuite.class, //
+		MultiEditorTestSuite.class, //
+		OpenSystemInPlaceEditorTest.class, //
+		WorkbenchDatabindingTest.class, //
+		ChooseWorkspaceDialogTests.class, //
+		ViewerItemsLimitTest.class, //
+		OpenCloseTest.class, //
 })
 public class UiTestSuite {
 }

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/ActivitiesTestSuite.java

@@ -14,22 +14,22 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.activities;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * The ActivitiesTestSuite class runs the activities' test suites.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-	ImagesTest.class,
-	UtilTest.class,
-	StaticTest.class,
-	DynamicTest.class,
-	PersistanceTest.class,
-	ActivityPreferenceTest.class,
-	MenusTest.class,
-	PatternUtilTest.class
+@Suite
+@SelectClasses({ //
+		ImagesTest.class, //
+		UtilTest.class, //
+		StaticTest.class, //
+		DynamicTest.class, //
+		PersistanceTest.class, //
+		ActivityPreferenceTest.class, //
+		MenusTest.class, //
+		PatternUtilTest.class //
 })
 public class ActivitiesTestSuite {
 

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/adaptable/AdaptableTestSuite.java

@@ -13,19 +13,18 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.adaptable;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 /**
- * The AdaptableTestSuite is the TestSuite for the
- * adaptable support in the UI.
+ * The AdaptableTestSuite is the TestSuite for the adaptable support in the UI.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-	AdaptableDecoratorTestCase.class,
-	MarkerImageProviderTest.class,
-	WorkingSetTestCase.class,
-	SelectionAdapterTest.class,
+@Suite
+@SelectClasses({ //
+		AdaptableDecoratorTestCase.class, //
+		MarkerImageProviderTest.class, //
+		WorkingSetTestCase.class, //
+		SelectionAdapterTest.class, //
 })
 public class AdaptableTestSuite {
 }

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/ApiTestSuite.java

@@ -25,67 +25,67 @@
 import org.eclipse.ui.tests.ide.api.FileEditorInputTest;
 import org.eclipse.ui.tests.ide.api.IDETest;
 import org.eclipse.ui.tests.ide.api.IDETest2;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@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,
-	 SelectionListenerFactoryTest.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,
-	 IDETest2.class,
-	 IEditorMatchingStrategyTest.class,
-	 XMLMementoTest.class,
-	 IWorkbenchPartTestableTests.class,
-	 ArbitraryPropertyTest.class,
-	 LifecycleViewTest.class,
-	 DependencyInjectionViewTest.class,
-	 Bug407422Test.class,
-	 MultipleWindowsTest.class,
-	 Bug543609Test.class,
-	 SaveablesListTest.class,
-	 PerspectiveExtensionReaderTest.class,
-	 ModeledPageLayoutTest.class,
-	 WorkbenchPluginTest.class,
-	 CloseAllHandlerTest.class
+@Suite
+@SelectClasses({ //
+		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, //
+		SelectionListenerFactoryTest.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, //
+		IDETest2.class, //
+		IEditorMatchingStrategyTest.class, //
+		XMLMementoTest.class, //
+		IWorkbenchPartTestableTests.class, //
+		ArbitraryPropertyTest.class, //
+		LifecycleViewTest.class, //
+		DependencyInjectionViewTest.class, //
+		Bug407422Test.class, //
+		MultipleWindowsTest.class, //
+		Bug543609Test.class, //
+		SaveablesListTest.class, //
+		PerspectiveExtensionReaderTest.class, //
+		ModeledPageLayoutTest.class, //
+		WorkbenchPluginTest.class, //
+		CloseAllHandlerTest.class //
 })
 public class ApiTestSuite {
 

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/commands/CommandsTestSuite.java

@@ -14,32 +14,32 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.commands;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * Tests for all areas of command support for the platform.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-	CommandExecutionTest.class,
-	Bug73756Test.class,
-	Bug125792Test.class,
-	Bug417762Test.class,
-	CommandManagerTest.class,
-	CommandParameterTypeTest.class,
-	CommandSerializationTest.class,
-	HandlerActivationTest.class,
-	CommandCallbackTest.class,
-	CommandActionTest.class,
-	HelpContextIdTest.class,
-	StateTest.class,
-	CommandEnablementTest.class,
-	ActionDelegateProxyTest.class,
-	ToggleStateTest.class,
-	RadioStateTest.class,
-	WorkbenchStateTest.class,
-	E4CommandImageTest.class
+@Suite
+@SelectClasses({ //
+		CommandExecutionTest.class, //
+		Bug73756Test.class, //
+		Bug125792Test.class, //
+		Bug417762Test.class, //
+		CommandManagerTest.class, //
+		CommandParameterTypeTest.class, //
+		CommandSerializationTest.class, //
+		HandlerActivationTest.class, //
+		CommandCallbackTest.class, //
+		CommandActionTest.class, //
+		HelpContextIdTest.class, //
+		StateTest.class, //
+		CommandEnablementTest.class, //
+		ActionDelegateProxyTest.class, //
+		ToggleStateTest.class, //
+		RadioStateTest.class, //
+		WorkbenchStateTest.class, //
+		E4CommandImageTest.class //
 })
 public final class CommandsTestSuite {
 }