diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/event/ParallelApplicationEventsIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/event/ParallelApplicationEventsIntegrationTests.java index c567ff08340..684aa9e633e 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/event/ParallelApplicationEventsIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/event/ParallelApplicationEventsIntegrationTests.java @@ -27,10 +27,12 @@ import java.util.stream.Stream; import org.assertj.core.api.InstanceOfAssertFactories; import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Constants; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.parallel.Execution; import org.junit.platform.engine.TestExecutionResult; import org.junit.platform.testkit.engine.EngineExecutionResults; import org.junit.platform.testkit.engine.EngineTestKit; @@ -47,6 +49,7 @@ import org.springframework.test.context.event.TestContextEvent; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; /** @@ -67,9 +70,9 @@ class ParallelApplicationEventsIntegrationTests { EngineExecutionResults results = EngineTestKit.engine("junit-jupiter")// .selectors(selectClass(testClass))// - .configurationParameter("junit.jupiter.execution.parallel.enabled", "true")// - .configurationParameter("junit.jupiter.execution.parallel.mode.default", "concurrent")// - .configurationParameter("junit.jupiter.execution.parallel.config.dynamic.factor", "10")// + .configurationParameter(Constants.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, "true")// + .configurationParameter(Constants.PARALLEL_CONFIG_DYNAMIC_FACTOR_PROPERTY_NAME, "10")// + .configurationParameter(Execution.DEFAULT_EXECUTION_MODE_PROPERTY_NAME, CONCURRENT.name())// .execute(); // extract the messages from failed TextExecutionResults @@ -89,8 +92,8 @@ class ParallelApplicationEventsIntegrationTests { Class testClass = TestInstancePerMethodTestCase.class; Events testEvents = EngineTestKit.engine("junit-jupiter")// .selectors(selectClass(testClass))// - .configurationParameter("junit.jupiter.execution.parallel.enabled", "true")// - .configurationParameter("junit.jupiter.execution.parallel.config.dynamic.factor", "10")// + .configurationParameter(Constants.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, "true")// + .configurationParameter(Constants.PARALLEL_CONFIG_DYNAMIC_FACTOR_PROPERTY_NAME, "10")// .execute()// .testEvents(); // list failed events in case of test errors to get a sense of which tests failed diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/parallel/ParallelExecutionSpringExtensionTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/parallel/ParallelExecutionSpringExtensionTests.java index 35a26e6cf4f..37a270f141e 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/parallel/ParallelExecutionSpringExtensionTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/parallel/ParallelExecutionSpringExtensionTests.java @@ -20,11 +20,11 @@ import java.lang.reflect.Parameter; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Constants; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.RepeatedTest; import org.junit.platform.testkit.engine.EngineExecutionResults; import org.junit.platform.testkit.engine.EngineTestKit; -import org.junit.platform.testkit.engine.Event; import org.junit.platform.testkit.engine.Events; import org.springframework.beans.factory.annotation.Autowired; @@ -32,7 +32,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; /** @@ -51,21 +50,20 @@ class ParallelExecutionSpringExtensionTests { void runTestsInParallel() { EngineExecutionResults results = EngineTestKit.engine("junit-jupiter")// .configurationParameter("junit.platform.discovery.issue.severity.critical", "INFO")// - .configurationParameter("junit.jupiter.conditions.deactivate", "org.junit.jupiter.engine.extension.DisabledCondition")// - .configurationParameter("junit.jupiter.execution.parallel.enabled", "true")// - .configurationParameter("junit.jupiter.execution.parallel.config.dynamic.factor", "10")// - .configurationParameter("junit.jupiter.execution.parallel.config.executor-service", "WORKER_THREAD_POOL") + .configurationParameter(Constants.DEACTIVATE_CONDITIONS_PATTERN_PROPERTY_NAME, "*DisabledCondition")// + .configurationParameter(Constants.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, "true")// + .configurationParameter(Constants.PARALLEL_CONFIG_DYNAMIC_FACTOR_PROPERTY_NAME, "10")// + .configurationParameter(Constants.PARALLEL_CONFIG_EXECUTOR_SERVICE_PROPERTY_NAME, "WORKER_THREAD_POOL") .selectors(selectClass(TestCase.class))// .execute(); + // List failed events in case of errors to get a sense of what failed. Events failedEvents = results.allEvents().failed(); - long totalFailureCount = failedEvents.count(); - if (totalFailureCount > 0) { - failedEvents.stream().map(Event::getPayload).forEach(System.err::println); + if (failedEvents.count() > 0) { + failedEvents.debug(); } - assertThat(totalFailureCount).as("number of failures").isZero(); - results.testEvents().assertStatistics(stats -> stats.succeeded(NUM_TESTS)); + results.testEvents().assertStatistics(stats -> stats.started(NUM_TESTS).succeeded(NUM_TESTS).failed(0)); } @SpringJUnitConfig