Revert "Combine PR made by Marc from XJ114514#1"

This reverts commit eef975b.

Author: XJ114514

junit-platform-console/src/main/java/org/junit/platform/console/tasks/ConsoleTestExecutor.java

@@ -49,6 +49,8 @@ public class ConsoleTestExecutor {
 	private final TestConsoleOutputOptions outputOptions;
 	private final Supplier<Launcher> launcherSupplier;
 
+	private TestPlan testPlanListeners;
+
 	public ConsoleTestExecutor(TestDiscoveryOptions discoveryOptions, TestConsoleOutputOptions outputOptions) {
 		this(discoveryOptions, outputOptions, LauncherFactory::create);
 	}
@@ -99,11 +101,12 @@ private TestExecutionSummary executeTests(PrintWriter out, Optional<Path> report
 		Launcher launcher = launcherSupplier.get();
 		SummaryGeneratingListener summaryListener = registerListeners(out, reportsDir, launcher);
 		LauncherDiscoveryRequest discoveryRequest = new DiscoveryRequestCreator().toDiscoveryRequest(discoveryOptions);
-		TestPlanCapturer testPlanCapturer = new TestPlanCapturer();
 		launcher.execute(discoveryRequest);
 		TestExecutionSummary summary = summaryListener.getSummary();
 		if (summary.getTotalFailureCount() > 0 || outputOptions.getDetails() != Details.NONE) {
-			printSummary(summary, testPlanCapturer.testPlan, out);
+			//get testPlan from summaryListener
+			testPlanListeners = summaryListener.getTestPlan();
+			printSummary(summary, out);
 		}
 
 		return summary;
@@ -177,7 +180,7 @@ private Optional<TestExecutionListener> createXmlWritingListener(PrintWriter out
 		return reportsDir.map(it -> new LegacyXmlReportGeneratingListener(it, out));
 	}
 
-	private void printSummary(TestExecutionSummary summary, TestPlan testPlan, PrintWriter out) {
+	private void printSummary(TestExecutionSummary summary, PrintWriter out) {
 		// Otherwise the failures have already been printed in detail
 		if (EnumSet.of(Details.NONE, Details.SUMMARY, Details.TREE).contains(outputOptions.getDetails())) {
 			summary.printFailuresTo(out);
@@ -195,7 +198,7 @@ private void printSummary(TestExecutionSummary summary, TestPlan testPlan, Print
 					ValueWrapper actual = assertionFailedError.getActual();
 					//apply diff function
 					if (isCharSequence(expected) && isCharSequence(actual)) {
-						new DiffPrinter(testPlan).printDiff(out, expected.getStringRepresentation(),
+						new DiffPrinter(testPlanListeners).printDiff(out, expected.getStringRepresentation(),
 							actual.getStringRepresentation(), failure.getTestIdentifier());
 					}
 				}
@@ -212,14 +215,4 @@ private boolean isCharSequence(ValueWrapper value) {
 	public interface Factory {
 		ConsoleTestExecutor create(TestDiscoveryOptions discoveryOptions, TestConsoleOutputOptions outputOptions);
 	}
-
-	private static class TestPlanCapturer implements TestExecutionListener {
-
-		private TestPlan testPlan;
-
-		@Override
-		public void testPlanExecutionStarted(TestPlan testPlan) {
-			this.testPlan = testPlan;
-		}
-	}
 }

junit-platform-launcher/src/main/java/org/junit/platform/launcher/listeners/SummaryGeneratingListener.java

@@ -46,6 +46,13 @@ public TestExecutionSummary getSummary() {
 		return this.summary;
 	}
 
+	/**
+	 * Get the testPlan of this listener.
+	 */
+	public TestPlan getTestPlan() {
+		return testPlan;
+	}
+
 	@Override
 	public void testPlanExecutionStarted(TestPlan testPlan) {
 		this.testPlan = testPlan;