From d25fd3997404b397e3615c0eb76a9e6daf5c75ad Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 23 Aug 2022 16:09:40 +0200 Subject: [PATCH] Polishing. Use TestGenerationContext in tests. See #2675 --- .../aot/BeanRegistrationContributionAssert.java | 16 ++++++++-------- ...pesBeanRegistrationAotProcessorUnitTests.java | 12 ++++-------- ...ositoryRegistrationAotContributionAssert.java | 8 +++----- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/test/java/org/springframework/data/aot/BeanRegistrationContributionAssert.java b/src/test/java/org/springframework/data/aot/BeanRegistrationContributionAssert.java index 7273d929f..7cab5f132 100644 --- a/src/test/java/org/springframework/data/aot/BeanRegistrationContributionAssert.java +++ b/src/test/java/org/springframework/data/aot/BeanRegistrationContributionAssert.java @@ -20,16 +20,17 @@ import static org.mockito.Mockito.*; import java.util.function.Consumer; import org.assertj.core.api.AbstractAssert; -import org.springframework.aot.generate.ClassNameGenerator; -import org.springframework.aot.generate.DefaultGenerationContext; -import org.springframework.aot.generate.InMemoryGeneratedFiles; + +import org.springframework.aot.generate.GenerationContext; import org.springframework.beans.factory.aot.BeanRegistrationAotContribution; import org.springframework.beans.factory.aot.BeanRegistrationCode; +import org.springframework.test.aot.generate.TestGenerationContext; /** * @author Christoph Strobl */ -public class BeanRegistrationContributionAssert extends AbstractAssert { +public class BeanRegistrationContributionAssert + extends AbstractAssert { protected BeanRegistrationContributionAssert(BeanRegistrationAotContribution beanRegistrationAotContribution) { super(beanRegistrationAotContribution, BeanRegistrationContributionAssert.class); @@ -38,13 +39,12 @@ public class BeanRegistrationContributionAssert extends AbstractAssert assertWith) { + + public BeanRegistrationContributionAssert codeContributionSatisfies(Consumer assertWith) { BeanRegistrationCode mockBeanRegistrationCode = mock(BeanRegistrationCode.class); - DefaultGenerationContext generationContext = new DefaultGenerationContext(new ClassNameGenerator(Object.class), - new InMemoryGeneratedFiles()); + GenerationContext generationContext = new TestGenerationContext(Object.class); this.actual.applyTo(generationContext, mockBeanRegistrationCode); diff --git a/src/test/java/org/springframework/data/aot/ManagedTypesBeanRegistrationAotProcessorUnitTests.java b/src/test/java/org/springframework/data/aot/ManagedTypesBeanRegistrationAotProcessorUnitTests.java index bd61596a7..ea40b4de0 100644 --- a/src/test/java/org/springframework/data/aot/ManagedTypesBeanRegistrationAotProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/aot/ManagedTypesBeanRegistrationAotProcessorUnitTests.java @@ -25,10 +25,7 @@ import java.util.function.Consumer; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.aot.generate.ClassNameGenerator; -import org.springframework.aot.generate.DefaultGenerationContext; -import org.springframework.aot.generate.InMemoryGeneratedFiles; -import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.generate.GenerationContext; import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.aot.BeanRegistrationAotContribution; @@ -37,6 +34,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RegisteredBean; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.data.domain.ManagedTypes; +import org.springframework.test.aot.generate.TestGenerationContext; /** * @author Christoph Strobl @@ -86,8 +84,7 @@ class ManagedTypesBeanRegistrationAotProcessorUnitTests { BeanRegistrationAotContribution contribution = createPostProcessor("commons") .processAheadOfTime(RegisteredBean.of(beanFactory, "commons.managed-types")); - DefaultGenerationContext generationContext = new DefaultGenerationContext(new ClassNameGenerator(Object.class), - new InMemoryGeneratedFiles(), new RuntimeHints()); + GenerationContext generationContext = new TestGenerationContext(Object.class); contribution.applyTo(generationContext, null); @@ -150,8 +147,7 @@ class ManagedTypesBeanRegistrationAotProcessorUnitTests { BeanRegistrationAotContribution contribution = createPostProcessor("commons") .processAheadOfTime(RegisteredBean.of(beanFactory, "commons.managed-types")); - DefaultGenerationContext generationContext = new DefaultGenerationContext(new ClassNameGenerator(Object.class), - new InMemoryGeneratedFiles(), new RuntimeHints()); + GenerationContext generationContext = new TestGenerationContext(Object.class); contribution.applyTo(generationContext, null); diff --git a/src/test/java/org/springframework/data/aot/RepositoryRegistrationAotContributionAssert.java b/src/test/java/org/springframework/data/aot/RepositoryRegistrationAotContributionAssert.java index ac4f30bb9..dd9f25207 100644 --- a/src/test/java/org/springframework/data/aot/RepositoryRegistrationAotContributionAssert.java +++ b/src/test/java/org/springframework/data/aot/RepositoryRegistrationAotContributionAssert.java @@ -24,12 +24,11 @@ import java.util.function.Consumer; import org.assertj.core.api.AbstractAssert; -import org.springframework.aot.generate.ClassNameGenerator; -import org.springframework.aot.generate.DefaultGenerationContext; -import org.springframework.aot.generate.InMemoryGeneratedFiles; +import org.springframework.aot.generate.GenerationContext; import org.springframework.beans.factory.aot.BeanRegistrationCode; import org.springframework.data.repository.core.RepositoryInformation; import org.springframework.data.repository.core.support.RepositoryFragment; +import org.springframework.test.aot.generate.TestGenerationContext; /** * AssertJ {@link AbstractAssert Assertion} for {@link RepositoryRegistrationAotContribution}. @@ -110,8 +109,7 @@ public class RepositoryRegistrationAotContributionAssert BeanRegistrationCode mockBeanRegistrationCode = mock(BeanRegistrationCode.class); - DefaultGenerationContext generationContext = new DefaultGenerationContext(new ClassNameGenerator(Object.class), - new InMemoryGeneratedFiles()); + GenerationContext generationContext = new TestGenerationContext(Object.class); this.actual.applyTo(generationContext, mockBeanRegistrationCode);