From 36a2a62294212c26319009a79dc631b3544db8fa Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sat, 3 Sep 2022 16:52:57 +0200 Subject: [PATCH] Polishing --- .../springframework/test/context/aot/AbstractAotTests.java | 2 ++ .../aot/{AotSmokeTests.java => AotIntegrationTests.java} | 6 +++--- .../test/context/aot/TestContextAotGeneratorTests.java | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) rename spring-test/src/test/java/org/springframework/test/context/aot/{AotSmokeTests.java => AotIntegrationTests.java} (96%) diff --git a/spring-test/src/test/java/org/springframework/test/context/aot/AbstractAotTests.java b/spring-test/src/test/java/org/springframework/test/context/aot/AbstractAotTests.java index f2bec3dd6fd..f41bd7bde79 100644 --- a/spring-test/src/test/java/org/springframework/test/context/aot/AbstractAotTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/aot/AbstractAotTests.java @@ -22,6 +22,8 @@ import java.util.Set; import java.util.stream.Stream; /** + * Abstract base class for AOT tests. + * * @author Sam Brannen * @since 6.0 */ diff --git a/spring-test/src/test/java/org/springframework/test/context/aot/AotSmokeTests.java b/spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java similarity index 96% rename from spring-test/src/test/java/org/springframework/test/context/aot/AotSmokeTests.java rename to spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java index dfddfbbe898..914350c0c76 100644 --- a/spring-test/src/test/java/org/springframework/test/context/aot/AotSmokeTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java @@ -46,13 +46,13 @@ import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass import static org.junit.platform.launcher.EngineFilter.includeEngines; /** - * Smoke tests for AOT support in the TestContext framework. + * End-to-end integration tests for AOT support in the TestContext framework. * * @author Sam Brannen * @since 6.0 */ @CompileWithTargetClassAccess -class AotSmokeTests extends AbstractAotTests { +class AotIntegrationTests extends AbstractAotTests { private static final String CLASSPATH_ROOT = "AotSmokeTests.classpath_root"; @@ -66,7 +66,7 @@ class AotSmokeTests extends AbstractAotTests { // nested JUnit Platform launched by the CompileWithTargetClassAccessExtension. static { try { - Path classpathRoot = Paths.get(AotSmokeTests.class.getProtectionDomain().getCodeSource().getLocation().toURI()); + Path classpathRoot = Paths.get(AotIntegrationTests.class.getProtectionDomain().getCodeSource().getLocation().toURI()); System.setProperty(CLASSPATH_ROOT, classpathRoot.toFile().getCanonicalPath()); } catch (Exception ex) { diff --git a/spring-test/src/test/java/org/springframework/test/context/aot/TestContextAotGeneratorTests.java b/spring-test/src/test/java/org/springframework/test/context/aot/TestContextAotGeneratorTests.java index 48072cac429..c146d294a86 100644 --- a/spring-test/src/test/java/org/springframework/test/context/aot/TestContextAotGeneratorTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/aot/TestContextAotGeneratorTests.java @@ -65,7 +65,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup; /** - * Tests for {@link TestContextAotGenerator}. + * Tests for {@link TestContextAotGenerator}, {@link AotTestMappings}, + * {@link AotContextLoader}, and run-time hints. * * @author Sam Brannen * @since 6.0 @@ -74,7 +75,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppC class TestContextAotGeneratorTests extends AbstractAotTests { /** - * @see AotSmokeTests#scanClassPathThenGenerateSourceFilesAndCompileThem() + * @see AotIntegrationTests#endToEndTests() */ @Test void processAheadOfTimeAndGenerateAotTestMappings() {