Skip to content

Commit d25fd39

Browse files
committed
Polishing.
Use TestGenerationContext in tests. See #2675
1 parent a73b0d9 commit d25fd39

File tree

3 files changed

+15
-21
lines changed

3 files changed

+15
-21
lines changed

src/test/java/org/springframework/data/aot/BeanRegistrationContributionAssert.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,17 @@
2020
import java.util.function.Consumer;
2121

2222
import org.assertj.core.api.AbstractAssert;
23-
import org.springframework.aot.generate.ClassNameGenerator;
24-
import org.springframework.aot.generate.DefaultGenerationContext;
25-
import org.springframework.aot.generate.InMemoryGeneratedFiles;
23+
24+
import org.springframework.aot.generate.GenerationContext;
2625
import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
2726
import org.springframework.beans.factory.aot.BeanRegistrationCode;
27+
import org.springframework.test.aot.generate.TestGenerationContext;
2828

2929
/**
3030
* @author Christoph Strobl
3131
*/
32-
public class BeanRegistrationContributionAssert extends AbstractAssert<BeanRegistrationContributionAssert, BeanRegistrationAotContribution> {
32+
public class BeanRegistrationContributionAssert
33+
extends AbstractAssert<BeanRegistrationContributionAssert, BeanRegistrationAotContribution> {
3334

3435
protected BeanRegistrationContributionAssert(BeanRegistrationAotContribution beanRegistrationAotContribution) {
3536
super(beanRegistrationAotContribution, BeanRegistrationContributionAssert.class);
@@ -38,13 +39,12 @@ protected BeanRegistrationContributionAssert(BeanRegistrationAotContribution bea
3839
public static BeanRegistrationContributionAssert assertThatAotContribution(BeanRegistrationAotContribution actual) {
3940
return new BeanRegistrationContributionAssert(actual);
4041
}
41-
public BeanRegistrationContributionAssert codeContributionSatisfies(
42-
Consumer<CodeContributionAssert> assertWith) {
42+
43+
public BeanRegistrationContributionAssert codeContributionSatisfies(Consumer<CodeContributionAssert> assertWith) {
4344

4445
BeanRegistrationCode mockBeanRegistrationCode = mock(BeanRegistrationCode.class);
4546

46-
DefaultGenerationContext generationContext = new DefaultGenerationContext(new ClassNameGenerator(Object.class),
47-
new InMemoryGeneratedFiles());
47+
GenerationContext generationContext = new TestGenerationContext(Object.class);
4848

4949
this.actual.applyTo(generationContext, mockBeanRegistrationCode);
5050

src/test/java/org/springframework/data/aot/ManagedTypesBeanRegistrationAotProcessorUnitTests.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@
2525
import org.junit.jupiter.api.BeforeEach;
2626
import org.junit.jupiter.api.Test;
2727

28-
import org.springframework.aot.generate.ClassNameGenerator;
29-
import org.springframework.aot.generate.DefaultGenerationContext;
30-
import org.springframework.aot.generate.InMemoryGeneratedFiles;
31-
import org.springframework.aot.hint.RuntimeHints;
28+
import org.springframework.aot.generate.GenerationContext;
3229
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
3330
import org.springframework.beans.factory.BeanCreationException;
3431
import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
@@ -37,6 +34,7 @@
3734
import org.springframework.beans.factory.support.RegisteredBean;
3835
import org.springframework.beans.factory.support.RootBeanDefinition;
3936
import org.springframework.data.domain.ManagedTypes;
37+
import org.springframework.test.aot.generate.TestGenerationContext;
4038

4139
/**
4240
* @author Christoph Strobl
@@ -86,8 +84,7 @@ void contributesReflectionForManagedTypes() {
8684
BeanRegistrationAotContribution contribution = createPostProcessor("commons")
8785
.processAheadOfTime(RegisteredBean.of(beanFactory, "commons.managed-types"));
8886

89-
DefaultGenerationContext generationContext = new DefaultGenerationContext(new ClassNameGenerator(Object.class),
90-
new InMemoryGeneratedFiles(), new RuntimeHints());
87+
GenerationContext generationContext = new TestGenerationContext(Object.class);
9188

9289
contribution.applyTo(generationContext, null);
9390

@@ -150,8 +147,7 @@ void returnsEmptyContributionWhenBeanCannotBeLoaded() {
150147
BeanRegistrationAotContribution contribution = createPostProcessor("commons")
151148
.processAheadOfTime(RegisteredBean.of(beanFactory, "commons.managed-types"));
152149

153-
DefaultGenerationContext generationContext = new DefaultGenerationContext(new ClassNameGenerator(Object.class),
154-
new InMemoryGeneratedFiles(), new RuntimeHints());
150+
GenerationContext generationContext = new TestGenerationContext(Object.class);
155151

156152
contribution.applyTo(generationContext, null);
157153

src/test/java/org/springframework/data/aot/RepositoryRegistrationAotContributionAssert.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@
2424

2525
import org.assertj.core.api.AbstractAssert;
2626

27-
import org.springframework.aot.generate.ClassNameGenerator;
28-
import org.springframework.aot.generate.DefaultGenerationContext;
29-
import org.springframework.aot.generate.InMemoryGeneratedFiles;
27+
import org.springframework.aot.generate.GenerationContext;
3028
import org.springframework.beans.factory.aot.BeanRegistrationCode;
3129
import org.springframework.data.repository.core.RepositoryInformation;
3230
import org.springframework.data.repository.core.support.RepositoryFragment;
31+
import org.springframework.test.aot.generate.TestGenerationContext;
3332

3433
/**
3534
* AssertJ {@link AbstractAssert Assertion} for {@link RepositoryRegistrationAotContribution}.
@@ -110,8 +109,7 @@ public RepositoryRegistrationAotContributionAssert codeContributionSatisfies(
110109

111110
BeanRegistrationCode mockBeanRegistrationCode = mock(BeanRegistrationCode.class);
112111

113-
DefaultGenerationContext generationContext = new DefaultGenerationContext(new ClassNameGenerator(Object.class),
114-
new InMemoryGeneratedFiles());
112+
GenerationContext generationContext = new TestGenerationContext(Object.class);
115113

116114
this.actual.applyTo(generationContext, mockBeanRegistrationCode);
117115

0 commit comments

Comments
 (0)