Skip to content

Commit b752d56

Browse files
vogellaakurtakov
authored andcommitted
Migrate org.eclipse.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 745f6d6 commit b752d56

34 files changed

+141
-135
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
*******************************************************************************/
1414
package org.eclipse.ui.internal.ide;
1515

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

19-
@RunWith(Suite.class)
20-
@Suite.SuiteClasses({ DirectoryProposalContentAssistTest.class })
19+
@Suite
20+
@SelectClasses({ DirectoryProposalContentAssistTest.class })
2121
public class DirectoryProposalContentAssistTestSuite {
2222

2323
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,15 @@
5858
import org.eclipse.ui.tests.systeminplaceeditor.OpenSystemInPlaceEditorTest;
5959
import org.eclipse.ui.tests.themes.ThemesTestSuite;
6060
import org.eclipse.ui.tests.zoom.ZoomTestSuite;
61-
import org.junit.runner.RunWith;
62-
import org.junit.runners.Suite;
61+
62+
import org.junit.platform.suite.api.SelectClasses;
63+
import org.junit.platform.suite.api.Suite;
6364

6465
/**
6566
* Test all areas of the UI.
6667
*/
67-
@RunWith(Suite.class)
68-
@Suite.SuiteClasses({
68+
@Suite
69+
@SelectClasses({
6970
StartupTest.class,
7071
UIAutomatedSuite.class,
7172
ApiTestSuite.class,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
*******************************************************************************/
1515
package org.eclipse.ui.tests.activities;
1616

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

2020
/**
2121
* The ActivitiesTestSuite class runs the activities' test suites.
2222
*/
23-
@RunWith(Suite.class)
24-
@Suite.SuiteClasses({
23+
@Suite
24+
@SelectClasses({
2525
ImagesTest.class,
2626
UtilTest.class,
2727
StaticTest.class,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
*******************************************************************************/
1414
package org.eclipse.ui.tests.adaptable;
1515

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

1919
/**
2020
* The AdaptableTestSuite is the TestSuite for the
2121
* adaptable support in the UI.
2222
*/
23-
@RunWith(Suite.class)
24-
@Suite.SuiteClasses({
23+
@Suite
24+
@SelectClasses({
2525
AdaptableDecoratorTestCase.class,
2626
MarkerImageProviderTest.class,
2727
WorkingSetTestCase.class,

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525
import org.eclipse.ui.tests.ide.api.FileEditorInputTest;
2626
import org.eclipse.ui.tests.ide.api.IDETest;
2727
import org.eclipse.ui.tests.ide.api.IDETest2;
28-
import org.junit.runner.RunWith;
29-
import org.junit.runners.Suite;
3028

31-
@RunWith(Suite.class)
32-
@Suite.SuiteClasses({
29+
import org.junit.platform.suite.api.SelectClasses;
30+
import org.junit.platform.suite.api.Suite;
31+
32+
@Suite
33+
@SelectClasses({
3334
IPageLayoutTest.class,
3435
PlatformUITest.class,
3536
IWorkbenchTest.class,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
*******************************************************************************/
1515
package org.eclipse.ui.tests.commands;
1616

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

2020
/**
2121
* Tests for all areas of command support for the platform.
2222
*/
23-
@RunWith(Suite.class)
24-
@Suite.SuiteClasses({
23+
@Suite
24+
@SelectClasses({
2525
CommandExecutionTest.class,
2626
Bug73756Test.class,
2727
Bug125792Test.class,

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/concurrency/ConcurrencyTestSuite.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
*******************************************************************************/
1414
package org.eclipse.ui.tests.concurrency;
1515

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

1919
/**
2020
* The suite of tests related to concurrency and deadlock.
2121
*
2222
* @since 3.1
2323
*/
24-
@RunWith(Suite.class)
25-
@Suite.SuiteClasses({
24+
@Suite
25+
@SelectClasses({
2626
ModalContextCrashTest.class,
2727
NestedSyncExecDeadlockTest.class,
2828
SyncExecWhileUIThreadWaitsForRuleTest.class,

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/contexts/ContextsTestSuite.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
*******************************************************************************/
1414
package org.eclipse.ui.tests.contexts;
1515

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

1919
/**
2020
* The suite of tests related to the "org.eclipse.ui.contexts" extension point,
@@ -24,8 +24,8 @@
2424
*
2525
* @since 3.0
2626
*/
27-
@RunWith(Suite.class)
28-
@Suite.SuiteClasses({
27+
@Suite
28+
@SelectClasses({
2929
Bug74990Test.class,
3030
Bug84763Test.class,
3131
ExtensionTestCase.class,

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/DataTransferTestSuite.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
*******************************************************************************/
1717
package org.eclipse.ui.tests.datatransfer;
1818

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

22-
@RunWith(Suite.class)
23-
@Suite.SuiteClasses({
22+
@Suite
23+
@SelectClasses({
2424
ImportOperationTest.class,
2525
ImportArchiveOperationTest.class,
2626
ExportFileSystemOperationTest.class,

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
*******************************************************************************/
1515
package org.eclipse.ui.tests.decorators;
1616

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

20-
@RunWith(Suite.class)
21-
@Suite.SuiteClasses({
20+
@Suite
21+
@SelectClasses({
2222
ExceptionDecoratorTestCase.class,
2323
DecoratorTestCase.class,
2424
LightweightDecoratorTestCase.class,

0 commit comments

Comments
 (0)