Skip to content

Commit b6c97c7

Browse files
committed
Undeprecate traditional execute() methods in the Launcher API
This commit undeprecates the execute(TestPlan, ...) and execute(LauncherDiscoveryRequest, ...) methods in the Launcher API. See #4724 Closes #4866
1 parent 9550e41 commit b6c97c7

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

documentation/src/docs/asciidoc/release-notes/release-notes-6.0.0-RC2.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ guidance on upgrading from JUnit 5.x.y to 6.0.0.
3636
[[release-notes-6.0.0-RC2-junit-platform-new-features-and-improvements]]
3737
==== New Features and Improvements
3838

39+
* The `execute(TestPlan,{nbsp}TestExecutionListener...)` and
40+
`execute(LauncherDiscoveryRequest,{nbsp}TestExecutionListener...)` methods in the
41+
`Launcher` API are no longer deprecated.
3942
* New `discoveryRequest()` method in `{LauncherDiscoveryRequestBuilder}`, which is an
4043
alias for the existing `request()` method and is intended to be used via a `static`
4144
import.

junit-platform-launcher/src/main/java/org/junit/platform/launcher/Launcher.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
package org.junit.platform.launcher;
1212

13-
import static org.apiguardian.api.API.Status.DEPRECATED;
1413
import static org.apiguardian.api.API.Status.MAINTAINED;
1514
import static org.apiguardian.api.API.Status.STABLE;
1615

@@ -107,10 +106,9 @@ public interface Launcher {
107106
*
108107
* @param discoveryRequest the launcher discovery request; never {@code null}
109108
* @param listeners additional test execution listeners; never {@code null}
110-
* @deprecated Please use {@link #execute(LauncherExecutionRequest)} instead.
109+
* @see #execute(TestPlan, TestExecutionListener...)
110+
* @see #execute(LauncherExecutionRequest)
111111
*/
112-
@Deprecated(since = "6.0")
113-
@API(status = DEPRECATED, since = "6.0")
114112
default void execute(LauncherDiscoveryRequest discoveryRequest, TestExecutionListener... listeners) {
115113
var executionRequest = LauncherExecutionRequestBuilder.request(discoveryRequest) //
116114
.listeners(listeners) //
@@ -133,10 +131,10 @@ default void execute(LauncherDiscoveryRequest discoveryRequest, TestExecutionLis
133131
* @param testPlan the test plan to execute; never {@code null}
134132
* @param listeners additional test execution listeners; never {@code null}
135133
* @since 1.4
136-
* @deprecated Please use {@link #execute(LauncherExecutionRequest)} instead.
134+
* @see #execute(LauncherDiscoveryRequest, TestExecutionListener...)
135+
* @see #execute(LauncherExecutionRequest)
137136
*/
138-
@Deprecated(since = "6.0")
139-
@API(status = DEPRECATED, since = "6.0")
137+
@API(status = STABLE, since = "1.4")
140138
default void execute(TestPlan testPlan, TestExecutionListener... listeners) {
141139
var executionRequest = LauncherExecutionRequestBuilder.request(testPlan) //
142140
.listeners(listeners) //
@@ -168,6 +166,8 @@ default void execute(TestPlan testPlan, TestExecutionListener... listeners) {
168166
*
169167
* @param executionRequest the launcher execution request; never {@code null}
170168
* @since 6.0
169+
* @see #execute(LauncherDiscoveryRequest, TestExecutionListener...)
170+
* @see #execute(TestPlan, TestExecutionListener...)
171171
*/
172172
@API(status = MAINTAINED, since = "6.0")
173173
void execute(LauncherExecutionRequest executionRequest);

platform-tests/src/test/java/org/junit/platform/launcher/core/LauncherSessionTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class LauncherSessionTests {
3636
.build();
3737
LauncherDiscoveryRequest discoveryRequest = discoveryRequest().build();
3838

39-
@SuppressWarnings("deprecation")
4039
@Test
4140
void callsRegisteredListenersWhenLauncherIsUsedDirectly() {
4241
var launcher = LauncherFactory.create(launcherConfig);
@@ -87,7 +86,7 @@ void callsRegisteredListenersWhenLauncherIsUsedDirectly() {
8786
}
8887

8988
@Test
90-
@SuppressWarnings({ "deprecation", "resource" })
89+
@SuppressWarnings("resource")
9190
void callsRegisteredListenersWhenLauncherIsUsedViaSession() {
9291
var session = LauncherFactory.openSession(launcherConfig);
9392
var launcher = session.getLauncher();
@@ -115,7 +114,7 @@ void callsRegisteredListenersWhenLauncherIsUsedViaSession() {
115114
}
116115

117116
@Test
118-
@SuppressWarnings({ "deprecation", "resource" })
117+
@SuppressWarnings("resource")
119118
void closedSessionCannotBeUsed() {
120119
var session = LauncherFactory.openSession(launcherConfig);
121120
var launcher = session.getLauncher();

0 commit comments

Comments
 (0)