diff --git a/tests/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF index 75ae0c845b5..0a4aee17e26 100644 --- a/tests/org.eclipse.core.filebuffers.tests/META-INF/MANIFEST.MF +++ b/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 diff --git a/tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersTestSuite.java b/tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersTestSuite.java index 09f457ff43a..a8ca9063cb7 100644 --- a/tests/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersTestSuite.java +++ b/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 } diff --git a/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF index eabd82da410..135397f89e2 100644 --- a/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF +++ b/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)" diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/UIAllTests.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/UIAllTests.java index 9a754cd3dac..2b869853689 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/UIAllTests.java +++ b/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, diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/StartupTestSuite.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/StartupTestSuite.java index f800ca5d8f7..01e958cb3da 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/StartupTestSuite.java +++ b/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, }) diff --git a/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF b/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF index 0fb2b56238a..a6d9cba0518 100644 --- a/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF +++ b/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 diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/BindingTestSuite.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/BindingTestSuite.java index 2663aca4fba..dec2887e1a1 100644 --- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/BindingTestSuite.java +++ b/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, diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/BindingScenariosTestSuite.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/BindingScenariosTestSuite.java index f545ea76a6a..886df86df7e 100644 --- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/BindingScenariosTestSuite.java +++ b/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 }) diff --git a/tests/org.eclipse.jface.tests.notifications/META-INF/MANIFEST.MF b/tests/org.eclipse.jface.tests.notifications/META-INF/MANIFEST.MF index 2cf3771ec62..8eb16d10dcc 100644 --- a/tests/org.eclipse.jface.tests.notifications/META-INF/MANIFEST.MF +++ b/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, diff --git a/tests/org.eclipse.jface.tests.notifications/src/org/eclipse/jface/tests/notifications/AllTests.java b/tests/org.eclipse.jface.tests.notifications/src/org/eclipse/jface/tests/notifications/AllTests.java index 128d1795b19..8b232b0973f 100644 --- a/tests/org.eclipse.jface.tests.notifications/src/org/eclipse/jface/tests/notifications/AllTests.java +++ b/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 { } diff --git a/tests/org.eclipse.jface.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jface.tests/META-INF/MANIFEST.MF index 8c7811a6d06..8aec332ad81 100644 --- a/tests/org.eclipse.jface.tests/META-INF/MANIFEST.MF +++ b/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 diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/AllTests.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/AllTests.java index 59b670cf566..4d38018c2c4 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/AllTests.java +++ b/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 { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/action/AllActionTests.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/action/AllActionTests.java index 90a55a33072..af6efa208cb 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/action/AllActionTests.java +++ b/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 { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/AllDialogTests.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/AllDialogTests.java index 7083a3af7c6..89c89fe99d6 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/dialogs/AllDialogTests.java +++ b/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 { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/fieldassist/FieldAssistTestSuite.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/fieldassist/FieldAssistTestSuite.java index e3e71d3fb33..799792f9262 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/fieldassist/FieldAssistTestSuite.java +++ b/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 { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/AllImagesTests.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/AllImagesTests.java index 0934eb85b60..7761d2aa846 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/images/AllImagesTests.java +++ b/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 { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/AllLabelProviderTests.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/AllLabelProviderTests.java index a6973963b35..ec031ae5b67 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/AllLabelProviderTests.java +++ b/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, // diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingLabelProviderTests.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingLabelProviderTests.java index 62948d4f8ee..a52e431e908 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/labelProviders/DecoratingLabelProviderTests.java +++ b/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 }) diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/layout/AllLayoutTests.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/layout/AllLayoutTests.java index e20831b0fdc..d61447c8555 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/layout/AllLayoutTests.java +++ b/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 { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/preferences/AllPrefsTests.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/preferences/AllPrefsTests.java index 640c1f04557..18f658a8121 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/preferences/AllPrefsTests.java +++ b/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, // diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/resources/AllResourcesTests.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/resources/AllResourcesTests.java index d2a5da72ecb..9f29e3c86a0 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/resources/AllResourcesTests.java +++ b/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) { diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/AllViewersTests.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/AllViewersTests.java index a80a59a828c..5b6d9f7da94 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/viewers/AllViewersTests.java +++ b/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, diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/widgets/AllWidgetTests.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/widgets/AllWidgetTests.java index eec5d4fe7d1..1b3ea232e4d 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/widgets/AllWidgetTests.java +++ b/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, // diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/window/AllWindowTests.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/window/AllWindowTests.java index 12ebce018d4..55e74f7b7af 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/window/AllWindowTests.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/window/AllWindowTests.java @@ -15,11 +15,12 @@ package org.eclipse.jface.tests.window; 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({ // ApplicationWindowTest.class, // WindowTest.class, // }) diff --git a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/wizards/WizardTestSuite.java b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/wizards/WizardTestSuite.java index ee451cc0343..b8154f28091 100644 --- a/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/wizards/WizardTestSuite.java +++ b/tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/wizards/WizardTestSuite.java @@ -15,11 +15,12 @@ package org.eclipse.jface.tests.wizards; import org.junit.runner.JUnitCore; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({ ButtonAlignmentTest.class, WizardTest.class, WizardProgressMonitorTest.class }) +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + +@Suite +@SelectClasses({ ButtonAlignmentTest.class, WizardTest.class, WizardProgressMonitorTest.class }) public class WizardTestSuite { public static void main(String[] args) { diff --git a/tests/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF index 9a91f01f75d..35a9670c704 100644 --- a/tests/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.jface.text.tests -Bundle-Version: 3.13.1000.qualifier +Bundle-Version: 3.13.1100.qualifier Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin Export-Package: @@ -28,4 +28,6 @@ Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.jface.text.tests Import-Package: org.mockito, org.mockito.invocation, - org.mockito.stubbing + org.mockito.stubbing, + org.junit.jupiter.api, + org.junit.platform.suite.api diff --git a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/JFaceTextTestSuite.java b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/JFaceTextTestSuite.java index 4d0179e0ed5..c16e08574e8 100644 --- a/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/JFaceTextTestSuite.java +++ b/tests/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/JFaceTextTestSuite.java @@ -13,9 +13,8 @@ *******************************************************************************/ package org.eclipse.jface.text.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; import org.eclipse.jface.text.tests.codemining.CodeMiningLineHeaderAnnotationTest; import org.eclipse.jface.text.tests.codemining.CodeMiningProjectionViewerTest; @@ -37,14 +36,13 @@ import org.eclipse.jface.text.tests.source.inlined.LineContentBoundsDrawingTest; import org.eclipse.jface.text.tests.templates.persistence.TemplatePersistenceDataTest; - /** * Test Suite for org.eclipse.jface.text. * * @since 3.0 */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ AnnotationRulerColumnTest.class, LineNumberRulerColumnTest.class, HTML2TextReaderTest.class, @@ -84,5 +82,5 @@ TestWhitespaceCharacterPainter.class }) public class JFaceTextTestSuite { - // see @SuiteClasses + // see @SelectClasses } diff --git a/tests/org.eclipse.ltk.core.refactoring.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ltk.core.refactoring.tests/META-INF/MANIFEST.MF index 409165497af..46f9c82a34f 100644 --- a/tests/org.eclipse.ltk.core.refactoring.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ltk.core.refactoring.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.ltk.core.refactoring.tests Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ltk.core.refactoring.tests; singleton:=true -Bundle-Version: 3.10.600.qualifier +Bundle-Version: 3.10.700.qualifier Bundle-Activator: org.eclipse.ltk.core.refactoring.tests.RefactoringCoreTestPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName @@ -26,4 +26,5 @@ Require-Bundle: org.eclipse.core.tests.harness Bundle-RequiredExecutionEnvironment: JavaSE-17 Eclipse-BundleShape: dir -Import-Package: org.junit.jupiter.api +Import-Package: org.junit.jupiter.api, + org.junit.platform.suite.api diff --git a/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/AllTests.java b/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/AllTests.java index e21d08187d2..00f3df6a7d0 100644 --- a/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/AllTests.java +++ b/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/AllTests.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.ltk.core.refactoring.tests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; import org.eclipse.ltk.core.refactoring.tests.history.RefactoringHistoryTests; import org.eclipse.ltk.core.refactoring.tests.participants.ParticipantTests; @@ -22,8 +22,8 @@ import org.eclipse.ltk.core.refactoring.tests.resource.ResourceRefactoringUndoTests; import org.eclipse.ltk.core.refactoring.tests.scripting.RefactoringScriptingTests; -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ RefactoringContextTest.class, ParticipantTests.class, RefactoringHistoryTests.class, diff --git a/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/history/RefactoringHistoryTests.java b/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/history/RefactoringHistoryTests.java index d5d9d5ff6b0..5f2f0d31cca 100644 --- a/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/history/RefactoringHistoryTests.java +++ b/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/history/RefactoringHistoryTests.java @@ -13,11 +13,11 @@ *******************************************************************************/ package org.eclipse.ltk.core.refactoring.tests.history; -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({ +@Suite +@SelectClasses({ RefactoringHistorySerializationTests.class, RefactoringHistoryServiceTests.class }) diff --git a/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/ParticipantTests.java b/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/ParticipantTests.java index bba9abc6e96..44a1cd05f73 100644 --- a/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/ParticipantTests.java +++ b/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/participants/ParticipantTests.java @@ -13,11 +13,11 @@ *******************************************************************************/ package org.eclipse.ltk.core.refactoring.tests.participants; -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({ +@Suite +@SelectClasses({ FailingParticipantTests.class, SharedTextChangeTests.class, CancelingParticipantTests.class, diff --git a/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/scripting/RefactoringScriptingTests.java b/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/scripting/RefactoringScriptingTests.java index 1c41b7433c8..6ad3bd3513b 100644 --- a/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/scripting/RefactoringScriptingTests.java +++ b/tests/org.eclipse.ltk.core.refactoring.tests/src/org/eclipse/ltk/core/refactoring/tests/scripting/RefactoringScriptingTests.java @@ -13,11 +13,11 @@ *******************************************************************************/ package org.eclipse.ltk.core.refactoring.tests.scripting; -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({ +@Suite +@SelectClasses({ RefactoringScriptApplicationTests.class }) public class RefactoringScriptingTests { diff --git a/tests/org.eclipse.ltk.ui.refactoring.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ltk.ui.refactoring.tests/META-INF/MANIFEST.MF index 039d1fe903f..18365fafc73 100644 --- a/tests/org.eclipse.ltk.ui.refactoring.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ltk.ui.refactoring.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.ltk.ui.refactoring.tests Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ltk.ui.refactoring.tests;singleton:=true -Bundle-Version: 3.11.400.qualifier +Bundle-Version: 3.11.500.qualifier Bundle-Activator: org.eclipse.ltk.ui.refactoring.tests.RefactoringUITestPlugin Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName @@ -21,4 +21,5 @@ Require-Bundle: org.eclipse.text;bundle-version="[3.5.0,4.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Eclipse-BundleShape: dir -Import-Package: org.junit.jupiter.api +Import-Package: org.junit.jupiter.api, + org.junit.platform.suite.api diff --git a/tests/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/AllTests.java b/tests/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/AllTests.java index a7d04b7c388..a856d023316 100644 --- a/tests/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/AllTests.java +++ b/tests/org.eclipse.ltk.ui.refactoring.tests/src/org/eclipse/ltk/ui/refactoring/tests/AllTests.java @@ -13,11 +13,11 @@ *******************************************************************************/ package org.eclipse.ltk.ui.refactoring.tests; -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({ +@Suite +@SelectClasses({ EmptySuite.class }) public class AllTests { diff --git a/tests/org.eclipse.search.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.search.tests/META-INF/MANIFEST.MF index 204847946af..4959139403b 100644 --- a/tests/org.eclipse.search.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.search.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.search.tests;singleton:=true -Bundle-Version: 3.11.800.qualifier +Bundle-Version: 3.11.900.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.search.core.tests;x-internal:=true, @@ -19,6 +19,8 @@ Require-Bundle: org.eclipse.jface.text;bundle-version="[3.24.200,4.0.0)", org.eclipse.ui.editors;bundle-version="[3.17.100,4.0.0)", org.eclipse.ltk.core.refactoring;bundle-version="[3.14.100,4.0.0)" +Import-Package: org.junit.jupiter.api, + org.junit.platform.suite.api Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Eclipse-BundleShape: dir diff --git a/tests/org.eclipse.search.tests/src/org/eclipse/search/core/tests/AllSearchModelTests.java b/tests/org.eclipse.search.tests/src/org/eclipse/search/core/tests/AllSearchModelTests.java index 294df07b320..057c21561b6 100644 --- a/tests/org.eclipse.search.tests/src/org/eclipse/search/core/tests/AllSearchModelTests.java +++ b/tests/org.eclipse.search.tests/src/org/eclipse/search/core/tests/AllSearchModelTests.java @@ -13,16 +13,15 @@ *******************************************************************************/ package org.eclipse.search.core.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; -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ QueryManagerTest.class, TestSearchResult.class, LineConversionTest.class }) public class AllSearchModelTests { - // see @SuiteClasses + // see @SelectClasses } diff --git a/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/AllSearchTests.java b/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/AllSearchTests.java index bc779b6c7e2..0ea450dd86d 100644 --- a/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/AllSearchTests.java +++ b/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/AllSearchTests.java @@ -13,19 +13,18 @@ *******************************************************************************/ package org.eclipse.search.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; import org.eclipse.search.core.tests.AllSearchModelTests; import org.eclipse.search.tests.filesearch.AllFileSearchTests; -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ AllFileSearchTests.class, AllSearchModelTests.class, TextSearchRegistryTest.class }) public class AllSearchTests { - // see @SuiteClasses + // see @SelectClasses } diff --git a/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AllFileSearchTests.java b/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AllFileSearchTests.java index 608627b8a19..df1edfdce64 100644 --- a/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AllFileSearchTests.java +++ b/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AllFileSearchTests.java @@ -14,12 +14,12 @@ package org.eclipse.search.tests.filesearch; import org.junit.ClassRule; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) -@SuiteClasses({ +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SelectClasses; + +@Suite +@SelectClasses({ AnnotationManagerTest.class, FileSearchTests.class, LineAnnotationManagerTest.class, diff --git a/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF b/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF index 8ecf65905c6..fb60b3dfb09 100644 --- a/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF @@ -3,9 +3,11 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-Vendor: %Plugin.Providername Bundle-SymbolicName: org.eclipse.tests.urischeme -Bundle-Version: 1.2.600.qualifier +Bundle-Version: 1.2.700.qualifier Bundle-Localization: plugin Fragment-Host: org.eclipse.urischeme;bundle-version="1.1.100" +Import-Package: org.junit.jupiter.api, + org.junit.platform.suite.api Automatic-Module-Name: org.eclipse.urischeme.tests Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)" diff --git a/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/suite/AllUnitTests.java b/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/suite/AllUnitTests.java index fb9638b51c2..35d77e7bd45 100644 --- a/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/suite/AllUnitTests.java +++ b/tests/org.eclipse.tests.urischeme/src/org/eclipse/urischeme/suite/AllUnitTests.java @@ -22,12 +22,12 @@ import org.eclipse.urischeme.internal.registration.TestUnitRegistrationWindows; import org.eclipse.urischeme.internal.registration.TestUnitRegistryWriter; import org.eclipse.urischeme.internal.registration.TestUnitWinRegistry; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) -@SuiteClasses({ UriSchemeProcessorUnitTest.class, // +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SelectClasses; + +@Suite +@SelectClasses({ UriSchemeProcessorUnitTest.class, // TestUnitPlistFileWriter.class, // TestUnitDesktopFileWriter.class, // TestUnitRegistrationMacOsX.class, // diff --git a/tests/org.eclipse.text.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.text.tests/META-INF/MANIFEST.MF index c110c7790ee..49e58ff50db 100644 --- a/tests/org.eclipse.text.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.text.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.text.tests -Bundle-Version: 3.14.900.qualifier +Bundle-Version: 3.14.1000.qualifier Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin Export-Package: @@ -14,6 +14,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", org.eclipse.text;bundle-version="[3.6.3,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.text.tests diff --git a/tests/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionTestSuite.java b/tests/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionTestSuite.java index b0fc0c853de..3cb66588888 100644 --- a/tests/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionTestSuite.java +++ b/tests/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionTestSuite.java @@ -14,20 +14,18 @@ package org.eclipse.text.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; /** * * @since 3.0 */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ProjectionDocumentTest.class, ProjectionMappingTest.class }) public class ProjectionTestSuite { - // see @SuiteClasses + // see @SelectClasses } diff --git a/tests/org.eclipse.text.tests/src/org/eclipse/text/tests/EclipseTextTestSuite.java b/tests/org.eclipse.text.tests/src/org/eclipse/text/tests/EclipseTextTestSuite.java index be13f581481..b70f8e44739 100644 --- a/tests/org.eclipse.text.tests/src/org/eclipse/text/tests/EclipseTextTestSuite.java +++ b/tests/org.eclipse.text.tests/src/org/eclipse/text/tests/EclipseTextTestSuite.java @@ -14,21 +14,19 @@ *******************************************************************************/ package org.eclipse.text.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; import org.eclipse.text.tests.link.LinkTestSuite; import org.eclipse.text.tests.templates.TemplatesTestSuite; - /** * Test Suite for org.eclipse.text. * * @since 3.0 */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ MultiStringMatcherTest.class, ConfigurableLineTrackerTest.class, LineTrackerTest4.class, @@ -51,5 +49,5 @@ TemplatesTestSuite.class }) public class EclipseTextTestSuite { - // see @SuiteClasses + // see @SelectClasses } diff --git a/tests/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkTestSuite.java b/tests/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkTestSuite.java index 4e92ec3a867..0aac19cef41 100644 --- a/tests/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkTestSuite.java +++ b/tests/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkTestSuite.java @@ -14,23 +14,21 @@ package org.eclipse.text.tests.link; -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 org.eclipse.text.tests.link. * * @since 3.0 */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ LinkedPositionGroupTest.class, LinkedPositionTest.class, InclusivePositionUpdaterTest.class, LinkedModeModelTest.class }) public class LinkTestSuite { - // see @SuiteClasses + // see @SelectClasses } diff --git a/tests/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplatesTestSuite.java b/tests/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplatesTestSuite.java index 581ce1176b6..e4d769ca4b7 100755 --- a/tests/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplatesTestSuite.java +++ b/tests/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplatesTestSuite.java @@ -16,19 +16,18 @@ package org.eclipse.text.tests.templates; -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 the org.eclipse.text plug-in */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ TemplateTranslatorTest.class, TemplateVariablesWordSelectionTest.class, GlobalTemplateVariablesDateTest.class }) public class TemplatesTestSuite { - // see @SuiteClasses + // see @SelectClasses } diff --git a/tests/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF index e87f0171e8a..112733ca739 100644 --- a/tests/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF @@ -26,6 +26,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.119.100", org.eclipse.ui.tests.harness;bundle-version="1.8.0", org.mockito.mockito-core;bundle-version="5.12.0" +Import-Package: org.junit.jupiter.api, + org.junit.platform.suite.api Bundle-RequiredExecutionEnvironment: JavaSE-17 Eclipse-BundleShape: dir Bundle-ActivationPolicy: lazy diff --git a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorsTestSuite.java b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorsTestSuite.java index 65c6adde4a3..e8353b3e803 100644 --- a/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorsTestSuite.java +++ b/tests/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorsTestSuite.java @@ -15,9 +15,8 @@ ************************************************************************************************/ package org.eclipse.ui.editors.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; import org.eclipse.jface.text.tests.codemining.CodeMiningTest; @@ -33,8 +32,8 @@ * * @since 3.0 */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ChainedPreferenceStoreTest.class, DocumentProviderRegistryTest.class, EncodingChangeTests.class, @@ -60,5 +59,5 @@ CodeMiningTest.class, }) public class EditorsTestSuite { - // see @SuiteClasses + // see @SelectClasses } diff --git a/tests/org.eclipse.ui.monitoring.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.monitoring.tests/META-INF/MANIFEST.MF index a25ab35bf2a..464fb4185c5 100644 --- a/tests/org.eclipse.ui.monitoring.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.monitoring.tests/META-INF/MANIFEST.MF @@ -1,6 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name +Import-Package: org.junit.jupiter.api, + org.junit.platform.suite.api Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-SymbolicName: org.eclipse.ui.monitoring.tests;singleton:=true Bundle-Vendor: %Bundle-Vendor diff --git a/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/MonitoringTestSuite.java b/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/MonitoringTestSuite.java index 64fd6a03239..0ad5e7e95aa 100644 --- a/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/MonitoringTestSuite.java +++ b/tests/org.eclipse.ui.monitoring.tests/src/org/eclipse/ui/internal/monitoring/MonitoringTestSuite.java @@ -14,16 +14,16 @@ *******************************************************************************/ package org.eclipse.ui.internal.monitoring; -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 suite for {@code org.eclipse.ui.monitoring} plug-in. * The tests in {@link EventLoopMonitorThreadManualTests} are not included in this * suite due to their flakiness. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ EventLoopMonitorThreadTests.class, FilterHandlerTests.class, DefaultLoggerTests.class}) diff --git a/tests/org.eclipse.ui.tests.browser/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.browser/META-INF/MANIFEST.MF index 3578f15f1b5..d9d4beed66b 100644 --- a/tests/org.eclipse.ui.tests.browser/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.tests.browser/META-INF/MANIFEST.MF @@ -9,6 +9,8 @@ Require-Bundle: org.eclipse.core.runtime, org.junit, org.eclipse.ui, org.eclipse.ui.browser +Import-Package: org.junit.jupiter.api, + org.junit.platform.suite.api Bundle-ActivationPolicy: lazy Eclipse-BundleShape: dir Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tests/org.eclipse.ui.tests.browser/src/org/eclipse/ui/tests/browser/internal/AllTests.java b/tests/org.eclipse.ui.tests.browser/src/org/eclipse/ui/tests/browser/internal/AllTests.java index 53d525f745f..fb30abc1dd6 100644 --- a/tests/org.eclipse.ui.tests.browser/src/org/eclipse/ui/tests/browser/internal/AllTests.java +++ b/tests/org.eclipse.ui.tests.browser/src/org/eclipse/ui/tests/browser/internal/AllTests.java @@ -14,11 +14,11 @@ *******************************************************************************/ package org.eclipse.ui.tests.browser.internal; -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({ +@Suite +@SelectClasses({ ExistenceTestCase.class, InternalBrowserViewTestCase.class, InternalBrowserEditorTestCase.class, // ExternalBrowserTestCase.class); DialogsTestCase.class, PreferencesTestCase.class, TestInput.class, ToolbarBrowserTestCase.class, diff --git a/tests/org.eclipse.ui.tests.forms/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.forms/META-INF/MANIFEST.MF index 944d1b2b124..19f0965ee7e 100755 --- a/tests/org.eclipse.ui.tests.forms/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.tests.forms/META-INF/MANIFEST.MF @@ -2,13 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Forms Test Bundle-SymbolicName: org.eclipse.ui.tests.forms;singleton:=true -Bundle-Version: 3.10.500.qualifier +Bundle-Version: 3.10.600.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.test.performance, org.eclipse.ui.forms, org.junit Bundle-Vendor: Eclipse.org +Import-Package: org.junit.jupiter.api, + org.junit.platform.suite.api Bundle-RequiredExecutionEnvironment: JavaSE-17 Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.ui.tests.forms diff --git a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/AllFormsPerformanceTests.java b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/AllFormsPerformanceTests.java index 88c382a2fa2..d87c1150dea 100755 --- a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/AllFormsPerformanceTests.java +++ b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/AllFormsPerformanceTests.java @@ -15,14 +15,15 @@ package org.eclipse.ui.tests.forms; import org.eclipse.ui.tests.forms.performance.FormsPerformanceTest; -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 forms performance (automated). */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ FormsPerformanceTest.class }) +@Suite +@SelectClasses({ FormsPerformanceTest.class }) public class AllFormsPerformanceTests { } diff --git a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/AllFormsTests.java b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/AllFormsTests.java index d6591b69fe6..27d0d0eec38 100755 --- a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/AllFormsTests.java +++ b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/AllFormsTests.java @@ -20,14 +20,15 @@ import org.eclipse.ui.tests.forms.layout.AllLayoutTests; import org.eclipse.ui.tests.forms.util.AllUtilityTests; import org.eclipse.ui.tests.forms.widgets.AllWidgetsTests; -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 all forms functionality (automated). */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ AllEventsTests.class, // AllLayoutTests.class, // AllUtilityTests.class, // diff --git a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/events/AllEventsTests.java b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/events/AllEventsTests.java index 24e5ed4112c..81b8b22ac8e 100644 --- a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/events/AllEventsTests.java +++ b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/events/AllEventsTests.java @@ -1,11 +1,10 @@ package org.eclipse.ui.tests.forms.events; -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({ ExpansionListenerTest.class, // +@Suite +@SelectClasses({ ExpansionListenerTest.class, // HyperLinkListenerTest.class,// }) public class AllEventsTests { diff --git a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/layout/AllLayoutTests.java b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/layout/AllLayoutTests.java index f40e23abfa7..bcff254142c 100755 --- a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/layout/AllLayoutTests.java +++ b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/layout/AllLayoutTests.java @@ -17,14 +17,15 @@ import org.eclipse.ui.tests.forms.widgets.HintAdjustmentTest; import org.eclipse.ui.tests.forms.widgets.SizeCacheTest; -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 form layouts */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ HintAdjustmentTest.class, SizeCacheTest.class, TestColumnWrapLayout.class, diff --git a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/util/AllUtilityTests.java b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/util/AllUtilityTests.java index ed9ed4552a2..54c10dd37e8 100755 --- a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/util/AllUtilityTests.java +++ b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/util/AllUtilityTests.java @@ -14,14 +14,14 @@ *******************************************************************************/ package org.eclipse.ui.tests.forms.util; -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 forms utility (automated). */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ FormColorsTest.class, FormFontsTest.class, FormImagesTest.class, diff --git a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/widgets/AllWidgetsTests.java b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/widgets/AllWidgetsTests.java index ba5bf2e7fb5..41725826f78 100644 --- a/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/widgets/AllWidgetsTests.java +++ b/tests/org.eclipse.ui.tests.forms/forms/org/eclipse/ui/tests/forms/widgets/AllWidgetsTests.java @@ -13,14 +13,14 @@ *******************************************************************************/ package org.eclipse.ui.tests.forms.widgets; -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 forms widgets (automated). */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ ExpandableCompositeTest.class, FormTextModelTest.class, ScrolledFormTest.class }) +@Suite +@SelectClasses({ ExpandableCompositeTest.class, FormTextModelTest.class, ScrolledFormTest.class }) public class AllWidgetsTests { } diff --git a/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF index 8b0c5901bba..bd2ab97ecc6 100644 --- a/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.tests.navigator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundlename Bundle-SymbolicName: org.eclipse.ui.tests.navigator;singleton:=true -Bundle-Version: 3.8.200.qualifier +Bundle-Version: 3.8.300.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.core.resources, org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", @@ -17,6 +17,8 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.jdt.ui, org.eclipse.ui.genericeditor Bundle-Vendor: Eclipse.org +Import-Package: org.junit.jupiter.api, + org.junit.platform.suite.api Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.eclipse.ui.tests.navigator;x-internal:=true Eclipse-BundleShape: dir diff --git a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java index e9d59c0c9b2..a67e92eb561 100644 --- a/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java +++ b/tests/org.eclipse.ui.tests.navigator/src/org/eclipse/ui/tests/navigator/NavigatorTestSuite.java @@ -25,12 +25,12 @@ import org.eclipse.ui.tests.navigator.resources.NestedResourcesTests; import org.eclipse.ui.tests.navigator.resources.PathComparatorTest; import org.eclipse.ui.tests.navigator.resources.ResourceMgmtActionProviderTests; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) -@SuiteClasses({ InitialActivationTest.class, ActionProviderTest.class, ExtensionsTest.class, FilterTest.class, +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SelectClasses; + +@Suite +@SelectClasses({ InitialActivationTest.class, ActionProviderTest.class, ExtensionsTest.class, FilterTest.class, WorkingSetTest.class, ActivityTest.class, OpenTest.class, INavigatorContentServiceTests.class, ProgrammaticOpenTest.class, PipelineTest.class, PipelineChainTest.class, JstPipelineTest.class, LabelProviderTest.class, SorterTest.class, ViewerTest.class, CdtTest.class, M12Tests.class, diff --git a/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF index c0470bcce28..7de54413d2a 100644 --- a/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.tests.performance/META-INF/MANIFEST.MF @@ -19,6 +19,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.e4.core.contexts, org.eclipse.ui.navigator, org.eclipse.ui.navigator.resources +Import-Package: org.junit.jupiter.api, + org.junit.platform.suite.api Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: plugin diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/JFacePerformanceSuite.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/JFacePerformanceSuite.java index 66611dbcae0..811b5de1d34 100644 --- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/JFacePerformanceSuite.java +++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/JFacePerformanceSuite.java @@ -13,15 +13,14 @@ *******************************************************************************/ package org.eclipse.jface.tests.performance; -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; /** * The JFacePerformanceSuite are the performance tests for JFace. */ -@RunWith(Suite.class) -@SuiteClasses({ // +@Suite +@SelectClasses({ // ListViewerRefreshTest.class, // ComboViewerRefreshTest.class, // FastTableViewerRefreshTest.class, // diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/UIPerformanceTestSuite.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/UIPerformanceTestSuite.java index c0b513300c7..10417aeed1d 100644 --- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/UIPerformanceTestSuite.java +++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/UIPerformanceTestSuite.java @@ -13,15 +13,14 @@ *******************************************************************************/ package org.eclipse.ui.tests.performance; -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 all areas of the UI API. */ -@RunWith(Suite.class) -@SuiteClasses({ // +@Suite +@SelectClasses({ // GenerateIdentifiersTest.class, // WorkbenchPerformanceSuite.class, // OpenClosePerspectiveTest.class, // diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/WorkbenchPerformanceSuite.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/WorkbenchPerformanceSuite.java index 9fb19622ec9..168944e9b32 100644 --- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/WorkbenchPerformanceSuite.java +++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/WorkbenchPerformanceSuite.java @@ -15,12 +15,12 @@ package org.eclipse.ui.tests.performance; import org.eclipse.ui.tests.performance.layout.ResizeTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -@RunWith(Suite.class) -@SuiteClasses({ // +import org.junit.platform.suite.api.Suite; +import org.junit.platform.suite.api.SelectClasses; + +@Suite +@SelectClasses({ // ResizeTest.class, // }) class WorkbenchPerformanceSuite { diff --git a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/performance/RCPPerformanceTestSuite.java b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/performance/RCPPerformanceTestSuite.java index 6c9d789fefa..16e8761c6f2 100644 --- a/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/performance/RCPPerformanceTestSuite.java +++ b/tests/org.eclipse.ui.tests.rcp/Eclipse RCP Tests/org/eclipse/ui/tests/rcp/performance/RCPPerformanceTestSuite.java @@ -14,14 +14,14 @@ *******************************************************************************/ package org.eclipse.ui.tests.rcp.performance; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @since 3.1 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({PlatformUIPerfTest.class , EmptyWorkbenchPerfTest.class}) +@Suite +@SelectClasses({PlatformUIPerfTest.class , EmptyWorkbenchPerfTest.class}) public class RCPPerformanceTestSuite { } diff --git a/tests/org.eclipse.ui.tests.rcp/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.rcp/META-INF/MANIFEST.MF index d0343bfdb21..3bc1fb71205 100644 --- a/tests/org.eclipse.ui.tests.rcp/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.tests.rcp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ui.tests.rcp; singleton:=true -Bundle-Version: 3.6.600.qualifier +Bundle-Version: 3.6.700.qualifier Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui, diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.views.properties.tabbed/META-INF/MANIFEST.MF index 1365c01fc77..2777fda4af3 100644 --- a/tests/org.eclipse.ui.tests.views.properties.tabbed/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.ui.tests.views.properties.tabbed;singleton:=true -Bundle-Version: 3.8.500.qualifier +Bundle-Version: 3.8.600.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -11,6 +11,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.views.properties.tabbed, org.eclipse.jface.text Bundle-Vendor: %Plugin.providerName +Import-Package: org.junit.jupiter.api, + org.junit.platform.suite.api Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.ui.tests.views.properties.tabbed, diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/AllTests.java b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/AllTests.java index 760ee760ef3..83c0824c047 100644 --- a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/AllTests.java +++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/AllTests.java @@ -13,12 +13,11 @@ *******************************************************************************/ package org.eclipse.ui.tests.views.properties.tabbed; -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({ TabbedPropertySheetPageTest.class, TabbedPropertySheetPageDynamicTest.class, +@Suite +@SelectClasses({ TabbedPropertySheetPageTest.class, TabbedPropertySheetPageDynamicTest.class, TabbedPropertySheetPageTextTest.class, TabbedPropertySheetPageOverrideTest.class, TabbedPropertySheetPageDecorationsTest.class }) public class AllTests { diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/internal/ide/DirectoryProposalContentAssistTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/internal/ide/DirectoryProposalContentAssistTestSuite.java index 34488056943..d134e5ff73d 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/internal/ide/DirectoryProposalContentAssistTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/internal/ide/DirectoryProposalContentAssistTestSuite.java @@ -13,11 +13,11 @@ *******************************************************************************/ 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 { } 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 ecfc129dce1..ab0aeffaf71 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 @@ -58,14 +58,15 @@ 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({ +@Suite +@SelectClasses({ StartupTest.class, UIAutomatedSuite.class, ApiTestSuite.class, 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 027699fba26..4e02c332618 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 @@ -14,14 +14,14 @@ *******************************************************************************/ 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({ +@Suite +@SelectClasses({ ImagesTest.class, UtilTest.class, StaticTest.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/adaptable/AdaptableTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/adaptable/AdaptableTestSuite.java index 51a2f1ac9b3..8b1b78d5e3a 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/adaptable/AdaptableTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/adaptable/AdaptableTestSuite.java @@ -13,15 +13,15 @@ *******************************************************************************/ 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. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ AdaptableDecoratorTestCase.class, MarkerImageProviderTest.class, WorkingSetTestCase.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 661ea136d4b..f1517d5841c 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 @@ -25,11 +25,12 @@ 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; -@RunWith(Suite.class) -@Suite.SuiteClasses({ +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + +@Suite +@SelectClasses({ IPageLayoutTest.class, PlatformUITest.class, IWorkbenchTest.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/commands/CommandsTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/commands/CommandsTestSuite.java index 8e920e6ab4c..84a94dd30a9 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/commands/CommandsTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/commands/CommandsTestSuite.java @@ -14,14 +14,14 @@ *******************************************************************************/ 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({ +@Suite +@SelectClasses({ CommandExecutionTest.class, Bug73756Test.class, Bug125792Test.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/concurrency/ConcurrencyTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/concurrency/ConcurrencyTestSuite.java index a275ba339f8..26e34c29b04 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/concurrency/ConcurrencyTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/concurrency/ConcurrencyTestSuite.java @@ -13,16 +13,16 @@ *******************************************************************************/ package org.eclipse.ui.tests.concurrency; -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 suite of tests related to concurrency and deadlock. * * @since 3.1 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ ModalContextCrashTest.class, NestedSyncExecDeadlockTest.class, SyncExecWhileUIThreadWaitsForRuleTest.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/contexts/ContextsTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/contexts/ContextsTestSuite.java index f358634a9f2..a8255c4eb61 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/contexts/ContextsTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/contexts/ContextsTestSuite.java @@ -13,8 +13,8 @@ *******************************************************************************/ package org.eclipse.ui.tests.contexts; -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 suite of tests related to the "org.eclipse.ui.contexts" extension point, @@ -24,8 +24,8 @@ * * @since 3.0 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ Bug74990Test.class, Bug84763Test.class, ExtensionTestCase.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/DataTransferTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/DataTransferTestSuite.java index e613bc348d8..f36ce493695 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/DataTransferTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/DataTransferTestSuite.java @@ -16,11 +16,11 @@ *******************************************************************************/ package org.eclipse.ui.tests.datatransfer; -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({ +@Suite +@SelectClasses({ ImportOperationTest.class, ImportArchiveOperationTest.class, ExportFileSystemOperationTest.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java index 985d5aa519f..fba0a4a07a2 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java @@ -14,11 +14,11 @@ *******************************************************************************/ package org.eclipse.ui.tests.decorators; -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({ +@Suite +@SelectClasses({ ExceptionDecoratorTestCase.class, DecoratorTestCase.class, LightweightDecoratorTestCase.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/FilteredResourcesSelectionDialogTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/FilteredResourcesSelectionDialogTestSuite.java index 15683e41a44..83e90fc1b36 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/FilteredResourcesSelectionDialogTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/FilteredResourcesSelectionDialogTestSuite.java @@ -14,16 +14,16 @@ *******************************************************************************/ package org.eclipse.ui.tests.dialogs; -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 suite of tests for the FilteredResourcesSelectionDialog. * * @since 3.14 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ ResourceItemLabelTest.class, ResourceInitialSelectionTest.class, ResourceSelectionFilteringDialogTest.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 fd91b21e8f0..2c21179cf3a 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 @@ -15,11 +15,12 @@ package org.eclipse.ui.tests.dialogs; import org.eclipse.ui.tests.compare.UIComparePreferencesAuto; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -@RunWith(Suite.class) -@Suite.SuiteClasses({ UIDialogsAuto.class, DeprecatedUIDialogsAuto.class, UIWizardsAuto.class, +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + +@Suite +@SelectClasses({ UIDialogsAuto.class, DeprecatedUIDialogsAuto.class, UIWizardsAuto.class, DeprecatedUIWizardsAuto.class, UIPreferencesAuto.class, UIComparePreferencesAuto.class, DeprecatedUIPreferencesAuto.class, UIMessageDialogsAuto.class, UINewWorkingSetWizardAuto.class, UIEditWorkingSetWizardAuto.class, SearchPatternAuto.class, InfixSearchPatternAuto.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIInteractiveSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIInteractiveSuite.java index b35aecd74a5..5138247385b 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIInteractiveSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIInteractiveSuite.java @@ -14,14 +14,15 @@ package org.eclipse.ui.tests.dialogs; import org.eclipse.ui.tests.compare.UIComparePreferences; -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({ +@Suite +@SelectClasses({ UIPreferences.class, UIComparePreferences.class, DeprecatedUIPreferences.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/DynamicPluginsTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/DynamicPluginsTestSuite.java index ace050c5170..86ee937f6d1 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/DynamicPluginsTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/DynamicPluginsTestSuite.java @@ -13,15 +13,14 @@ *******************************************************************************/ package org.eclipse.ui.tests.dynamicplugins; -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 dynamic plug-in support. */ -@RunWith(Suite.class) -@SuiteClasses({ // +@Suite +@SelectClasses({ // StatusHandlerTests.class, // AcceleratorConfigurationsExtensionDynamicTest.class, // AcceleratorScopesExtensionDynamicTest.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 6b137b4edc6..3b42e466bbf 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 @@ -14,14 +14,14 @@ *******************************************************************************/ package org.eclipse.ui.tests.encoding; -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 EncodingTestSuite is the suite for encoding tests. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ EncodingTestCase.class }) public class EncodingTestSuite { 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 87915aa9cda..0aae2ac1fba 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 @@ -15,14 +15,14 @@ package org.eclipse.ui.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({ +@Suite +@SelectClasses({ FieldAssistAPITest.class, ComboContentAssistCommandAdapterTest.class, TextContentAssistCommandAdapterTest.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/InternalTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/InternalTestSuite.java index fe2b505df10..6c9b079ba52 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/InternalTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/InternalTestSuite.java @@ -30,11 +30,12 @@ import org.eclipse.ui.tests.markers.MarkerViewUtilTest; import org.eclipse.ui.tests.markers.ResourceMappingMarkersTest; import org.eclipse.ui.tests.markers.ScopeAreaTest; -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({ EditorActionBarsTest.class, ActionSetExpressionTest.class, PopupMenuExpressionTest.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/intro/IntroTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/intro/IntroTestSuite.java index 13853e242d0..012536d0312 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/intro/IntroTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/intro/IntroTestSuite.java @@ -13,14 +13,14 @@ *******************************************************************************/ package org.eclipse.ui.tests.intro; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @since 3.0 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ IntroPartTest.class, NoIntroPartTest.class, IntroTest.class, 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 f23b86020dd..a86030271b9 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 @@ -13,14 +13,14 @@ *******************************************************************************/ package org.eclipse.ui.tests.keys; -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 the key support for the platform. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ BindingInteractionsTest.class, BindingManagerTest.class, DispatcherTest.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/leaks/LeaksTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/leaks/LeaksTestSuite.java index 1e7d9aa5e51..34c96455888 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/leaks/LeaksTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/leaks/LeaksTestSuite.java @@ -14,11 +14,11 @@ package org.eclipse.ui.tests.leaks; -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({ +@Suite +@SelectClasses({ LeakTests.class, Bug397302Tests.class, }) diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/MenusTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/MenusTestSuite.java index e15499431f6..5c20967891f 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/MenusTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/MenusTestSuite.java @@ -14,15 +14,15 @@ *******************************************************************************/ package org.eclipse.ui.tests.menus; -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 code related to menus. This includes the * popupMenus extension point, and others. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ DynamicToolbarTest.class, ObjectContributionTest.class, MenuVisibilityTest.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTestSuite.java index 0043bf106ef..bd586c255d1 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTestSuite.java @@ -13,11 +13,11 @@ *******************************************************************************/ package org.eclipse.ui.tests.multieditor; -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({ // +@Suite +@SelectClasses({ // AbstractMultiEditorTest.class, // MultiEditorTest.class, // }) diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multipageeditor/MultiPageEditorTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multipageeditor/MultiPageEditorTestSuite.java index b2906146e61..4485d575294 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multipageeditor/MultiPageEditorTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multipageeditor/MultiPageEditorTestSuite.java @@ -13,16 +13,16 @@ *******************************************************************************/ package org.eclipse.ui.tests.multipageeditor; -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 suite of tests for multi-page editors. * * @since 3.0 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ MultiEditorInputTest.class, MultiPageEditorPartTest.class, MultiVariablePageTest.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 99e517ac49b..7554fd1bf02 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 @@ -14,13 +14,12 @@ *******************************************************************************/ package org.eclipse.ui.tests.navigator; -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({ +@Suite +@SelectClasses({ 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 92d0395ec9c..a66876db5bf 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 @@ -15,14 +15,14 @@ package org.eclipse.ui.tests.operations; -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({ +@Suite +@SelectClasses({ OperationsAPITest.class, WorkbenchOperationHistoryTests.class, MultiThreadedOperationsTests.class, 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 c738152bf96..a6526ee5d33 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 @@ -15,15 +15,16 @@ package org.eclipse.ui.tests.preferences; import org.eclipse.ui.tests.propertyPages.PropertyPageEnablementTest; -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 suite for preferences. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ FontPreferenceTestCase.class, DeprecatedFontPreferenceTestCase.class, ScopedPreferenceStoreTestCase.class, 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 97382927710..6125ab79606 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 @@ -15,8 +15,8 @@ package org.eclipse.ui.tests.progress; -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 suite for the Progress View and related API @@ -24,8 +24,8 @@ * @since 3.6 * @author Prakash G.R. (grprakash@in.ibm.com) */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ ProgressContantsTest.class, ProgressViewTests.class, JobInfoTest.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetTestSuite.java index d5a68a5a5c7..3fa77a4d0b6 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/PropertySheetTestSuite.java @@ -14,14 +14,14 @@ *******************************************************************************/ package org.eclipse.ui.tests.propertysheet; -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 areas of the Property Sheet API. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ PropertyShowInContextTest.class, MultiInstancePropertySheetTest.class, ShowInPropertySheetTest.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/quickaccess/QuickAccessTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/quickaccess/QuickAccessTestSuite.java index 3676f2e7590..caade7813c2 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/quickaccess/QuickAccessTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/quickaccess/QuickAccessTestSuite.java @@ -13,11 +13,11 @@ *******************************************************************************/ package org.eclipse.ui.tests.quickaccess; -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({ CamelUtilTest.class, QuickAccessDialogTest.class, ContentMatchesTest.class, +@Suite +@SelectClasses({ CamelUtilTest.class, QuickAccessDialogTest.class, ContentMatchesTest.class, QuickAccessProvidersTest.class }) public class QuickAccessTestSuite { } diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ServicesTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ServicesTestSuite.java index 023bd48b2a1..02b9694b0e8 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ServicesTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ServicesTestSuite.java @@ -15,15 +15,15 @@ *******************************************************************************/ package org.eclipse.ui.tests.services; -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 general to services. * @since 3.3 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ EvaluationServiceTest.class, ContributedServiceTest.class, WorkbenchSiteProgressServiceTest.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusHandlingTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusHandlingTestSuite.java index 405ca644679..bd29e7a6a5a 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusHandlingTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusHandlingTestSuite.java @@ -14,16 +14,16 @@ package org.eclipse.ui.tests.statushandlers; -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 the status handling facility * * @since 3.3 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ StatusDialogManagerTest.class, LabelProviderWrapperTest.class, SupportTrayTest.class, 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 1f0359e456c..11a57816632 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 @@ -14,14 +14,14 @@ *******************************************************************************/ package org.eclipse.ui.tests.themes; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * @since 3.0 */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ +@Suite +@SelectClasses({ ThemeAPITest.class, JFaceThemeTest.class, WorkbenchThemeChangedHandlerTest.class, diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomTestSuite.java index 00027b3c6bc..169c85b4a15 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/zoom/ZoomTestSuite.java @@ -13,14 +13,14 @@ *******************************************************************************/ package org.eclipse.ui.tests.zoom; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; /** * A test suite to test the zooming behavior of Eclipse. */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ // +@Suite +@SelectClasses({ // ZoomedViewActivateTest.class, // ZoomedEditorCloseTest.class, // ZoomedViewCloseTest.class, // diff --git a/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF index 2fab7ef39ef..72b3efe1d56 100644 --- a/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF @@ -47,7 +47,9 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.14.0", org.eclipse.emf.ecore Import-Package: jakarta.annotation, jakarta.inject, - org.osgi.service.event + org.osgi.service.event, + org.junit.jupiter.api, + org.junit.platform.suite.api Eclipse-AutoStart: true Export-Package: org.eclipse.ui.tests.api, org.eclipse.ui.tests.menus diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF index 1af7fc573ed..abfd2697355 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.ui.workbench.texteditor.tests -Bundle-Version: 3.14.900.qualifier +Bundle-Version: 3.14.1000.qualifier Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin Export-Package: @@ -23,4 +23,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.ui.workbench.texteditor.tests Import-Package: org.mockito, - org.mockito.stubbing;version="5.5.0" + org.mockito.stubbing;version="5.5.0", + org.junit.jupiter.api, + org.junit.platform.suite.api diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java index 7985b36399d..30ba98d200c 100644 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/WorkbenchTextEditorTestSuite.java @@ -13,9 +13,8 @@ *******************************************************************************/ package org.eclipse.ui.workbench.texteditor.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; import org.eclipse.ui.internal.findandreplace.FindReplaceLogicTest; import org.eclipse.ui.internal.findandreplace.overlay.FindReplaceOverlayTest; @@ -27,14 +26,13 @@ import org.eclipse.ui.workbench.texteditor.tests.revisions.RangeTest; import org.eclipse.ui.workbench.texteditor.tests.rulers.RulerTestSuite; - /** * Test Suite for org.eclipse.ui.workbench.texteditor. * * @since 3.0 */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ HippieCompletionTest.class, RangeTest.class, ChangeRegionTest.class, @@ -52,5 +50,5 @@ FindReplaceLogicTest.class, }) public class WorkbenchTextEditorTestSuite { - // see @SuiteClasses + // see @SelectClasses } diff --git a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/RulerTestSuite.java b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/RulerTestSuite.java index 420b90a7e02..85661abea62 100755 --- a/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/RulerTestSuite.java +++ b/tests/org.eclipse.ui.workbench.texteditor.tests/src/org/eclipse/ui/workbench/texteditor/tests/rulers/RulerTestSuite.java @@ -13,18 +13,16 @@ *******************************************************************************/ package org.eclipse.ui.workbench.texteditor.tests.rulers; -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; /** * @since 3.0 */ -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ DAGTest.class }) public class RulerTestSuite { - // see @SuiteClasses + // see @SelectClasses }