Rename to Parallel... instead of Concurrent... for consistency

Author: marcphilipp

documentation/src/docs/asciidoc/release-notes/release-notes-6.1.0-M1.adoc

@@ -22,7 +22,7 @@ repository on GitHub.
 ==== Deprecations and Breaking Changes
 
 * Deprecate constructors for `ForkJoinPoolHierarchicalTestExecutorService` in favor of the
-  new `ConcurrentHierarchicalTestExecutorServiceFactory` that also supports
+  new `ParallelHierarchicalTestExecutorServiceFactory` that also supports
   `WorkerThreadPoolHierarchicalTestExecutorService`.
 
 [[release-notes-6.1.0-M1-junit-platform-new-features-and-improvements]]
@@ -32,7 +32,7 @@ repository on GitHub.
   its classloader for test discovery.
 * New `WorkerThreadPoolHierarchicalTestExecutorService` implementation of parallel test
   execution that is backed by a regular thread pool rather than a `ForkJoinPool`. Engine
-  authors should switch to use `ConcurrentHierarchicalTestExecutorServiceFactory` rather
+  authors should switch to use `ParallelHierarchicalTestExecutorServiceFactory` rather
   than instantiating a concrete `HierarchicalTestExecutorService` implementation for
   parallel execution directly.
 * `OpenTestReportGeneratingListener` now supports redirecting XML events to a socket via

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/Constants.java

@@ -38,9 +38,9 @@
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.platform.commons.util.ClassNamePatternFilterUtils;
-import org.junit.platform.engine.support.hierarchical.ConcurrentHierarchicalTestExecutorServiceFactory;
-import org.junit.platform.engine.support.hierarchical.ConcurrentHierarchicalTestExecutorServiceFactory.ConcurrentExecutorServiceType;
 import org.junit.platform.engine.support.hierarchical.ParallelExecutionConfigurationStrategy;
+import org.junit.platform.engine.support.hierarchical.ParallelHierarchicalTestExecutorServiceFactory;
+import org.junit.platform.engine.support.hierarchical.ParallelHierarchicalTestExecutorServiceFactory.ParallelExecutorServiceType;
 
 /**
  * Collection of constants related to the {@link JupiterTestEngine}.
@@ -241,16 +241,16 @@ public final class Constants {
 
 	/**
 	 * Property name used to determine the desired
-	 * {@link ConcurrentExecutorServiceType ConcurrentExecutorServiceType}:
+	 * {@link ParallelExecutorServiceType ParallelExecutorServiceType}:
 	 * {@value}
 	 *
 	 * <p>Value must be
-	 * {@link ConcurrentExecutorServiceType#FORK_JOIN_POOL FORK_JOIN_POOL} or
-	 * {@link ConcurrentExecutorServiceType#WORKER_THREAD_POOL WORKER_THREAD_POOL},
+	 * {@link ParallelExecutorServiceType#FORK_JOIN_POOL FORK_JOIN_POOL} or
+	 * {@link ParallelExecutorServiceType#WORKER_THREAD_POOL WORKER_THREAD_POOL},
 	 * ignoring case.
 	 *
 	 * @since 6.1
-	 * @see ConcurrentHierarchicalTestExecutorServiceFactory
+	 * @see ParallelHierarchicalTestExecutorServiceFactory
 	 */
 	@API(status = EXPERIMENTAL, since = "6.1")
 	public static final String PARALLEL_CONFIG_EXECUTOR_SERVICE_PROPERTY_NAME = JupiterConfiguration.PARALLEL_CONFIG_EXECUTOR_SERVICE_PROPERTY_NAME;

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/JupiterTestEngine.java

@@ -29,9 +29,9 @@
 import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.support.config.PrefixedConfigurationParameters;
 import org.junit.platform.engine.support.discovery.DiscoveryIssueReporter;
-import org.junit.platform.engine.support.hierarchical.ConcurrentHierarchicalTestExecutorServiceFactory;
 import org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine;
 import org.junit.platform.engine.support.hierarchical.HierarchicalTestExecutorService;
+import org.junit.platform.engine.support.hierarchical.ParallelHierarchicalTestExecutorServiceFactory;
 import org.junit.platform.engine.support.hierarchical.ThrowableCollector;
 
 /**
@@ -79,7 +79,7 @@ public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId
 	protected HierarchicalTestExecutorService createExecutorService(ExecutionRequest request) {
 		JupiterConfiguration configuration = getJupiterConfiguration(request);
 		if (configuration.isParallelExecutionEnabled()) {
-			return ConcurrentHierarchicalTestExecutorServiceFactory.create(new PrefixedConfigurationParameters(
+			return ParallelHierarchicalTestExecutorServiceFactory.create(new PrefixedConfigurationParameters(
 				request.getConfigurationParameters(), JupiterConfiguration.PARALLEL_CONFIG_PREFIX));
 		}
 		return super.createExecutorService(request);

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java

@@ -16,8 +16,8 @@
 import static org.junit.jupiter.api.io.TempDir.DEFAULT_CLEANUP_MODE_PROPERTY_NAME;
 import static org.junit.jupiter.api.io.TempDir.DEFAULT_FACTORY_PROPERTY_NAME;
 import static org.junit.jupiter.engine.config.FilteringConfigurationParameterConverter.exclude;
-import static org.junit.platform.engine.support.hierarchical.ConcurrentHierarchicalTestExecutorServiceFactory.ConcurrentExecutorServiceType.FORK_JOIN_POOL;
-import static org.junit.platform.engine.support.hierarchical.ConcurrentHierarchicalTestExecutorServiceFactory.ConcurrentExecutorServiceType.WORKER_THREAD_POOL;
+import static org.junit.platform.engine.support.hierarchical.ParallelHierarchicalTestExecutorServiceFactory.ParallelExecutorServiceType.FORK_JOIN_POOL;
+import static org.junit.platform.engine.support.hierarchical.ParallelHierarchicalTestExecutorServiceFactory.ParallelExecutorServiceType.WORKER_THREAD_POOL;
 
 import java.util.List;
 import java.util.Optional;

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java

@@ -31,7 +31,7 @@
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.platform.engine.OutputDirectoryCreator;
-import org.junit.platform.engine.support.hierarchical.ConcurrentHierarchicalTestExecutorServiceFactory;
+import org.junit.platform.engine.support.hierarchical.ParallelHierarchicalTestExecutorServiceFactory;
 
 /**
  * @since 5.4
@@ -45,7 +45,7 @@ public interface JupiterConfiguration {
 	String PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME = "junit.jupiter.execution.parallel.enabled";
 	String PARALLEL_CONFIG_PREFIX = "junit.jupiter.execution.parallel.config.";
 	String PARALLEL_CONFIG_EXECUTOR_SERVICE_PROPERTY_NAME = PARALLEL_CONFIG_PREFIX
-			+ ConcurrentHierarchicalTestExecutorServiceFactory.EXECUTOR_SERVICE_PROPERTY_NAME;
+			+ ParallelHierarchicalTestExecutorServiceFactory.EXECUTOR_SERVICE_PROPERTY_NAME;
 	String CLOSING_STORED_AUTO_CLOSEABLE_ENABLED_PROPERTY_NAME = "junit.jupiter.extensions.store.close.autocloseable.enabled";
 	String DEFAULT_EXECUTION_MODE_PROPERTY_NAME = Execution.DEFAULT_EXECUTION_MODE_PROPERTY_NAME;
 	String DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME = Execution.DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME;

junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ForkJoinPoolHierarchicalTestExecutorService.java

@@ -12,7 +12,7 @@
 
 import static java.util.concurrent.CompletableFuture.completedFuture;
 import static org.apiguardian.api.API.Status.DEPRECATED;
-import static org.apiguardian.api.API.Status.STABLE;
+import static org.apiguardian.api.API.Status.MAINTAINED;
 import static org.junit.platform.engine.support.hierarchical.ExclusiveResource.GLOBAL_READ_WRITE;
 import static org.junit.platform.engine.support.hierarchical.Node.ExecutionMode.CONCURRENT;
 import static org.junit.platform.engine.support.hierarchical.Node.ExecutionMode.SAME_THREAD;
@@ -34,18 +34,20 @@
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.ExceptionUtils;
 import org.junit.platform.engine.ConfigurationParameters;
-import org.junit.platform.engine.support.hierarchical.ConcurrentHierarchicalTestExecutorServiceFactory.ConcurrentExecutorServiceType;
+import org.junit.platform.engine.support.hierarchical.ParallelHierarchicalTestExecutorServiceFactory.ParallelExecutorServiceType;
 
 /**
  * A {@link ForkJoinPool}-based
  * {@linkplain HierarchicalTestExecutorService executor service} that executes
  * {@linkplain TestTask test tasks} with the configured parallelism.
  *
  * @since 1.3
- * @see ForkJoinPool
+ * @see ParallelHierarchicalTestExecutorServiceFactory
+ * @see ParallelExecutorServiceType#FORK_JOIN_POOL
  * @see DefaultParallelExecutionConfigurationStrategy
+ * @see ForkJoinPool
  */
-@API(status = STABLE, since = "1.10")
+@API(status = MAINTAINED, since = "1.10")
 public class ForkJoinPoolHierarchicalTestExecutorService implements HierarchicalTestExecutorService {
 
 	// package-private for testing
@@ -61,7 +63,11 @@ public class ForkJoinPoolHierarchicalTestExecutorService implements Hierarchical
 	 *
 	 * @see DefaultParallelExecutionConfigurationStrategy
 	 * @deprecated Please use
-	 * {@link ConcurrentHierarchicalTestExecutorServiceFactory#create(ConfigurationParameters)}
+	 * {@link ParallelHierarchicalTestExecutorServiceFactory#create(ConfigurationParameters)}
+	 * with configuration parameter
+	 * {@value ParallelHierarchicalTestExecutorServiceFactory#EXECUTOR_SERVICE_PROPERTY_NAME}
+	 * set to
+	 * {@link ParallelExecutorServiceType#FORK_JOIN_POOL FORK_JOIN_POOL}
 	 * instead.
 	 */
 	@API(status = DEPRECATED, since = "6.1")
@@ -76,7 +82,9 @@ public ForkJoinPoolHierarchicalTestExecutorService(ConfigurationParameters confi
 	 *
 	 * @since 1.7
 	 * @deprecated Please use
-	 * {@link ConcurrentHierarchicalTestExecutorServiceFactory#create(ConcurrentExecutorServiceType, ParallelExecutionConfiguration)}
+	 * {@link ParallelHierarchicalTestExecutorServiceFactory#create(ParallelExecutorServiceType, ParallelExecutionConfiguration)}
+	 * with
+	 * {@link ParallelExecutorServiceType#FORK_JOIN_POOL ParallelExecutorServiceType.FORK_JOIN_POOL}
 	 * instead.
 	 */
 	@API(status = DEPRECATED, since = "6.1")

junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ConcurrentHierarchicalTestExecutorServiceFactory.java renamed to junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/ParallelHierarchicalTestExecutorServiceFactory.java

@@ -22,23 +22,23 @@
 
 /**
  * Factory for {@link HierarchicalTestExecutorService} instances that support
- * concurrent execution.
+ * parallel execution.
  *
  * @since 6.1
- * @see ConcurrentExecutorServiceType
+ * @see ParallelExecutorServiceType
  * @see ForkJoinPoolHierarchicalTestExecutorService
  * @see WorkerThreadPoolHierarchicalTestExecutorService
  */
 @API(status = MAINTAINED, since = "6.1")
-public class ConcurrentHierarchicalTestExecutorServiceFactory {
+public final class ParallelHierarchicalTestExecutorServiceFactory {
 
 	/**
 	 * Property name used to determine the desired
-	 * {@link ConcurrentExecutorServiceType ConcurrentExecutorServiceType}.
+	 * {@link ParallelExecutorServiceType ParallelExecutorServiceType}.
 	 *
 	 * <p>Value must be
-	 * {@link ConcurrentExecutorServiceType#FORK_JOIN_POOL FORK_JOIN_POOL} or
-	 * {@link ConcurrentExecutorServiceType#WORKER_THREAD_POOL WORKER_THREAD_POOL},
+	 * {@link ParallelExecutorServiceType#FORK_JOIN_POOL FORK_JOIN_POOL} or
+	 * {@link ParallelExecutorServiceType#WORKER_THREAD_POOL WORKER_THREAD_POOL},
 	 * ignoring case.
 	 */
 	public static final String EXECUTOR_SERVICE_PROPERTY_NAME = "executor-service";
@@ -59,13 +59,13 @@ public class ConcurrentHierarchicalTestExecutorServiceFactory {
 	 * key.
 	 *
 	 * @see #EXECUTOR_SERVICE_PROPERTY_NAME
-	 * @see ConcurrentExecutorServiceType
+	 * @see ParallelExecutorServiceType
 	 * @see ParallelExecutionConfigurationStrategy
 	 * @see PrefixedConfigurationParameters
 	 */
 	public static HierarchicalTestExecutorService create(ConfigurationParameters configurationParameters) {
-		var type = configurationParameters.get(EXECUTOR_SERVICE_PROPERTY_NAME, ConcurrentExecutorServiceType::parse) //
-				.orElse(ConcurrentExecutorServiceType.FORK_JOIN_POOL);
+		var type = configurationParameters.get(EXECUTOR_SERVICE_PROPERTY_NAME, ParallelExecutorServiceType::parse) //
+				.orElse(ParallelExecutorServiceType.FORK_JOIN_POOL);
 		var configuration = DefaultParallelExecutionConfigurationStrategy.toConfiguration(configurationParameters);
 		return create(type, configuration);
 	}
@@ -75,32 +75,32 @@ public static HierarchicalTestExecutorService create(ConfigurationParameters con
 	 * supplied {@link ConfigurationParameters}.
 	 *
 	 * <p>The {@value #EXECUTOR_SERVICE_PROPERTY_NAME} key is ignored in favor
-	 * of the supplied {@link ConcurrentExecutorServiceType} parameter when
+	 * of the supplied {@link ParallelExecutorServiceType} parameter when
 	 * invoking this method.
 	 *
-	 * @see ConcurrentExecutorServiceType
+	 * @see ParallelExecutorServiceType
 	 * @see ParallelExecutionConfigurationStrategy
 	 */
-	public static HierarchicalTestExecutorService create(ConcurrentExecutorServiceType type,
+	public static HierarchicalTestExecutorService create(ParallelExecutorServiceType executorServiceType,
 			ParallelExecutionConfiguration configuration) {
-		return switch (type) {
+		return switch (executorServiceType) {
 			case FORK_JOIN_POOL -> new ForkJoinPoolHierarchicalTestExecutorService(configuration,
 				TaskEventListener.NOOP);
 			case WORKER_THREAD_POOL -> new WorkerThreadPoolHierarchicalTestExecutorService(configuration);
 		};
 	}
 
-	private ConcurrentHierarchicalTestExecutorServiceFactory() {
+	private ParallelHierarchicalTestExecutorServiceFactory() {
 	}
 
 	/**
-	 * Type of {@link HierarchicalTestExecutorService} that supports concurrent
+	 * Type of {@link HierarchicalTestExecutorService} that supports parallel
 	 * execution.
 	 *
 	 * @since 6.1
 	 */
 	@API(status = MAINTAINED, since = "6.1")
-	public enum ConcurrentExecutorServiceType {
+	public enum ParallelExecutorServiceType {
 
 		/**
 		 * Indicates that {@link ForkJoinPoolHierarchicalTestExecutorService}
@@ -115,7 +115,7 @@ public enum ConcurrentExecutorServiceType {
 		@API(status = EXPERIMENTAL, since = "6.1")
 		WORKER_THREAD_POOL;
 
-		private static ConcurrentExecutorServiceType parse(String value) {
+		private static ParallelExecutorServiceType parse(String value) {
 			return valueOf(value.toUpperCase(Locale.ROOT));
 		}
 	}

junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/WorkerThreadPoolHierarchicalTestExecutorService.java

@@ -54,16 +54,16 @@
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ToStringBuilder;
 import org.junit.platform.engine.ConfigurationParameters;
-import org.junit.platform.engine.support.hierarchical.ConcurrentHierarchicalTestExecutorServiceFactory.ConcurrentExecutorServiceType;
+import org.junit.platform.engine.support.hierarchical.ParallelHierarchicalTestExecutorServiceFactory.ParallelExecutorServiceType;
 
 /**
  * An {@linkplain HierarchicalTestExecutorService executor service} based on a
  * regular thread pool that executes {@linkplain TestTask test tasks} with the
  * configured parallelism.
  *
  * @since 6.1
- * @see ConcurrentHierarchicalTestExecutorServiceFactory
- * @see ConcurrentExecutorServiceType#WORKER_THREAD_POOL
+ * @see ParallelHierarchicalTestExecutorServiceFactory
+ * @see ParallelExecutorServiceType#WORKER_THREAD_POOL
  * @see DefaultParallelExecutionConfigurationStrategy
  */
 @API(status = EXPERIMENTAL, since = "6.1")
@@ -111,12 +111,13 @@ public final class WorkerThreadPoolHierarchicalTestExecutorService implements Hi
 	 * {@link ParallelExecutionConfiguration#getSaturatePredicate()}, are
 	 * ignored.
 	 *
-	 * @see ConcurrentHierarchicalTestExecutorServiceFactory#create(ConfigurationParameters)
+	 * @see ParallelHierarchicalTestExecutorServiceFactory#create(ConfigurationParameters)
 	 */
 	WorkerThreadPoolHierarchicalTestExecutorService(ParallelExecutionConfiguration configuration) {
 		this(configuration, ClassLoaderUtils.getDefaultClassLoader());
 	}
 
+	// package-private for testing
 	WorkerThreadPoolHierarchicalTestExecutorService(ParallelExecutionConfiguration configuration,
 			ClassLoader classLoader) {
 		ThreadFactory threadFactory = new WorkerThreadFactory(classLoader);

jupiter-tests/src/test/java/org/junit/jupiter/engine/config/DefaultJupiterConfigurationTests.java

@@ -47,7 +47,7 @@
 import org.junit.platform.engine.DiscoveryIssue;
 import org.junit.platform.engine.DiscoveryIssue.Severity;
 import org.junit.platform.engine.support.discovery.DiscoveryIssueReporter;
-import org.junit.platform.engine.support.hierarchical.ConcurrentHierarchicalTestExecutorServiceFactory.ConcurrentExecutorServiceType;
+import org.junit.platform.engine.support.hierarchical.ParallelHierarchicalTestExecutorServiceFactory.ParallelExecutorServiceType;
 import org.junit.platform.launcher.core.ConfigurationParametersFactoryForTests;
 
 class DefaultJupiterConfigurationTests {
@@ -163,9 +163,9 @@ void doesNotReportAnyIssuesIfConfigurationParametersAreEmpty() {
 	}
 
 	@ParameterizedTest
-	@EnumSource(ConcurrentExecutorServiceType.class)
+	@EnumSource(ParallelExecutorServiceType.class)
 	void doesNotReportAnyIssuesIfParallelExecutionIsEnabledAndConfigurationParameterIsSet(
-			ConcurrentExecutorServiceType executorServiceType) {
+			ParallelExecutorServiceType executorServiceType) {
 		var parameters = Map.of(JupiterConfiguration.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, true, //
 			JupiterConfiguration.PARALLEL_CONFIG_EXECUTOR_SERVICE_PROPERTY_NAME, executorServiceType);
 		List<DiscoveryIssue> issues = new ArrayList<>();

jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java

@@ -79,7 +79,8 @@
 import org.junit.platform.commons.logging.LogRecordListener;
 import org.junit.platform.commons.support.ModifierSupport;
 import org.junit.platform.commons.util.ExceptionUtils;
-import org.junit.platform.engine.support.hierarchical.ConcurrentHierarchicalTestExecutorServiceFactory.ConcurrentExecutorServiceType;
+import org.junit.platform.engine.support.hierarchical.ParallelHierarchicalTestExecutorServiceFactory;
+import org.junit.platform.engine.support.hierarchical.ParallelHierarchicalTestExecutorServiceFactory.ParallelExecutorServiceType;
 import org.junit.platform.testkit.engine.EngineExecutionResults;
 
 /**
@@ -208,8 +209,9 @@ void registersProgrammaticTestInstancePostProcessors() {
 	}
 
 	@ParameterizedTest
-	@EnumSource(ConcurrentExecutorServiceType.class)
-	void createsExtensionPerInstance(ConcurrentExecutorServiceType executorServiceType) {
+	@EnumSource(ParallelExecutorServiceType.class)
+	void createsExtensionPerInstance(
+			ParallelHierarchicalTestExecutorServiceFactory.ParallelExecutorServiceType executorServiceType) {
 		var results = executeTests(request() //
 				.selectors(selectClass(InitializationPerInstanceTestCase.class)) //
 				.configurationParameter(Constants.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, "true") //