Fix Javadoc of DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME

junit-team · Nov 28, 2021 · 0a17b29 · 0a17b29
1 parent 6a47ae1
commit 0a17b29
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/...ncher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java b/...ncher/src/main/java/org/junit/platform/launcher/core/LauncherDiscoveryRequestBuilder.java
@@ -92,10 +92,12 @@ public final class LauncherDiscoveryRequestBuilder {
 	 *
 	 * <p>Supported values are {@code "logging"} and {@code "abortOnFailure"}.
 	 *
-	 * <p>If not specified, the default is {@code "logging"}.
+	 * <p>If not specified, the default is {@value #DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_VALUE}.
 	 */
 	public static final String DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME = "junit.platform.discovery.listener.default";
 
+	private static final String DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_VALUE = "abortOnFailure";
+
 	private final List<DiscoverySelector> selectors = new ArrayList<>();
 	private final List<EngineFilter> engineFilters = new ArrayList<>();
 	private final List<DiscoveryFilter<?>> discoveryFilters = new ArrayList<>();
@@ -305,11 +307,8 @@ private LauncherConfigurationParameters buildLauncherConfigurationParameters() {
 	}
 
 	private LauncherDiscoveryListener getLauncherDiscoveryListener(ConfigurationParameters configurationParameters) {
-		LauncherDiscoveryListener defaultDiscoveryListener = configurationParameters.get(
-			DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME) //
-				.map(value -> LauncherDiscoveryListeners.fromConfigurationParameter(
-					DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME, value)) //
-				.orElseGet(LauncherDiscoveryListeners::abortOnFailure);
+		LauncherDiscoveryListener defaultDiscoveryListener = getDefaultLauncherDiscoveryListener(
+			configurationParameters);
 		if (discoveryListeners.isEmpty()) {
 			return defaultDiscoveryListener;
 		}
@@ -322,4 +321,12 @@ private LauncherDiscoveryListener getLauncherDiscoveryListener(ConfigurationPara
 		return LauncherDiscoveryListeners.composite(allDiscoveryListeners);
 	}
 
+	private LauncherDiscoveryListener getDefaultLauncherDiscoveryListener(
+			ConfigurationParameters configurationParameters) {
+		String value = configurationParameters.get(DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME) //
+				.orElse(DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_VALUE);
+		return LauncherDiscoveryListeners.fromConfigurationParameter(
+			DEFAULT_DISCOVERY_LISTENER_CONFIGURATION_PROPERTY_NAME, value);
+	}
+
 }