Skip to content

Commit bd34de0

Browse files
HeikoKlareakurtakov
HeikoKlare
authored and
akurtakov
committed
Migrate debug test suites to JUnit 5
1 parent 71744eb commit bd34de0

File tree

5 files changed

+64
-61
lines changed

5 files changed

+64
-61
lines changed

‎debug/org.eclipse.debug.tests/META-INF/MANIFEST.MF‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ Export-Package: org.eclipse.debug.tests,
3030
org.eclipse.debug.tests.view.memory,
3131
org.eclipse.debug.tests.viewer.model
3232
Import-Package: org.assertj.core.api;version="3.24.2",
33-
org.assertj.core.api.iterable
33+
org.assertj.core.api.iterable,
34+
org.junit.jupiter.api;version="[5.14.0,6.0.0)",
35+
org.junit.platform.suite.api;version="[1.14.0,2.0.0)"
3436
Eclipse-BundleShape: dir
3537
Automatic-Module-Name: org.eclipse.debug.tests

‎debug/org.eclipse.debug.tests/Platform Debug Test Suite.launch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
2323
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
2424
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
25-
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
26-
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
25+
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
26+
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
2727
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.debug.tests.AutomatedSuite"/>
2828
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
2929
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.debug.tests"/>

‎debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -59,83 +59,83 @@
5959
import org.eclipse.debug.tests.viewer.model.VirtualViewerSelectionTests;
6060
import org.eclipse.debug.tests.viewer.model.VirtualViewerStateTests;
6161
import org.eclipse.debug.tests.viewer.model.VirtualViewerUpdateTests;
62-
import org.junit.runner.RunWith;
63-
import org.junit.runners.Suite;
62+
import org.junit.platform.suite.api.SelectClasses;
63+
import org.junit.platform.suite.api.Suite;
6464

6565
/**
6666
* Tests for integration and nightly builds.
6767
*
6868
* @since 3.6
6969
*/
70-
@RunWith(Suite.class)
71-
@Suite.SuiteClasses({
70+
@Suite
71+
@SelectClasses({
7272
// Source lookup tests
73-
SourceLookupFacilityTests.class,
73+
SourceLookupFacilityTests.class, //
7474
// BP tests
75-
BreakpointOrderingTests.class,
76-
BreakpointTests.class,
77-
SerialExecutorTest.class,
75+
BreakpointOrderingTests.class, //
76+
BreakpointTests.class, //
77+
SerialExecutorTest.class, //
7878
// Note: jface viewer tests were moved out of nightly tests
7979
// due to frequent problems on nightly build machines.
8080
// (Bug 343308).
8181

8282
// Virtual viewer tests
83-
VirtualViewerCheckTests.class,
84-
VirtualViewerDeltaTests.class,
85-
VirtualViewerContentTests.class,
86-
VirtualViewerLazyModeTests.class,
87-
VirtualViewerSelectionTests.class,
88-
VirtualViewerStateTests.class,
89-
VirtualViewerUpdateTests.class,
90-
VirtualViewerFilterTests.class,
83+
VirtualViewerCheckTests.class, //
84+
VirtualViewerDeltaTests.class, //
85+
VirtualViewerContentTests.class, //
86+
VirtualViewerLazyModeTests.class, //
87+
VirtualViewerSelectionTests.class, //
88+
VirtualViewerStateTests.class, //
89+
VirtualViewerUpdateTests.class, //
90+
VirtualViewerFilterTests.class, //
9191

9292
// Viewer neutral tests
93-
FilterTransformTests.class,
94-
ChildrenUpdateTests.class,
95-
PresentationContextTests.class,
96-
VariableValueEditorManagerTests.class,
93+
FilterTransformTests.class, //
94+
ChildrenUpdateTests.class, //
95+
PresentationContextTests.class, //
96+
VariableValueEditorManagerTests.class, //
9797

9898
// Memory view
99-
MemoryRenderingTests.class,
100-
TableRenderingTests.class,
99+
MemoryRenderingTests.class, //
100+
TableRenderingTests.class, //
101101

102102
// Launch framework
103-
LaunchConfigurationTests.class,
104-
AcceleratorSubstitutionTests.class,
105-
LaunchHistoryTests.class,
106-
LaunchFavoriteTests.class,
107-
LaunchManagerTests.class,
108-
RefreshTabTests.class,
109-
ArgumentParsingTests.class,
110-
LaunchTests.class,
103+
LaunchConfigurationTests.class, //
104+
AcceleratorSubstitutionTests.class, //
105+
LaunchHistoryTests.class, //
106+
LaunchFavoriteTests.class, //
107+
LaunchManagerTests.class, //
108+
RefreshTabTests.class, //
109+
ArgumentParsingTests.class, //
110+
LaunchTests.class, //
111111

112112
// Status handlers
113-
StatusHandlerTests.class,
113+
StatusHandlerTests.class, //
114114

115115
// Step filters
116-
StepFiltersTests.class,
116+
StepFiltersTests.class, //
117117

118118
// Console view
119-
ConsoleDocumentAdapterTests.class,
120-
ConsoleManagerTests.class,
121-
ConsoleTests.class,
122-
IOConsoleTests.class,
123-
IOConsoleFixedWidthTests.class,
124-
ProcessConsoleManagerTests.class,
125-
ProcessConsoleTests.class,
126-
StreamsProxyTests.class,
127-
TextConsoleViewerTest.class,
128-
RuntimeProcessTests.class,
129-
OutputStreamMonitorTests.class,
130-
InputStreamMonitorTests.class,
131-
FileLinkTests.class,
119+
ConsoleDocumentAdapterTests.class, //
120+
ConsoleManagerTests.class, //
121+
ConsoleTests.class, //
122+
IOConsoleTests.class, //
123+
IOConsoleFixedWidthTests.class, //
124+
ProcessConsoleManagerTests.class, //
125+
ProcessConsoleTests.class, //
126+
StreamsProxyTests.class, //
127+
TextConsoleViewerTest.class, //
128+
RuntimeProcessTests.class, //
129+
OutputStreamMonitorTests.class, //
130+
InputStreamMonitorTests.class, //
131+
FileLinkTests.class, //
132132

133133
// Launch Groups
134-
LaunchGroupTests.class,
135-
LaunchConfigurationTabGroupViewerTest.class,
134+
LaunchGroupTests.class, //
135+
LaunchConfigurationTabGroupViewerTest.class, //
136136

137137
// Logical structure
138-
LogicalStructureCacheTest.class,
138+
LogicalStructureCacheTest.class, //
139139
})
140140
public class AutomatedSuite {
141141
}

‎debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/LocalSuite.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323
import org.eclipse.debug.tests.viewer.model.JFaceViewerStateTests;
2424
import org.eclipse.debug.tests.viewer.model.JFaceViewerTopIndexTests;
2525
import org.eclipse.debug.tests.viewer.model.JFaceViewerUpdateTests;
26-
import org.junit.runner.RunWith;
27-
import org.junit.runners.Suite;
26+
import org.junit.platform.suite.api.SelectClasses;
27+
import org.junit.platform.suite.api.Suite;
2828

2929
/**
3030
* Tests to run locally. They require a user terminal to execute correctly
3131
* and have frequent issues when run on build machine.
3232
*
3333
* @since 3.7
3434
*/
35-
@RunWith(Suite.class)
36-
@Suite.SuiteClasses({
35+
@Suite
36+
@SelectClasses({ //
3737
JFaceViewerCheckTests.class, JFaceViewerContentTests.class,
3838
JFaceViewerDeltaTests.class, JFaceViewerSelectionTests.class,
3939
JFaceViewerStateTests.class, JFaceViewerUpdateTests.class,

‎debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/PerformanceSuite.java‎

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

1616
import org.eclipse.debug.tests.viewer.model.JFaceViewerPerformanceTests;
1717
import org.eclipse.debug.tests.viewer.model.VirtualViewerPerformanceTests;
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

2121
/**
2222
* Tests for release builds.
2323
*
2424
* @since 3.6
2525
*/
26-
@RunWith(Suite.class)
27-
@Suite.SuiteClasses({
28-
JFaceViewerPerformanceTests.class,
29-
VirtualViewerPerformanceTests.class })
26+
@Suite
27+
@SelectClasses({ //
28+
JFaceViewerPerformanceTests.class, //
29+
VirtualViewerPerformanceTests.class, //
30+
})
3031
public class PerformanceSuite {
3132
}

0 commit comments

Comments
 (0)