From c4c005b82eecc1497b4c043277c0603d03027aee Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:46:23 +0200 Subject: [PATCH] Emulate AbstractAotProcessor.process() in AOT endToEndTests() --- .../test/context/aot/AotIntegrationTests.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java index d491e275eb..841fb6c43b 100644 --- a/spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java @@ -97,7 +97,16 @@ class AotIntegrationTests extends AbstractAotTests { // AOT BUILD-TIME: PROCESSING InMemoryGeneratedFiles generatedFiles = new InMemoryGeneratedFiles(); TestContextAotGenerator generator = new TestContextAotGenerator(generatedFiles, new RuntimeHints()); - generator.processAheadOfTime(testClasses); + try { + // Emulate AbstractAotProcessor.process(). + System.setProperty(AbstractAotProcessor.AOT_PROCESSING, "true"); + + generator.processAheadOfTime(testClasses); + } + finally { + // Emulate AbstractAotProcessor.process(). + System.clearProperty(AbstractAotProcessor.AOT_PROCESSING); + } List sourceFiles = generatedFiles.getGeneratedFiles(Kind.SOURCE).keySet().stream().toList(); assertThat(sourceFiles).containsExactlyInAnyOrder(expectedSourceFilesForBasicSpringTests); @@ -176,13 +185,13 @@ class AotIntegrationTests extends AbstractAotTests { private void runEndToEndTests(List> testClasses, boolean failOnError) { InMemoryGeneratedFiles generatedFiles = new InMemoryGeneratedFiles(); + TestContextAotGenerator generator = new TestContextAotGenerator(generatedFiles, new RuntimeHints(), failOnError); // AOT BUILD-TIME: PROCESSING try { // Emulate AbstractAotProcessor.process(). System.setProperty(AbstractAotProcessor.AOT_PROCESSING, "true"); - TestContextAotGenerator generator = new TestContextAotGenerator(generatedFiles, new RuntimeHints(), failOnError); generator.processAheadOfTime(testClasses.stream()); } finally {