From 8fb27c38576a3237bd069ae833e0239f89ac0803 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Mon, 1 Aug 2022 12:56:21 +0300
Subject: [PATCH] Polish CompileWithTargetClassAccessExtension

---
 ...CompileWithTargetClassAccessExtension.java | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessExtension.java b/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessExtension.java
index 96c3ce4f702..ec83f46acf8 100644
--- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessExtension.java
+++ b/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessExtension.java
@@ -21,22 +21,21 @@ import java.lang.reflect.Method;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.InvocationInterceptor;
 import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
-import org.junit.platform.engine.discovery.DiscoverySelectors;
-import org.junit.platform.launcher.EngineFilter;
 import org.junit.platform.launcher.Launcher;
 import org.junit.platform.launcher.LauncherDiscoveryRequest;
-import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
 import org.junit.platform.launcher.core.LauncherFactory;
 import org.junit.platform.launcher.listeners.SummaryGeneratingListener;
 import org.junit.platform.launcher.listeners.TestExecutionSummary;
 
 import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ReflectionUtils;
 
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectMethod;
+import static org.junit.platform.launcher.EngineFilter.includeEngines;
+
 /**
- * JUnit {@link InvocationInterceptor} to support
+ * JUnit Jupiter {@link InvocationInterceptor} to support
  * {@link CompileWithTargetClassAccess @CompileWithTargetClassAccess}.
  *
  * @author Christoph Dreis
@@ -129,22 +128,20 @@ class CompileWithTargetClassAccessExtension implements InvocationInterceptor {
 		}
 	}
 
-	private void runTest(ClassLoader classLoader, String testClassName,
-			String testMethodName) throws Throwable {
+	private void runTest(ClassLoader classLoader, String testClassName, String testMethodName)
+			throws Throwable {
 
 		Class<?> testClass = classLoader.loadClass(testClassName);
 		Method testMethod = findMethod(testClass, testMethodName);
 		LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
-				.selectors(DiscoverySelectors.selectMethod(testClass, testMethod))
-				.filters(EngineFilter.includeEngines("junit-jupiter"))
+				.selectors(selectMethod(testClass, testMethod))
+				.filters(includeEngines("junit-jupiter"))
 				.build();
-		Launcher launcher = LauncherFactory.create();
-		TestPlan testPlan = launcher.discover(request);
 		SummaryGeneratingListener listener = new SummaryGeneratingListener();
-		launcher.registerTestExecutionListeners(listener);
-		launcher.execute(testPlan);
+		Launcher launcher = LauncherFactory.create();
+		launcher.execute(request, listener);
 		TestExecutionSummary summary = listener.getSummary();
-		if (!CollectionUtils.isEmpty(summary.getFailures())) {
+		if (summary.getTotalFailureCount() > 0) {
 			throw summary.getFailures().get(0).getException();
 		}
 	}
@@ -167,8 +164,7 @@ class CompileWithTargetClassAccessExtension implements InvocationInterceptor {
 	@FunctionalInterface
 	interface Action {
 
-		static Action NONE = () -> {
-		};
+		Action NONE = () -> {};
 
 
 		void run() throws Throwable;