Polishing

This commit is contained in:
Sam Brannen 2022-09-09 19:05:01 +02:00
parent b429d6b5a6
commit d883c8fbb3
1 changed files with 6 additions and 8 deletions

View File

@ -19,7 +19,6 @@ package org.springframework.test.context.aot;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -97,12 +96,11 @@ class AotIntegrationTests extends AbstractAotTests {
// .printFiles(System.out) // .printFiles(System.out)
.compile(compiled -> .compile(compiled ->
// AOT RUN-TIME: EXECUTION // AOT RUN-TIME: EXECUTION
runTestsInAotMode(5, runTestsInAotMode(5, List.of(
BasicSpringJupiterSharedConfigTests.class, BasicSpringJupiterSharedConfigTests.class,
BasicSpringJupiterTests.class, // NestedTests get executed automatically BasicSpringJupiterTests.class, // NestedTests get executed automatically
BasicSpringTestNGTests.class, BasicSpringTestNGTests.class,
BasicSpringVintageTests.class BasicSpringVintageTests.class)));
));
} }
@Disabled("Uncomment to run all Spring integration tests in `spring-test`") @Disabled("Uncomment to run all Spring integration tests in `spring-test`")
@ -125,21 +123,21 @@ class AotIntegrationTests extends AbstractAotTests {
// .printFiles(System.out) // .printFiles(System.out)
.compile(compiled -> .compile(compiled ->
// AOT RUN-TIME: EXECUTION // AOT RUN-TIME: EXECUTION
runTestsInAotMode(testClasses.toArray(Class<?>[]::new))); runTestsInAotMode(testClasses));
} }
private static void runTestsInAotMode(Class<?>... testClasses) { private static void runTestsInAotMode(List<Class<?>> testClasses) {
runTestsInAotMode(-1, testClasses); runTestsInAotMode(-1, testClasses);
} }
private static void runTestsInAotMode(long expectedNumTests, Class<?>... testClasses) { private static void runTestsInAotMode(long expectedNumTests, List<Class<?>> testClasses) {
try { try {
System.setProperty(AotDetector.AOT_ENABLED, "true"); System.setProperty(AotDetector.AOT_ENABLED, "true");
LauncherDiscoveryRequestBuilder builder = LauncherDiscoveryRequestBuilder.request() LauncherDiscoveryRequestBuilder builder = LauncherDiscoveryRequestBuilder.request()
.filters(ClassNameFilter.includeClassNamePatterns(".*Tests?$")) .filters(ClassNameFilter.includeClassNamePatterns(".*Tests?$"))
.filters(excludeTags("failing-test-case")); .filters(excludeTags("failing-test-case"));
Arrays.stream(testClasses).forEach(testClass -> builder.selectors(selectClass(testClass))); testClasses.forEach(testClass -> builder.selectors(selectClass(testClass)));
LauncherDiscoveryRequest request = builder.build(); LauncherDiscoveryRequest request = builder.build();
SummaryGeneratingListener listener = new SummaryGeneratingListener(); SummaryGeneratingListener listener = new SummaryGeneratingListener();
LauncherFactory.create().execute(request, listener); LauncherFactory.create().execute(request, listener);