Skip to content

Commit f3c75f6

Browse files
vogellaakurtakov
authored andcommitted
Migrate org.eclipse.e4.ui.tests from JUnit4 to JUnit5
- 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
1 parent 8046af5 commit f3c75f6

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

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
})

0 commit comments

Comments
 (0)