Polishing

junit-team · Jul 23, 2024 · 9b5a86a · 9b5a86a
1 parent c0dfec1
commit 9b5a86a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/...jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java b/...jupiter-engine/src/test/java/org/junit/jupiter/engine/AbstractJupiterTestEngineTests.java
@@ -16,7 +16,6 @@
 import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
 
 import java.util.Set;
-import java.util.function.Consumer;
 
 import org.junit.platform.engine.DiscoverySelector;
 import org.junit.platform.engine.TestDescriptor;
@@ -36,17 +35,15 @@ public abstract class AbstractJupiterTestEngineTests {
 	private final JupiterTestEngine engine = new JupiterTestEngine();
 
 	protected EngineExecutionResults executeTestsForClass(Class<?> testClass) {
-		return executeTests(r -> r.selectors(selectClass(testClass)));
+		return executeTests(selectClass(testClass));
 	}
 
 	protected EngineExecutionResults executeTests(DiscoverySelector... selectors) {
-		return executeTests(r -> r.selectors(selectors));
+		return executeTests(request().selectors(selectors));
 	}
 
-	protected EngineExecutionResults executeTests(Consumer<LauncherDiscoveryRequestBuilder> config) {
-		LauncherDiscoveryRequestBuilder builder = request();
-		config.accept(builder);
-		return EngineTestKit.execute(this.engine, builder.build());
+	protected EngineExecutionResults executeTests(LauncherDiscoveryRequestBuilder builder) {
+		return executeTests(builder.build());
 	}
 
 	protected EngineExecutionResults executeTests(LauncherDiscoveryRequest request) {

diff --git a/.../org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java b/.../org/junit/jupiter/engine/extension/ExtensionRegistrationViaParametersAndFieldsTests.java
@@ -18,6 +18,7 @@
 import static org.junit.platform.commons.util.AnnotationUtils.findAnnotatedFields;
 import static org.junit.platform.commons.util.ReflectionUtils.makeAccessible;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
 import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
 import static org.junit.platform.testkit.engine.TestExecutionResultConditions.message;
@@ -200,7 +201,7 @@ void registersProgrammaticTestInstancePostProcessors() {
 
 	@Test
 	void createsExtensionPerInstance() {
-		var results = executeTests(r -> r //
+		var results = executeTests(request() //
 				.selectors(selectClass(InitializationPerInstanceTestCase.class)) //
 				.configurationParameter(JupiterConfiguration.PARALLEL_EXECUTION_ENABLED_PROPERTY_NAME, "true") //
 		);