Skip to content

Commit 893617c

Browse files
committed
Fix Javadoc of DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME
1 parent 3d75f99 commit 893617c

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java

+13-6
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,12 @@ public final class LauncherDiscoveryRequestBuilder {
9292
*
9393
* <p>Supported values are {@code "logging"} and {@code "abortOnFailure"}.
9494
*
95-
* <p>If not specified, the default is {@code "logging"}.
95+
* <p>If not specified, the default is {@value #DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_VALUE}.
9696
*/
9797
public static final String DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME = "junit.platform.discovery.listener.default";
9898

99+
private static final String DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_VALUE = "abortOnFailure";
100+
99101
private final List<DiscoverySelector> selectors = new ArrayList<>();
100102
private final List<EngineFilter> engineFilters = new ArrayList<>();
101103
private final List<DiscoveryFilter<?>> discoveryFilters = new ArrayList<>();
@@ -305,11 +307,8 @@ private LauncherConfigurationParameters buildLauncherConfigurationParameters() {
305307
}
306308

307309
private LauncherDiscoveryListener getLauncherDiscoveryListener(ConfigurationParameters configurationParameters) {
308-
LauncherDiscoveryListener defaultDiscoveryListener = configurationParameters.get(
309-
DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME) //
310-
.map(value -> LauncherDiscoveryListeners.fromConfigurationParameter(
311-
DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME, value)) //
312-
.orElseGet(LauncherDiscoveryListeners::abortOnFailure);
310+
LauncherDiscoveryListener defaultDiscoveryListener = getDefaultLauncherDiscoveryListener(
311+
configurationParameters);
313312
if (discoveryListeners.isEmpty()) {
314313
return defaultDiscoveryListener;
315314
}
@@ -322,4 +321,12 @@ private LauncherDiscoveryListener getLauncherDiscoveryListener(ConfigurationPara
322321
return LauncherDiscoveryListeners.composite(allDiscoveryListeners);
323322
}
324323

324+
private LauncherDiscoveryListener getDefaultLauncherDiscoveryListener(
325+
ConfigurationParameters configurationParameters) {
326+
String value = configurationParameters.get(DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME) //
327+
.orElse(DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_VALUE);
328+
return LauncherDiscoveryListeners.fromConfigurationParameter(
329+
DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME, value);
330+
}
331+
325332
}

0 commit comments

Comments
 (0)