Junit5 test suites updates

tests/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.core.filebuffers.tests;singleton:=true
-Bundle-Version: 3.13.500.qualifier
+Bundle-Version: 3.13.600.qualifier
 Bundle-Activator: org.eclipse.core.filebuffers.tests.FileBuffersTestPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Plugin.providerName
@@ -15,6 +15,8 @@ Require-Bundle:
  org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.text;bundle-version="[3.5.0,4.0.0)",
  org.junit;bundle-version="4.12.0"
+Import-Package: org.junit.jupiter.api,
+ org.junit.platform.suite.api
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Eclipse-BundleShape: dir
 Automatic-Module-Name: org.eclipse.core.filebuffers.tests

tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersTestSuite.java

@@ -15,18 +15,16 @@
 
 package org.eclipse.core.filebuffers.tests;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.api.SelectClasses;
 
 /**
  * Test Suite for org.eclipse.core.filebuffers.
  *
  * @since 3.0
  */
-@RunWith(Suite.class)
-@SuiteClasses({ FileBufferCreation.class,
+@Suite
+@SelectClasses({ FileBufferCreation.class,
 		FileBuffersForWorkspaceFiles.class,
 		FileBuffersForExternalFiles.class,
 		FileBuffersForLinkedFiles.class,
@@ -42,5 +40,5 @@
 		ResourceTextFileManagerDocCreationTests.class
 })
 public class FileBuffersTestSuite {
-	// see @SuiteClasses
+	// see @SelectClasses
 }

tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF

@@ -38,7 +38,9 @@ Export-Package: org.eclipse.e4.ui.tests.model.test,
 Bundle-ActivationPolicy: lazy
 Import-Package: jakarta.annotation,
  jakarta.inject,
- org.osgi.service.event
+ org.osgi.service.event,
+ org.junit.jupiter.api,
+ org.junit.platform.suite.api
 Eclipse-BundleShape: dir
 Automatic-Module-Name: org.eclipse.e4.ui.tests
 Require-Capability: eclipse.swt;filter:="(image.format=svg)"

tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/UIAllTests.java

@@ -56,15 +56,15 @@
 import org.eclipse.e4.ui.workbench.renderers.swt.TabStateHandlerTest;
 import org.eclipse.e4.ui.workbench.renderers.swt.ThemeDefinitionChangedHandlerTest;
 import org.eclipse.e4.ui.workbench.renderers.swt.ToolBarManagerRendererTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
 
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * All E4 UI-related tests
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 		StartupTestSuite.class,
 		UIEventTypesTest.class,
 		Bug299755Test.class,

tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/StartupTestSuite.java

@@ -15,11 +15,11 @@
 
 package org.eclipse.e4.ui.tests.application;
 
-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({ EModelServiceTest.class, EModelServiceFindTest.class, EModelServicePerspectiveFindTest.class,
+@Suite
+@SelectClasses({ EModelServiceTest.class, EModelServiceFindTest.class, EModelServicePerspectiveFindTest.class,
 		EModelServiceInsertTest.class, EPartServiceTest.class, ESelectionServiceTest.class, EventBrokerTest.class,
 		HeadlessContactsDemoTest.class, HeadlessPhotoDemoTest.class, UIEventsTest.class,
 })

tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jface.tests.databinding
-Bundle-Version: 1.12.700.qualifier
+Bundle-Version: 1.12.800.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
@@ -15,6 +15,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.jface.databinding,
  org.eclipse.jface.tests.databinding.conformance,
  org.eclipse.core.databinding.property
+Import-Package: org.junit.jupiter.api,
+ org.junit.platform.suite.api
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Eclipse-BundleShape: dir
 Automatic-Module-Name: org.eclipse.jface.tests.databinding

tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/BindingTestSuite.java

@@ -188,12 +188,12 @@
 import org.eclipse.jface.tests.internal.databinding.viewers.ViewerElementMapTest;
 import org.eclipse.jface.tests.internal.databinding.viewers.ViewerElementSetTest;
 import org.eclipse.jface.tests.internal.databinding.viewers.ViewerElementWrapperTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
 
-@RunWith(Suite.class)
-@SuiteClasses({ AbstractObservableListTest.class, AbstractObservableMapTest.class, AbstractObservableTest.class,
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+
+@Suite
+@SelectClasses({ AbstractObservableListTest.class, AbstractObservableMapTest.class, AbstractObservableTest.class,
 		AbstractObservableValueTest.class, AbstractStringToNumberValidatorTest.class, AbstractVetoableValueTest.class,
 		AggregateValidationStatusTest.class, AnonymousBeanValuePropertyTest.class, AnonymousPojoValuePropertyTest.class,
 		BeanPropertiesTest.class,

tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/BindingScenariosTestSuite.java

@@ -14,10 +14,8 @@
  *******************************************************************************/
 package org.eclipse.jface.tests.databinding.scenarios;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.api.SelectClasses;
 
 /**
  * To run this test suite, right-click and select "Run As JUnit Plug-in Test".
@@ -26,8 +24,8 @@
  * Mode" as the application to run. You can also run this class as an SWT
  * application.
  */
-@RunWith(Suite.class)
-@SuiteClasses({ ButtonControlScenario.class, ComboScenarios.class, ComboUpdatingTest.class, ComboViewerScenario.class,
+@Suite
+@SelectClasses({ ButtonControlScenario.class, ComboScenarios.class, ComboUpdatingTest.class, ComboViewerScenario.class,
 		CustomConverterScenarios.class, CustomScenarios.class, ListViewerScenario.class, MasterDetailScenarios.class,
 		NewTableScenarios.class, NPETestScenario.class, PropertyScenarios.class, SpinnerControlScenario.class,
 		TableScenarios.class, TextControlScenario.class })

tests/org.eclipse.jface.tests.notifications/META-INF/MANIFEST.MF

@@ -4,6 +4,8 @@ Bundle-Name: Jface notifications tests
 Bundle-SymbolicName: org.eclipse.jface.tests.notifications
 Bundle-Vendor: Eclipse.org
 Bundle-Version: 0.2.0.qualifier
+Import-Package: org.junit.jupiter.api,
+ org.junit.platform.suite.api
 Automatic-Module-Name: org.eclipse.jface.notifications.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.junit,

tests/org.eclipse.jface.tests.notifications/src/org/eclipse/jface/tests/notifications/AllTests.java

@@ -13,12 +13,11 @@
 
 package org.eclipse.jface.tests.notifications;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.api.SelectClasses;
 
-@RunWith(Suite.class)
-@SuiteClasses({ NotificationPopupTest.class })
+@Suite
+@SelectClasses({ NotificationPopupTest.class })
 public class AllTests {
 
 }

tests/org.eclipse.jface.tests/META-INF/MANIFEST.MF

@@ -11,7 +11,9 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
  org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.ui.tests.harness
-Import-Package: org.osgi.framework
+Import-Package: org.osgi.framework,
+ org.junit.jupiter.api,
+ org.junit.platform.suite.api
 Export-Package: org.eclipse.jface.tests.fieldassist;x-internal:=true,
  org.eclipse.jface.tests.preferences;x-internal:=true,
  org.eclipse.jface.tests.viewers;x-internal:=true

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/AllTests.java

@@ -23,12 +23,12 @@
 import org.eclipse.jface.tests.widgets.AllWidgetTests;
 import org.eclipse.jface.tests.window.AllWindowTests;
 import org.eclipse.jface.tests.wizards.WizardTestSuite;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
 
-@RunWith(Suite.class)
-@SuiteClasses({ AllActionTests.class, AllDialogTests.class, AllImagesTests.class, AllLabelProviderTests.class,
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+
+@Suite
+@SelectClasses({ AllActionTests.class, AllDialogTests.class, AllImagesTests.class, AllLabelProviderTests.class,
 		AllLayoutTests.class, AllPrefsTests.class, AllResourcesTests.class, AllViewersTests.class, AllWidgetTests.class,
 		AllWindowTests.class, DecoratingLabelProviderTests.class, FieldAssistTestSuite.class, WizardTestSuite.class })
 public class AllTests {

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/action/AllActionTests.java

@@ -14,11 +14,12 @@
 package org.eclipse.jface.tests.action;
 
 import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ ContributionItemTest.class, ToolBarManagerTest.class, CoolBarManagerTest.class,
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectClasses({ ContributionItemTest.class, ToolBarManagerTest.class, CoolBarManagerTest.class,
 		MenuManagerTest.class })
 public class AllActionTests {
 

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/AllDialogTests.java

@@ -14,11 +14,12 @@
 package org.eclipse.jface.tests.dialogs;
 
 import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ DialogTest.class, StatusDialogTest.class, DialogSettingsTest.class, InputDialogTest.class,
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectClasses({ DialogTest.class, StatusDialogTest.class, DialogSettingsTest.class, InputDialogTest.class,
 		TitleAreaDialogTest.class, SafeRunnableErrorTest.class, ProgressIndicatorStyleTest.class,
 		ProgressMonitorDialogTest.class, PlainMessageDialogTest.class })
 public class AllDialogTests {

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/fieldassist/FieldAssistTestSuite.java

@@ -14,14 +14,14 @@
 
 package org.eclipse.jface.tests.fieldassist;
 
-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 the platform operations support.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ // disabled, see bug 275393...
+@Suite
+@SelectClasses({ // disabled, see bug 275393...
 		// TextFieldAssistTests.class, ComboFieldAssistTests.class,
 		ControlDecorationTests.class, FieldAssistAPITests.class })
 public class FieldAssistTestSuite {

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/AllImagesTests.java

@@ -15,11 +15,12 @@
 package org.eclipse.jface.tests.images;
 
 import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ ImageRegistryTest.class, ResourceManagerTest.class, FileImageDescriptorTest.class,
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectClasses({ ImageRegistryTest.class, ResourceManagerTest.class, FileImageDescriptorTest.class,
 		UrlImageDescriptorTest.class, DecorationOverlayIconTest.class, DeferredImageDescriptorTest.class })
 public class AllImagesTests {
 

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/AllLabelProviderTests.java

@@ -1,11 +1,10 @@
 package org.eclipse.jface.tests.labelProviders;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.api.SelectClasses;
 
-@RunWith(Suite.class)
-@SuiteClasses({ ColorAndFontLabelProviderTest.class, //
+@Suite
+@SelectClasses({ ColorAndFontLabelProviderTest.class, //
 		ColorAndFontViewerLabelProviderTest.class, //
 		ColumnLabelProviderLambdaTest.class, //
 		CompositeLabelProviderTableTest.class, //

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingLabelProviderTests.java

@@ -14,11 +14,12 @@
 package org.eclipse.jface.tests.labelProviders;
 
 import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ CompositeLabelProviderTableTest.class, DecoratingLabelProviderTreePathTest.class,
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectClasses({ CompositeLabelProviderTableTest.class, DecoratingLabelProviderTreePathTest.class,
 		DecoratingLabelProviderTreeTest.class, ColorAndFontLabelProviderTest.class,
 		ColorAndFontViewerLabelProviderTest.class, DecoratingStyledCellLabelProviderTest.class,
 		IDecorationContextTest.class })

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/layout/AllLayoutTests.java

@@ -14,11 +14,12 @@
 package org.eclipse.jface.tests.layout;
 
 import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ GeometryTest.class, AbstractColumnLayoutTest.class, GridDataFactoryTest.class,
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectClasses({ GeometryTest.class, AbstractColumnLayoutTest.class, GridDataFactoryTest.class,
 		GridLayoutFactoryTest.class, TreeColumnLayoutTest.class })
 public class AllLayoutTests {
 

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/preferences/AllPrefsTests.java

@@ -14,11 +14,12 @@
 package org.eclipse.jface.tests.preferences;
 
 import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ //
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectClasses({ //
 		BooleanFieldEditorTest.class, //
 		StringFieldEditorTest.class, //
 		IntegerFieldEditorTest.class, //

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/resources/AllResourcesTests.java

@@ -15,11 +15,12 @@
 package org.eclipse.jface.tests.resources;
 
 import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ FontRegistryTest.class, JFaceResourcesTest.class })
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectClasses({ FontRegistryTest.class, JFaceResourcesTest.class })
 public class AllResourcesTests {
 
 	public static void main(String[] args) {

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/AllViewersTests.java

@@ -14,11 +14,12 @@
 package org.eclipse.jface.tests.viewers;
 
 import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ TreeSelectionTest.class, MultipleEqualElementsTreeViewerTest.class,
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectClasses({ TreeSelectionTest.class, MultipleEqualElementsTreeViewerTest.class,
 		LazySortedCollectionTest.class, TreeViewerTest.class, VirtualTreeViewerTest.class, SimpleTreeViewerTest.class,
 		SimpleTableViewerTest.class, SimpleVirtualLazyTreeViewerTest.class, VirtualLazyTreeViewerTest.class,
 		TableViewerTest.class, TreeViewerColumnTest.class, VirtualTableViewerTest.class,

tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/widgets/AllWidgetTests.java

@@ -10,12 +10,11 @@
  *******************************************************************************/
 package org.eclipse.jface.tests.widgets;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
+import org.junit.platform.suite.api.Suite;
+import org.junit.platform.suite.api.SelectClasses;
 
-@RunWith(Suite.class)
-@SuiteClasses({ TestUnitButtonFactory.class, //
+@Suite
+@SelectClasses({ TestUnitButtonFactory.class, //
 		TestUnitCompositeFactory.class, //
 		TestUnitControlFactory.class, //
 		TestUnitGroupFactory.class, //