Skip to content

Commit c41e3b9

Browse files
HeikoKlareHeikoKlare
committed
Migrate test suites in org.eclipse.ui.tests to JUnit 5
1 parent e9db486 commit c41e3b9

29 files changed

+426
-406
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@
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({ //
21+
DirectoryProposalContentAssistTest.class //
22+
})
2123
public class DirectoryProposalContentAssistTestSuite {
2224

2325
}

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

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -58,56 +58,56 @@
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+
import org.junit.platform.suite.api.SelectClasses;
62+
import org.junit.platform.suite.api.Suite;
6363

6464
/**
6565
* Test all areas of the UI.
6666
*/
67-
@RunWith(Suite.class)
68-
@Suite.SuiteClasses({
69-
StartupTest.class,
70-
UIAutomatedSuite.class,
71-
ApiTestSuite.class,
72-
NavigatorTestSuite.class,
73-
DecoratorsTestSuite.class,
74-
DataTransferTestSuite.class,
75-
PreferencesTestSuite.class,
76-
KeysTestSuite.class,
77-
ActivitiesTestSuite.class,
78-
ThemesTestSuite.class,
79-
EncodingTestSuite.class,
80-
OperationsTestSuite.class,
81-
FieldAssistTestSuite.class,
82-
ServicesTestSuite.class,
83-
PluginActivationTests.class,
84-
ProgressTestSuite.class,
85-
PropertySheetTestSuite.class,
86-
AdaptableTestSuite.class,
87-
MultiPageEditorTestSuite.class,
88-
CommandsTestSuite.class,
89-
ContextsTestSuite.class,
90-
ConcurrencyTestSuite.class,
91-
FilteredTableTests.class,
92-
FilteredTreeTests.class,
93-
PatternFilterTest.class,
94-
StatusHandlingTestSuite.class,
95-
MenusTestSuite.class,
96-
QuickAccessTestSuite.class,
97-
FilteredResourcesSelectionDialogTestSuite.class,
98-
DirectoryProposalContentAssistTestSuite.class,
99-
InternalTestSuite.class,
100-
LeaksTestSuite.class,
101-
StyledStringHighlighterTest.class,
102-
ZoomTestSuite.class,
103-
DynamicPluginsTestSuite.class,
104-
IntroTestSuite.class,
105-
MultiEditorTestSuite.class,
106-
OpenSystemInPlaceEditorTest.class,
107-
WorkbenchDatabindingTest.class,
108-
ChooseWorkspaceDialogTests.class,
109-
ViewerItemsLimitTest.class,
110-
OpenCloseTest.class
67+
@Suite
68+
@SelectClasses({ //
69+
StartupTest.class, //
70+
UIAutomatedSuite.class, //
71+
ApiTestSuite.class, //
72+
NavigatorTestSuite.class, //
73+
DecoratorsTestSuite.class, //
74+
DataTransferTestSuite.class, //
75+
PreferencesTestSuite.class, //
76+
KeysTestSuite.class, //
77+
ActivitiesTestSuite.class, //
78+
ThemesTestSuite.class, //
79+
EncodingTestSuite.class, //
80+
OperationsTestSuite.class, //
81+
FieldAssistTestSuite.class, //
82+
ServicesTestSuite.class, //
83+
PluginActivationTests.class, //
84+
ProgressTestSuite.class, //
85+
PropertySheetTestSuite.class, //
86+
AdaptableTestSuite.class, //
87+
MultiPageEditorTestSuite.class, //
88+
CommandsTestSuite.class, //
89+
ContextsTestSuite.class, //
90+
ConcurrencyTestSuite.class, //
91+
FilteredTableTests.class, //
92+
FilteredTreeTests.class, //
93+
PatternFilterTest.class, //
94+
StatusHandlingTestSuite.class, //
95+
MenusTestSuite.class, //
96+
QuickAccessTestSuite.class, //
97+
FilteredResourcesSelectionDialogTestSuite.class, //
98+
DirectoryProposalContentAssistTestSuite.class, //
99+
InternalTestSuite.class, //
100+
LeaksTestSuite.class, //
101+
StyledStringHighlighterTest.class, //
102+
ZoomTestSuite.class, //
103+
DynamicPluginsTestSuite.class, //
104+
IntroTestSuite.class, //
105+
MultiEditorTestSuite.class, //
106+
OpenSystemInPlaceEditorTest.class, //
107+
WorkbenchDatabindingTest.class, //
108+
ChooseWorkspaceDialogTests.class, //
109+
ViewerItemsLimitTest.class, //
110+
OpenCloseTest.class, //
111111
})
112112
public class UiTestSuite {
113113
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@
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({
25-
ImagesTest.class,
26-
UtilTest.class,
27-
StaticTest.class,
28-
DynamicTest.class,
29-
PersistanceTest.class,
30-
ActivityPreferenceTest.class,
31-
MenusTest.class,
32-
PatternUtilTest.class
23+
@Suite
24+
@SelectClasses({ //
25+
ImagesTest.class, //
26+
UtilTest.class, //
27+
StaticTest.class, //
28+
DynamicTest.class, //
29+
PersistanceTest.class, //
30+
ActivityPreferenceTest.class, //
31+
MenusTest.class, //
32+
PatternUtilTest.class //
3333
})
3434
public class ActivitiesTestSuite {
3535

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,18 @@
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
/**
20-
* The AdaptableTestSuite is the TestSuite for the
21-
* adaptable support in the UI.
20+
* The AdaptableTestSuite is the TestSuite for the adaptable support in the UI.
2221
*/
23-
@RunWith(Suite.class)
24-
@Suite.SuiteClasses({
25-
AdaptableDecoratorTestCase.class,
26-
MarkerImageProviderTest.class,
27-
WorkingSetTestCase.class,
28-
SelectionAdapterTest.class,
22+
@Suite
23+
@SelectClasses({ //
24+
AdaptableDecoratorTestCase.class, //
25+
MarkerImageProviderTest.class, //
26+
WorkingSetTestCase.class, //
27+
SelectionAdapterTest.class, //
2928
})
3029
public class AdaptableTestSuite {
3130
}

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

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -25,67 +25,67 @@
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;
28+
import org.junit.platform.suite.api.SelectClasses;
29+
import org.junit.platform.suite.api.Suite;
3030

31-
@RunWith(Suite.class)
32-
@Suite.SuiteClasses({
33-
IPageLayoutTest.class,
34-
PlatformUITest.class,
35-
IWorkbenchTest.class,
36-
IWorkbenchWindowTest.class,
37-
IWorkbenchPageTest.class,
38-
IDeprecatedWorkbenchPageTest.class,
39-
IActionFilterTest.class,
40-
IPageListenerTest.class,
41-
IAggregateWorkingSetTest.class,
42-
IPageServiceTest.class,
43-
IPerspectiveRegistryTest.class,
44-
IPerspectiveDescriptorTest.class,
45-
IFileEditorMappingTest.class,
46-
IEditorDescriptorTest.class,
47-
IEditorRegistryTest.class,
48-
IPerspectiveListenerTest.class,
49-
IWorkbenchWindowActionDelegateTest.class,
50-
IViewActionDelegateTest.class,
51-
IViewSiteTest.class,
52-
IEditorSiteTest.class,
53-
IActionBarsTest.class,
54-
IViewPartTest.class,
55-
IEditorPartTest.class,
56-
IEditorActionBarContributorTest.class,
57-
IPartServiceTest.class,
58-
ISelectionServiceTest.class,
59-
SelectionListenerFactoryTest.class,
60-
IWorkingSetTest.class,
61-
IWorkingSetManagerTest.class,
62-
IWorkingSetElementAdapterTests.class,
63-
MockWorkingSetTest.class,
64-
Bug42616Test.class,
65-
StickyViewTest.class,
66-
EditorIconTest.class,
67-
RawIViewPartTest.class,
68-
ViewPartTitleTest.class,
69-
OverriddenTitleTest.class,
70-
UIJobTest.class,
71-
Bug75118Test.class,
72-
FileEditorInputTest.class,
73-
IDETest.class,
74-
IDETest2.class,
75-
IEditorMatchingStrategyTest.class,
76-
XMLMementoTest.class,
77-
IWorkbenchPartTestableTests.class,
78-
ArbitraryPropertyTest.class,
79-
LifecycleViewTest.class,
80-
DependencyInjectionViewTest.class,
81-
Bug407422Test.class,
82-
MultipleWindowsTest.class,
83-
Bug543609Test.class,
84-
SaveablesListTest.class,
85-
PerspectiveExtensionReaderTest.class,
86-
ModeledPageLayoutTest.class,
87-
WorkbenchPluginTest.class,
88-
CloseAllHandlerTest.class
31+
@Suite
32+
@SelectClasses({ //
33+
IPageLayoutTest.class, //
34+
PlatformUITest.class, //
35+
IWorkbenchTest.class, //
36+
IWorkbenchWindowTest.class, //
37+
IWorkbenchPageTest.class, //
38+
IDeprecatedWorkbenchPageTest.class, //
39+
IActionFilterTest.class, //
40+
IPageListenerTest.class, //
41+
IAggregateWorkingSetTest.class, //
42+
IPageServiceTest.class, //
43+
IPerspectiveRegistryTest.class, //
44+
IPerspectiveDescriptorTest.class, //
45+
IFileEditorMappingTest.class, //
46+
IEditorDescriptorTest.class, //
47+
IEditorRegistryTest.class, //
48+
IPerspectiveListenerTest.class, //
49+
IWorkbenchWindowActionDelegateTest.class, //
50+
IViewActionDelegateTest.class, //
51+
IViewSiteTest.class, //
52+
IEditorSiteTest.class, //
53+
IActionBarsTest.class, //
54+
IViewPartTest.class, //
55+
IEditorPartTest.class, //
56+
IEditorActionBarContributorTest.class, //
57+
IPartServiceTest.class, //
58+
ISelectionServiceTest.class, //
59+
SelectionListenerFactoryTest.class, //
60+
IWorkingSetTest.class, //
61+
IWorkingSetManagerTest.class, //
62+
IWorkingSetElementAdapterTests.class, //
63+
MockWorkingSetTest.class, //
64+
Bug42616Test.class, //
65+
StickyViewTest.class, //
66+
EditorIconTest.class, //
67+
RawIViewPartTest.class, //
68+
ViewPartTitleTest.class, //
69+
OverriddenTitleTest.class, //
70+
UIJobTest.class, //
71+
Bug75118Test.class, //
72+
FileEditorInputTest.class, //
73+
IDETest.class, //
74+
IDETest2.class, //
75+
IEditorMatchingStrategyTest.class, //
76+
XMLMementoTest.class, //
77+
IWorkbenchPartTestableTests.class, //
78+
ArbitraryPropertyTest.class, //
79+
LifecycleViewTest.class, //
80+
DependencyInjectionViewTest.class, //
81+
Bug407422Test.class, //
82+
MultipleWindowsTest.class, //
83+
Bug543609Test.class, //
84+
SaveablesListTest.class, //
85+
PerspectiveExtensionReaderTest.class, //
86+
ModeledPageLayoutTest.class, //
87+
WorkbenchPluginTest.class, //
88+
CloseAllHandlerTest.class //
8989
})
9090
public class ApiTestSuite {
9191

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,32 @@
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({
25-
CommandExecutionTest.class,
26-
Bug73756Test.class,
27-
Bug125792Test.class,
28-
Bug417762Test.class,
29-
CommandManagerTest.class,
30-
CommandParameterTypeTest.class,
31-
CommandSerializationTest.class,
32-
HandlerActivationTest.class,
33-
CommandCallbackTest.class,
34-
CommandActionTest.class,
35-
HelpContextIdTest.class,
36-
StateTest.class,
37-
CommandEnablementTest.class,
38-
ActionDelegateProxyTest.class,
39-
ToggleStateTest.class,
40-
RadioStateTest.class,
41-
WorkbenchStateTest.class,
42-
E4CommandImageTest.class
23+
@Suite
24+
@SelectClasses({ //
25+
CommandExecutionTest.class, //
26+
Bug73756Test.class, //
27+
Bug125792Test.class, //
28+
Bug417762Test.class, //
29+
CommandManagerTest.class, //
30+
CommandParameterTypeTest.class, //
31+
CommandSerializationTest.class, //
32+
HandlerActivationTest.class, //
33+
CommandCallbackTest.class, //
34+
CommandActionTest.class, //
35+
HelpContextIdTest.class, //
36+
StateTest.class, //
37+
CommandEnablementTest.class, //
38+
ActionDelegateProxyTest.class, //
39+
ToggleStateTest.class, //
40+
RadioStateTest.class, //
41+
WorkbenchStateTest.class, //
42+
E4CommandImageTest.class //
4343
})
4444
public final class CommandsTestSuite {
4545
}

0 commit comments

Comments
 (0)