Polishing.

Use TestGenerationContext in tests.

See #2675
This commit is contained in:
Mark Paluch
2022-08-23 16:09:40 +02:00
parent a73b0d9936
commit d25fd39974
3 changed files with 15 additions and 21 deletions

View File

@@ -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<BeanRegistrationContributionAssert, BeanRegistrationAotContribution> {
public class BeanRegistrationContributionAssert
extends AbstractAssert<BeanRegistrationContributionAssert, BeanRegistrationAotContribution> {
protected BeanRegistrationContributionAssert(BeanRegistrationAotContribution beanRegistrationAotContribution) {
super(beanRegistrationAotContribution, BeanRegistrationContributionAssert.class);
@@ -38,13 +39,12 @@ public class BeanRegistrationContributionAssert extends AbstractAssert<BeanRegis
public static BeanRegistrationContributionAssert assertThatAotContribution(BeanRegistrationAotContribution actual) {
return new BeanRegistrationContributionAssert(actual);
}
public BeanRegistrationContributionAssert codeContributionSatisfies(
Consumer<CodeContributionAssert> assertWith) {
public BeanRegistrationContributionAssert codeContributionSatisfies(Consumer<CodeContributionAssert> 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);

View File

@@ -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);

View File

@@ -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);