Run more tests against both implementations

marcphilipp · marcphilipp · commit 979a1beedcb8 · 2025-10-30T09:50:44.000+01:00
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
@@ -70,14 +70,16 @@
 import org.junit.jupiter.api.fixtures.TrackLogRecords;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
-import org.junit.jupiter.engine.config.JupiterConfiguration;
+import org.junit.jupiter.engine.Constants;
 import org.junit.jupiter.engine.execution.injection.sample.LongParameterResolver;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.platform.commons.PreconditionViolationException;
 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.testkit.engine.EngineExecutionResults;
 
 /**
@@ -205,11 +207,14 @@ void registersProgrammaticTestInstancePostProcessors() {
 		assertOneTestSucceeded(ProgrammaticTestInstancePostProcessorTestCase.class);
 	}
 
-	@Test
-	void createsExtensionPerInstance() {
+	@ParameterizedTest
+	@EnumSource(ConcurrentExecutorServiceType.class)
+	void createsExtensionPerInstance(ConcurrentExecutorServiceType executorServiceType) {
 		var results = executeTests(request() //
 				.selectors(selectClass(InitializationPerInstanceTestCase.class)) //
-				.configurationParameter(JupiterConfiguration.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, "true") //
+				.configurationParameter(Constants.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, "true") //
+				.configurationParameter(Constants.PARALLEL_CONFIG_EXECUTOR_SERVICE_PROPERTY_NAME,
+					executorServiceType.name()) //
 		);
 		assertTestsSucceeded(results, 100);
 	}
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/OrderedMethodTests.java
@@ -17,6 +17,7 @@
 import static org.junit.jupiter.api.Order.DEFAULT;
 import static org.junit.jupiter.engine.Constants.DEFAULT_PARALLEL_EXECUTION_MODE;
 import static org.junit.jupiter.engine.Constants.DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME;
+import static org.junit.jupiter.engine.Constants.PARALLEL_CONFIG_EXECUTOR_SERVICE_PROPERTY_NAME;
 import static org.junit.jupiter.engine.Constants.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.launcher.LauncherConstants.CRITICAL_DISCOVERY_ISSUE_SEVERITY_PROPERTY_NAME;
@@ -34,6 +35,7 @@
 import java.util.logging.LogRecord;
 import java.util.regex.Pattern;
 
+import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -57,14 +59,17 @@
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.jupiter.engine.JupiterTestEngine;
+import org.junit.jupiter.params.ParameterizedClass;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.platform.commons.logging.LogRecordListener;
 import org.junit.platform.commons.util.ClassUtils;
 import org.junit.platform.engine.DiscoveryIssue;
 import org.junit.platform.engine.DiscoveryIssue.Severity;
 import org.junit.platform.engine.support.descriptor.ClassSource;
 import org.junit.platform.engine.support.descriptor.MethodSource;
+import org.junit.platform.engine.support.hierarchical.ConcurrentHierarchicalTestExecutorServiceFactory.ConcurrentExecutorServiceType;
 import org.junit.platform.testkit.engine.EngineDiscoveryResults;
 import org.junit.platform.testkit.engine.EngineTestKit;
 import org.junit.platform.testkit.engine.Events;
@@ -76,7 +81,9 @@
  *
  * @since 5.4
  */
-class OrderedMethodTests {
+@ParameterizedClass
+@EnumSource(ConcurrentExecutorServiceType.class)
+record OrderedMethodTests(ConcurrentExecutorServiceType executorServiceType) {
 
 	private static final Set<String> callSequence = Collections.synchronizedSet(new LinkedHashSet<>());
 	private static final Set<String> threadNames = Collections.synchronizedSet(new LinkedHashSet<>());
@@ -361,12 +368,13 @@ private Events executeTestsInParallel(Class<?> testClass, @Nullable Class<? exte
 				.testEvents();
 	}
 
-	private static EngineTestKit.Builder testKit(Class<?> testClass,
-			@Nullable Class<? extends MethodOrderer> defaultOrderer, Severity criticalSeverity) {
+	private EngineTestKit.Builder testKit(Class<?> testClass, @Nullable Class<? extends MethodOrderer> defaultOrderer,
+			Severity criticalSeverity) {
 
 		var testKit = EngineTestKit.engine("junit-jupiter") //
 				.configurationParameter(PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, "true") //
 				.configurationParameter(DEFAULT_PARALLEL_EXECUTION_MODE, "concurrent") //
+				.configurationParameter(PARALLEL_CONFIG_EXECUTOR_SERVICE_PROPERTY_NAME, executorServiceType.name()) //
 				.configurationParameter(CRITICAL_DISCOVERY_ISSUE_SEVERITY_PROPERTY_NAME, criticalSeverity.name());
 		if (defaultOrderer != null) {
 			testKit.configurationParameter(DEFAULT_TEST_METHOD_ORDER_PROPERTY_NAME, defaultOrderer.getName());
@@ -767,7 +775,8 @@ public void orderMethods(MethodOrdererContext context) {
 
 		@SuppressWarnings("unchecked")
 		static <T> T createMethodDescriptorImpersonator(MethodDescriptor method) {
-			MethodDescriptor stub = new MethodDescriptor() {
+			@NullMarked
+			class Stub implements MethodDescriptor {
 				@Override
 				public Method getMethod() {
 					throw new UnsupportedOperationException();
@@ -803,8 +812,8 @@ public boolean equals(Object obj) {
 				public int hashCode() {
 					return method.hashCode();
 				}
-			};
-			return (T) stub;
+			}
+			return (T) new Stub();
 		}
 	}
 
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/engine/extension/RepeatedTestTests.java
@@ -15,6 +15,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.engine.Constants.DEFAULT_PARALLEL_EXECUTION_MODE;
+import static org.junit.jupiter.engine.Constants.PARALLEL_CONFIG_EXECUTOR_SERVICE_PROPERTY_NAME;
 import static org.junit.jupiter.engine.Constants.PARALLEL_CONFIG_FIXED_PARALLELISM_PROPERTY_NAME;
 import static org.junit.jupiter.engine.Constants.PARALLEL_CONFIG_STRATEGY_PROPERTY_NAME;
 import static org.junit.jupiter.engine.Constants.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME;
@@ -46,8 +47,11 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.engine.AbstractJupiterTestEngineTests;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.platform.commons.support.ReflectionSupport;
 import org.junit.platform.engine.DiscoveryIssue.Severity;
+import org.junit.platform.engine.support.hierarchical.ConcurrentHierarchicalTestExecutorServiceFactory.ConcurrentExecutorServiceType;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.testkit.engine.Events;
 
@@ -135,7 +139,7 @@ static void afterAll() {
 		@BeforeEach
 		@AfterEach
 		void beforeAndAfterEach(TestInfo testInfo, RepetitionInfo repetitionInfo) {
-			switch (testInfo.getTestMethod().get().getName()) {
+			switch (testInfo.getTestMethod().orElseThrow().getName()) {
 				case "repeatedOnce" -> {
 					assertThat(repetitionInfo.getCurrentRepetition()).isEqualTo(1);
 					assertThat(repetitionInfo.getTotalRepetitions()).isEqualTo(1);
@@ -291,14 +295,16 @@ void failureThreshold3() {
 			// @formatter:on
 		}
 
-		@Test
-		void failureThresholdWithConcurrentExecution() {
+		@ParameterizedTest
+		@EnumSource(ConcurrentExecutorServiceType.class)
+		void failureThresholdWithConcurrentExecution(ConcurrentExecutorServiceType executorServiceType) {
 			Class<TestCase> testClass = TestCase.class;
 			String methodName = "failureThresholdWithConcurrentExecution";
-			Method method = ReflectionSupport.findMethod(testClass, methodName).get();
+			Method method = ReflectionSupport.findMethod(testClass, methodName).orElseThrow();
 			LauncherDiscoveryRequest request = request()//
 					.selectors(selectMethod(testClass, method))//
 					.configurationParameter(PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, "true")//
+					.configurationParameter(PARALLEL_CONFIG_EXECUTOR_SERVICE_PROPERTY_NAME, executorServiceType.name()) //
 					.configurationParameter(DEFAULT_PARALLEL_EXECUTION_MODE, "concurrent")//
 					.configurationParameter(PARALLEL_CONFIG_STRATEGY_PROPERTY_NAME, "fixed")//
 					.configurationParameter(PARALLEL_CONFIG_FIXED_PARALLELISM_PROPERTY_NAME, "4")//
@@ -323,7 +329,7 @@ void failureThresholdWithConcurrentExecution() {
 
 		private Events executeTest(String methodName) {
 			Class<TestCase> testClass = TestCase.class;
-			Method method = ReflectionSupport.findMethod(testClass, methodName).get();
+			Method method = ReflectionSupport.findMethod(testClass, methodName).orElseThrow();
 			return executeTests(selectMethod(testClass, method)).allEvents();
 		}
 
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ForkJoinDeadLockTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/ForkJoinDeadLockTests.java
@@ -32,11 +32,16 @@
 import org.junit.jupiter.api.parallel.Isolated;
 import org.junit.jupiter.api.parallel.ResourceLock;
 import org.junit.jupiter.engine.Constants;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.platform.engine.support.hierarchical.ConcurrentHierarchicalTestExecutorServiceFactory.ConcurrentExecutorServiceType;
 import org.junit.platform.testkit.engine.EngineTestKit;
 
 // https://github.com/junit-team/junit-framework/issues/3945
 @Timeout(10)
-public class ForkJoinDeadLockTests {
+@ParameterizedClass
+@EnumSource(ConcurrentExecutorServiceType.class)
+record ForkJoinDeadLockTests(ConcurrentExecutorServiceType executorServiceType) {
 
 	@Test
 	void forkJoinExecutionDoesNotLeadToDeadLock() {
@@ -53,10 +58,12 @@ void multiLevelLocks() {
 		run(ClassLevelTestCase.class);
 	}
 
-	private static void run(Class<?>... classes) {
+	private void run(Class<?>... classes) {
 		EngineTestKit.engine("junit-jupiter") //
 				.selectors(selectClasses(classes)) //
 				.configurationParameter(Constants.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, "true") //
+				.configurationParameter(Constants.PARALLEL_CONFIG_EXECUTOR_SERVICE_PROPERTY_NAME,
+					executorServiceType.name()) //
 				.configurationParameter(Constants.DEFAULT_PARALLEL_EXECUTION_MODE, "concurrent") //
 				.configurationParameter(Constants.DEFAULT_CLASSES_EXECUTION_MODE_PROPERTY_NAME, "concurrent") //
 				.configurationParameter(Constants.PARALLEL_CONFIG_STRATEGY_PROPERTY_NAME, "fixed") //
