Skip to content

Commit b16e170

Browse files
committed
Migrate 85 JUnit4 test suites to JUnit5 and update MANIFEST.MF files
- Convert @RunWith(Suite.class) to @suite - Convert @Suite.SuiteClasses to @SelectClasses - Update imports from org.junit.runners to org.junit.platform.suite.api - Add org.junit.jupiter.api and org.junit.platform.suite.api to Import-Package in all 22 affected test bundles Created by Copilot for testing AI based contributions.
1 parent bbac870 commit b16e170

File tree

106 files changed

+423
-394
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+423
-394
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Require-Bundle:
1515
org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)",
1616
org.eclipse.text;bundle-version="[3.5.0,4.0.0)",
1717
org.junit;bundle-version="4.12.0"
18+
Import-Package: org.junit.jupiter.api,
19+
org.junit.platform.suite.api
1820
Bundle-RequiredExecutionEnvironment: JavaSE-17
1921
Eclipse-BundleShape: dir
2022
Automatic-Module-Name: org.eclipse.core.filebuffers.tests

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,16 @@
1515

1616
package org.eclipse.core.filebuffers.tests;
1717

18-
import org.junit.runner.RunWith;
19-
import org.junit.runners.Suite;
20-
import org.junit.runners.Suite.SuiteClasses;
21-
18+
import org.junit.platform.suite.api.Suite;
19+
import org.junit.platform.suite.api.SelectClasses;
2220

2321
/**
2422
* Test Suite for org.eclipse.core.filebuffers.
2523
*
2624
* @since 3.0
2725
*/
28-
@RunWith(Suite.class)
29-
@SuiteClasses({ FileBufferCreation.class,
26+
@Suite
27+
@SelectClasses({ FileBufferCreation.class,
3028
FileBuffersForWorkspaceFiles.class,
3129
FileBuffersForExternalFiles.class,
3230
FileBuffersForLinkedFiles.class,
@@ -42,5 +40,5 @@
4240
ResourceTextFileManagerDocCreationTests.class
4341
})
4442
public class FileBuffersTestSuite {
45-
// see @SuiteClasses
43+
// see @SelectClasses
4644
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ Export-Package: org.eclipse.e4.ui.tests.model.test,
3838
Bundle-ActivationPolicy: lazy
3939
Import-Package: jakarta.annotation,
4040
jakarta.inject,
41-
org.osgi.service.event
41+
org.osgi.service.event,
42+
org.junit.jupiter.api,
43+
org.junit.platform.suite.api
4244
Eclipse-BundleShape: dir
4345
Automatic-Module-Name: org.eclipse.e4.ui.tests
4446
Require-Capability: eclipse.swt;filter:="(image.format=svg)"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@
5656
import org.eclipse.e4.ui.workbench.renderers.swt.TabStateHandlerTest;
5757
import org.eclipse.e4.ui.workbench.renderers.swt.ThemeDefinitionChangedHandlerTest;
5858
import org.eclipse.e4.ui.workbench.renderers.swt.ToolBarManagerRendererTest;
59-
import org.junit.runner.RunWith;
60-
import org.junit.runners.Suite;
6159

60+
import org.junit.platform.suite.api.SelectClasses;
61+
import org.junit.platform.suite.api.Suite;
6262

6363
/**
6464
* All E4 UI-related tests
6565
*/
66-
@RunWith(Suite.class)
67-
@Suite.SuiteClasses({
66+
@Suite
67+
@SelectClasses({
6868
StartupTestSuite.class,
6969
UIEventTypesTest.class,
7070
Bug299755Test.class,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
package org.eclipse.e4.ui.tests.application;
1717

18-
import org.junit.runner.RunWith;
19-
import org.junit.runners.Suite;
18+
import org.junit.platform.suite.api.SelectClasses;
19+
import org.junit.platform.suite.api.Suite;
2020

21-
@RunWith(Suite.class)
22-
@Suite.SuiteClasses({ EModelServiceTest.class, EModelServiceFindTest.class, EModelServicePerspectiveFindTest.class,
21+
@Suite
22+
@SelectClasses({ EModelServiceTest.class, EModelServiceFindTest.class, EModelServicePerspectiveFindTest.class,
2323
EModelServiceInsertTest.class, EPartServiceTest.class, ESelectionServiceTest.class, EventBrokerTest.class,
2424
HeadlessContactsDemoTest.class, HeadlessPhotoDemoTest.class, UIEventsTest.class,
2525
})

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
1515
org.eclipse.jface.databinding,
1616
org.eclipse.jface.tests.databinding.conformance,
1717
org.eclipse.core.databinding.property
18+
Import-Package: org.junit.jupiter.api,
19+
org.junit.platform.suite.api
1820
Bundle-RequiredExecutionEnvironment: JavaSE-17
1921
Eclipse-BundleShape: dir
2022
Automatic-Module-Name: org.eclipse.jface.tests.databinding

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@
188188
import org.eclipse.jface.tests.internal.databinding.viewers.ViewerElementMapTest;
189189
import org.eclipse.jface.tests.internal.databinding.viewers.ViewerElementSetTest;
190190
import org.eclipse.jface.tests.internal.databinding.viewers.ViewerElementWrapperTest;
191-
import org.junit.runner.RunWith;
192-
import org.junit.runners.Suite;
193-
import org.junit.runners.Suite.SuiteClasses;
194191

195-
@RunWith(Suite.class)
196-
@SuiteClasses({ AbstractObservableListTest.class, AbstractObservableMapTest.class, AbstractObservableTest.class,
192+
import org.junit.platform.suite.api.Suite;
193+
import org.junit.platform.suite.api.SelectClasses;
194+
195+
@Suite
196+
@SelectClasses({ AbstractObservableListTest.class, AbstractObservableMapTest.class, AbstractObservableTest.class,
197197
AbstractObservableValueTest.class, AbstractStringToNumberValidatorTest.class, AbstractVetoableValueTest.class,
198198
AggregateValidationStatusTest.class, AnonymousBeanValuePropertyTest.class, AnonymousPojoValuePropertyTest.class,
199199
BeanPropertiesTest.class,

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@
1414
*******************************************************************************/
1515
package org.eclipse.jface.tests.databinding.scenarios;
1616

17-
import org.junit.runner.RunWith;
18-
import org.junit.runners.Suite;
19-
import org.junit.runners.Suite.SuiteClasses;
20-
17+
import org.junit.platform.suite.api.Suite;
18+
import org.junit.platform.suite.api.SelectClasses;
2119

2220
/**
2321
* To run this test suite, right-click and select "Run As JUnit Plug-in Test".
@@ -26,8 +24,8 @@
2624
* Mode" as the application to run. You can also run this class as an SWT
2725
* application.
2826
*/
29-
@RunWith(Suite.class)
30-
@SuiteClasses({ ButtonControlScenario.class, ComboScenarios.class, ComboUpdatingTest.class, ComboViewerScenario.class,
27+
@Suite
28+
@SelectClasses({ ButtonControlScenario.class, ComboScenarios.class, ComboUpdatingTest.class, ComboViewerScenario.class,
3129
CustomConverterScenarios.class, CustomScenarios.class, ListViewerScenario.class, MasterDetailScenarios.class,
3230
NewTableScenarios.class, NPETestScenario.class, PropertyScenarios.class, SpinnerControlScenario.class,
3331
TableScenarios.class, TextControlScenario.class })

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Bundle-Name: Jface notifications tests
44
Bundle-SymbolicName: org.eclipse.jface.tests.notifications
55
Bundle-Vendor: Eclipse.org
66
Bundle-Version: 0.2.0.qualifier
7+
Import-Package: org.junit.jupiter.api,
8+
org.junit.platform.suite.api
79
Automatic-Module-Name: org.eclipse.jface.notifications.tests
810
Bundle-RequiredExecutionEnvironment: JavaSE-17
911
Require-Bundle: org.junit,

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313

1414
package org.eclipse.jface.tests.notifications;
1515

16-
import org.junit.runner.RunWith;
17-
import org.junit.runners.Suite;
18-
import org.junit.runners.Suite.SuiteClasses;
16+
import org.junit.platform.suite.api.Suite;
17+
import org.junit.platform.suite.api.SelectClasses;
1918

20-
@RunWith(Suite.class)
21-
@SuiteClasses({ NotificationPopupTest.class })
19+
@Suite
20+
@SelectClasses({ NotificationPopupTest.class })
2221
public class AllTests {
2322

2423
}

0 commit comments

Comments
 (0)