Add support for ApplicationContextRunner in ProjectAssetTester

Closes gh-1004
This commit is contained in:
Stephane Nicoll
2019-09-17 09:01:57 +02:00
parent 1d213258a2
commit 23cc192813
10 changed files with 111 additions and 72 deletions

View File

@@ -16,8 +16,6 @@
package io.spring.initializr.generator.spring.build.gradle;
import java.util.Map;
import io.spring.initializr.generator.project.MutableProjectDescription;
import io.spring.initializr.generator.test.project.ProjectAssetTester;
import io.spring.initializr.generator.version.Version;
@@ -42,79 +40,61 @@ public class ConditionalOnGradleVersionTests {
void outcomeWithSpringBoot15() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("1.5.18.RELEASE"));
String bean = outcomeFor(description);
assertThat(bean).isEqualTo("testGradle3");
this.projectTester.configure(description, (context) -> assertThat(context).hasSingleBean(String.class)
.getBean(String.class).isEqualTo("testGradle3"));
}
@Test
void outcomeWithSpringBoot20() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.0.9.RELEASE"));
String bean = outcomeFor(description);
assertThat(bean).isEqualTo("testGradle4");
this.projectTester.configure(description, (context) -> assertThat(context).hasSingleBean(String.class)
.getBean(String.class).isEqualTo("testGradle4"));
}
@Test
void outcomeWithSpringBoot21() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.1.3.RELEASE"));
String bean = outcomeFor(description);
assertThat(bean).isEqualTo("testGradle5");
this.projectTester.configure(description, (context) -> assertThat(context).hasSingleBean(String.class)
.getBean(String.class).isEqualTo("testGradle5"));
}
@Test
void outcomeWithNoMatch() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("1.0.0.RELEASE"));
this.projectTester.generate(description, (projectGenerationContext) -> {
assertThat(projectGenerationContext.getBeansOfType(String.class)).isEmpty();
return null;
});
this.projectTester.configure(description, (context) -> assertThat(context).doesNotHaveBean(String.class));
}
@Test
void outcomeWithNoAvailableSpringBootVersion() {
MutableProjectDescription description = new MutableProjectDescription();
this.projectTester.generate(description, (projectGenerationContext) -> {
assertThat(projectGenerationContext.getBeansOfType(String.class)).isEmpty();
return null;
});
this.projectTester.configure(description, (context) -> assertThat(context).doesNotHaveBean(String.class));
}
@Test
void outcomeWithSpringBoot15AndMultipleGenerations() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("1.5.18.RELEASE"));
Map<String, String> candidates = candidatesFor(description, Gradle3Or4TestConfiguration.class);
assertThat(candidates).containsOnlyKeys("gradle3", "gradle3AndLater");
this.projectTester.withConfiguration(Gradle3Or4TestConfiguration.class).configure(description,
(context) -> assertThat(context).getBeanNames(String.class).containsOnly("gradle3", "gradle3AndLater"));
}
@Test
void outcomeWithSpringBoot20AndMultipleGenerations() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.0.9.RELEASE"));
Map<String, String> candidates = candidatesFor(description, Gradle3Or4TestConfiguration.class);
assertThat(candidates).containsOnlyKeys("gradle4", "gradle3AndLater");
this.projectTester.withConfiguration(Gradle3Or4TestConfiguration.class).configure(description,
(context) -> assertThat(context).getBeanNames(String.class).containsOnly("gradle4", "gradle3AndLater"));
}
@Test
void outcomeWithSpringBoot21AndMultipleNonMatchingGenerations() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.1.3.RELEASE"));
Map<String, String> candidates = candidatesFor(description, Gradle3Or4TestConfiguration.class);
assertThat(candidates).containsOnlyKeys("gradle5");
}
private String outcomeFor(MutableProjectDescription description) {
return this.projectTester.generate(description, (projectGenerationContext) -> {
assertThat(projectGenerationContext.getBeansOfType(String.class)).hasSize(1);
return projectGenerationContext.getBean(String.class);
});
}
private Map<String, String> candidatesFor(MutableProjectDescription description, Class<?>... extraConfigurations) {
return this.projectTester.withConfiguration(extraConfigurations).generate(description,
(context) -> context.getBeansOfType(String.class));
this.projectTester.withConfiguration(Gradle3Or4TestConfiguration.class).configure(description,
(context) -> assertThat(context).getBeanNames(String.class).containsOnly("gradle5"));
}
@Configuration

View File

@@ -76,11 +76,12 @@ class GradleKtsProjectGenerationConfigurationTests {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse(platformVersion));
description.setLanguage(new JavaLanguage());
BuildWriter buildWriter = this.projectTester.generate(description,
(context) -> context.getBean(BuildWriter.class));
assertThat(buildWriter).isInstanceOf(GradleBuildProjectContributor.class);
assertThat(ReflectionTestUtils.getField(buildWriter, "buildWriter"))
.isInstanceOf(KotlinDslGradleBuildWriter.class);
this.projectTester.configure(description, (context) -> {
assertThat(context).hasSingleBean(BuildWriter.class).getBean(BuildWriter.class)
.isInstanceOf(GradleBuildProjectContributor.class);
assertThat(ReflectionTestUtils.getField(context.getBean(BuildWriter.class), "buildWriter"))
.isInstanceOf(KotlinDslGradleBuildWriter.class);
});
}
static Stream<Arguments> gradleWrapperParameters() {

View File

@@ -17,7 +17,6 @@
package io.spring.initializr.generator.spring.build.gradle;
import java.nio.file.Path;
import java.util.Map;
import java.util.stream.Stream;
import io.spring.initializr.generator.buildsystem.BuildWriter;
@@ -76,11 +75,12 @@ class GradleProjectGenerationConfigurationTests {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse(platformVersion));
description.setLanguage(new JavaLanguage());
BuildWriter buildWriter = this.projectTester.generate(description,
(context) -> context.getBean(BuildWriter.class));
assertThat(buildWriter).isInstanceOf(GradleBuildProjectContributor.class);
assertThat(ReflectionTestUtils.getField(buildWriter, "buildWriter"))
.isInstanceOf(GroovyDslGradleBuildWriter.class);
this.projectTester.configure(description, (context) -> {
assertThat(context).hasSingleBean(BuildWriter.class).getBean(BuildWriter.class)
.isInstanceOf(GradleBuildProjectContributor.class);
assertThat(ReflectionTestUtils.getField(context.getBean(BuildWriter.class), "buildWriter"))
.isInstanceOf(GroovyDslGradleBuildWriter.class);
});
}
static Stream<Arguments> gradleWrapperParameters() {
@@ -193,9 +193,8 @@ class GradleProjectGenerationConfigurationTests {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse(platformVersion));
description.setLanguage(new JavaLanguage());
Map<String, GradleAnnotationProcessorScopeBuildCustomizer> generate = this.projectTester.generate(description,
(context) -> context.getBeansOfType(GradleAnnotationProcessorScopeBuildCustomizer.class));
assertThat(generate).hasSize((contributorExpected) ? 1 : 0);
this.projectTester.configure(description, (context) -> assertThat(context)
.getBeans(GradleAnnotationProcessorScopeBuildCustomizer.class).hasSize((contributorExpected) ? 1 : 0));
}
}

View File

@@ -59,9 +59,8 @@ class MavenProjectGenerationConfigurationTests {
void buildWriterIsContributed() {
MutableProjectDescription description = new MutableProjectDescription();
description.setPlatformVersion(Version.parse("2.1.0.RELEASE"));
BuildWriter buildWriter = this.projectTester.generate(description,
(context) -> context.getBean(BuildWriter.class));
assertThat(buildWriter).isInstanceOf(MavenBuildProjectContributor.class);
this.projectTester.configure(description, (context) -> assertThat(context).hasSingleBean(BuildWriter.class)
.getBean(BuildWriter.class).isInstanceOf(MavenBuildProjectContributor.class));
}
@Test

View File

@@ -102,7 +102,7 @@ class SourceCodeProjectGenerationConfigurationTests {
description.setPackaging(Packaging.forId("war"));
description.setPackageName("com.foo");
description.setPlatformVersion(Version.parse(version));
this.projectTester.generate(description, (context) -> {
this.projectTester.configure(description, (context) -> {
ServletInitializerContributor bean = context.getBean(ServletInitializerContributor.class);
SourceCode<TypeDeclaration, CompilationUnit<TypeDeclaration>> sourceCode = mock(SourceCode.class);
CompilationUnit<TypeDeclaration> compilationUnit = mock(CompilationUnit.class);
@@ -112,7 +112,6 @@ class SourceCodeProjectGenerationConfigurationTests {
bean.customize(sourceCode);
verify(sourceCode).createCompilationUnit("com.foo", "ServletInitializer");
verify(typeDeclaration).extend(className);
return null;
});
}

View File

@@ -69,17 +69,16 @@ class KotlinProjectGenerationConfigurationTests {
@Test
void kotlinVersionFallbacksToMetadataIfNotPresent() {
KotlinProjectSettings settings = this.projectTester.generate(new MutableProjectDescription(),
(context) -> context.getBean(KotlinProjectSettings.class));
assertThat(settings.getVersion()).isEqualTo("1.1.1");
this.projectTester.configure(new MutableProjectDescription(),
(context) -> assertThat(context.getBean(KotlinProjectSettings.class).getVersion()).isEqualTo("1.1.1"));
}
@Test
void kotlinVersionResolverIsUsedIfPresent() {
KotlinProjectSettings settings = this.projectTester
.withBean(KotlinProjectSettings.class, () -> new SimpleKotlinProjectSettings("0.9.12"))
.generate(new MutableProjectDescription(), (context) -> context.getBean(KotlinProjectSettings.class));
assertThat(settings.getVersion()).isEqualTo("0.9.12");
this.projectTester.withBean(KotlinProjectSettings.class, () -> new SimpleKotlinProjectSettings("0.9.12"))
.configure(new MutableProjectDescription(),
(context) -> assertThat(context.getBean(KotlinProjectSettings.class).getVersion())
.isEqualTo("0.9.12"));
}
@Test

View File

@@ -73,9 +73,9 @@ class HelpDocumentProjectGenerationConfigurationTests {
@Test
void helpDocumentIsAddedToGitIgnore() {
MutableProjectDescription description = new MutableProjectDescription();
GitIgnoreCustomizer gitIgnoreCustomizer = this.projectTester.generate(description,
(context) -> context.getBean(GitIgnoreCustomizer.class));
assertThat(gitIgnoreCustomizer).isInstanceOf(HelpDocumentGitIgnoreCustomizer.class);
this.projectTester.configure(description,
(context) -> assertThat(context).hasSingleBean(GitIgnoreCustomizer.class)
.getBean(GitIgnoreCustomizer.class).isInstanceOf(HelpDocumentGitIgnoreCustomizer.class));
}
}