Revise Launcher API examples in User Guide

Author: sbrannen

documentation/src/test/java/example/UsingTheLauncherDemo.java

@@ -36,7 +36,6 @@
 import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.launcher.core.LauncherConfig;
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
-import org.junit.platform.launcher.core.LauncherExecutionRequestBuilder;
 import org.junit.platform.launcher.core.LauncherFactory;
 import org.junit.platform.launcher.listeners.SummaryGeneratingListener;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
@@ -70,14 +69,14 @@ void execution() {
 
 		try (LauncherSession session = LauncherFactory.openSession()) {
 			Launcher launcher = session.getLauncher();
-			// Register a listener of your choice
+			// Register one ore more listeners of your choice.
 			launcher.registerTestExecutionListeners(listener);
-			// Discover tests and build a test plan
+			// Discover tests and build a test plan.
 			TestPlan testPlan = launcher.discover(discoveryRequest);
-			// Execute test plan
-			launcher.execute(LauncherExecutionRequestBuilder.request(testPlan).build());
-			// Alternatively, execute the discoveryRequest request directly
-			launcher.execute(LauncherExecutionRequestBuilder.request(discoveryRequest).build());
+			// Execute the test plan.
+			launcher.execute(testPlan);
+			// Alternatively, execute the discovery request directly.
+			launcher.execute(discoveryRequest);
 		}
 
 		TestExecutionSummary summary = listener.getSummary();
@@ -107,13 +106,12 @@ void launcherConfig() {
 			.addTestExecutionListeners(new CustomTestExecutionListener())
 			.build();
 
-		LauncherExecutionRequest request = LauncherDiscoveryRequestBuilder.request()
+		LauncherDiscoveryRequest discoveryRequest = LauncherDiscoveryRequestBuilder.request()
 			.selectors(selectPackage("com.example.mytests"))
-			.forExecution()
 			.build();
 
 		try (LauncherSession session = LauncherFactory.openSession(launcherConfig)) {
-			session.getLauncher().execute(request);
+			session.getLauncher().execute(discoveryRequest);
 		}
 		// end::launcherConfig[]
 		// @formatter:on

documentation/src/test/java/example/UsingTheLauncherForDiscoveryDemo.java

@@ -14,11 +14,11 @@
 import static org.junit.platform.engine.discovery.ClassNameFilter.includeClassNamePatterns;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage;
+import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.discoveryRequest;
 
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.LauncherSession;
 import org.junit.platform.launcher.TestPlan;
-import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 import org.junit.platform.launcher.core.LauncherFactory;
 // end::imports[]
 
@@ -32,7 +32,7 @@ class UsingTheLauncherForDiscoveryDemo {
 	void discovery() {
 		// @formatter:off
 		// tag::discovery[]
-		LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
+		LauncherDiscoveryRequest discoveryRequest = discoveryRequest()
 			.selectors(
 				selectPackage("com.example.mytests"),
 				selectClass(MyTestClass.class)
@@ -43,7 +43,7 @@ void discovery() {
 			.build();
 
 		try (LauncherSession session = LauncherFactory.openSession()) {
-			TestPlan testPlan = session.getLauncher().discover(request);
+			TestPlan testPlan = session.getLauncher().discover(discoveryRequest);
 
 			// ... discover additional test plans or execute tests
 		}

documentation/src/test/java/example/sharedresources/SharedResourceDemo.java

@@ -12,13 +12,15 @@
 
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage;
+import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.discoveryRequest;
 
 import example.FirstCustomEngine;
 import example.SecondCustomEngine;
 
 import org.junit.jupiter.api.Test;
 import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
 import org.junit.platform.launcher.core.LauncherConfig;
 import org.junit.platform.launcher.core.LauncherFactory;
 
@@ -31,15 +33,22 @@ void runBothCustomEnginesTest() {
 		FirstCustomEngine firstCustomEngine = new FirstCustomEngine();
 		SecondCustomEngine secondCustomEngine = new SecondCustomEngine();
 
-		Launcher launcher = LauncherFactory.create(LauncherConfig.builder()
+		LauncherConfig launcherConfig = LauncherConfig.builder()
 				// tag::custom_line_break[]
 				.addTestEngines(firstCustomEngine, secondCustomEngine)
 				// tag::custom_line_break[]
 				.enableTestEngineAutoRegistration(false)
 				// tag::custom_line_break[]
-				.build());
+				.build();
 
-		launcher.execute(request().forExecution().build());
+		LauncherDiscoveryRequest discoveryRequest = discoveryRequest()
+				// tag::custom_line_break[]
+				.selectors(selectPackage("com.example.mytests"))
+				// tag::custom_line_break[]
+				.build();
+
+		Launcher launcher = LauncherFactory.create(launcherConfig);
+		launcher.execute(discoveryRequest);
 
 		assertSame(firstCustomEngine.getSocket(), secondCustomEngine.getSocket());
 		assertTrue(firstCustomEngine.getSocket().isClosed(), "socket should be closed");