Skip to content

Commit 10b3b81

Browse files
committed
Fix failed tests
All tests passed up to the initializr-generator-spring module.
1 parent d099dbc commit 10b3b81

File tree

3 files changed

+38
-4
lines changed

3 files changed

+38
-4
lines changed

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/ProjectGeneratorIntegrationTests.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import io.spring.initializr.generator.buildsystem.BuildSystem;
2424
import io.spring.initializr.generator.buildsystem.gradle.GradleBuildSystem;
2525
import io.spring.initializr.generator.buildsystem.maven.MavenBuildSystem;
26+
import io.spring.initializr.generator.configuration.format.properties.PropertiesFormat;
27+
import io.spring.initializr.generator.configuration.format.yaml.YamlFormat;
2628
import io.spring.initializr.generator.language.java.JavaLanguage;
2729
import io.spring.initializr.generator.project.MutableProjectDescription;
2830
import io.spring.initializr.generator.project.ProjectGenerationConfiguration;
@@ -80,10 +82,27 @@ void customBaseDirectoryIsUsedWhenGeneratingProject() {
8082
"test/demo-app/src/test/java/com/example/demo/DemoApplicationTests.java", "test/demo-app/HELP.md");
8183
}
8284

85+
@Test
86+
void yaml() {
87+
MutableProjectDescription description = initProjectDescription();
88+
description.setBuildSystem(new MavenBuildSystem());
89+
description.setBaseDirectory("test/demo-app");
90+
description.setConfigurationFileFormat(new YamlFormat());
91+
ProjectStructure project = this.projectTester.generate(description);
92+
assertThat(project).filePaths()
93+
.containsOnly("test/demo-app/.gitignore", "test/demo-app/.gitattributes", "test/demo-app/pom.xml",
94+
"test/demo-app/mvnw", "test/demo-app/mvnw.cmd",
95+
"test/demo-app/.mvn/wrapper/maven-wrapper.properties",
96+
"test/demo-app/src/main/java/com/example/demo/DemoApplication.java",
97+
"test/demo-app/src/main/resources/application.yml",
98+
"test/demo-app/src/test/java/com/example/demo/DemoApplicationTests.java", "test/demo-app/HELP.md");
99+
}
100+
83101
@Test
84102
void generatedMavenProjectBuilds(@TempDir Path mavenHome) throws Exception {
85103
MutableProjectDescription description = initProjectDescription();
86104
description.setBuildSystem(new MavenBuildSystem());
105+
description.setConfigurationFileFormat(new YamlFormat());
87106
ProjectStructure project = this.projectTester.generate(description);
88107
Path projectDirectory = project.getProjectDirectory();
89108
runBuild(mavenHome, projectDirectory, description);
@@ -146,6 +165,7 @@ private MutableProjectDescription initProjectDescription() {
146165
description.setApplicationName("DemoApplication");
147166
description.setPlatformVersion(Version.parse(SpringBootVersion.getVersion()));
148167
description.setLanguage(new JavaLanguage(JAVA_VERSION));
168+
description.setConfigurationFileFormat(new PropertiesFormat());
149169
description.setGroupId("com.example");
150170
return description;
151171
}

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/CodeComplianceTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ void currentGenerationJar(Language language) {
5959
String.format("src/main/%s/com/example/demo/DemoApplication.%s", language.id(),
6060
language.sourceFileExtension()),
6161
String.format("src/test/%s/com/example/demo/DemoApplicationTests.%s", language.id(),
62-
language.sourceFileExtension()),
63-
"src/main/resources/application.properties");
62+
language.sourceFileExtension()));
6463
}
6564

6665
@ParameterizedTest
@@ -73,8 +72,7 @@ void currentGenerationWar(Language language) {
7372
String.format("src/main/%s/com/example/demo/DemoApplication.%s", language.id(),
7473
language.sourceFileExtension()),
7574
String.format("src/test/%s/com/example/demo/DemoApplicationTests.%s", language.id(),
76-
language.sourceFileExtension()),
77-
"src/main/resources/application.properties");
75+
language.sourceFileExtension()));
7876
}
7977

8078
@ParameterizedTest

initializr-generator-test/src/main/java/io/spring/initializr/generator/test/InitializrMetadataTestBuilder.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public InitializrMetadataTestBuilder addBasicDefaults() {
8787
return addDefaultTypes().addDefaultPackagings()
8888
.addDefaultJavaVersions()
8989
.addDefaultLanguages()
90+
.addDefaultConfigurationFileFormats()
9091
.addDefaultBootVersions();
9192
}
9293

@@ -166,6 +167,21 @@ public InitializrMetadataTestBuilder addLanguage(String id, boolean defaultValue
166167
return this;
167168
}
168169

170+
public InitializrMetadataTestBuilder addDefaultConfigurationFileFormats() {
171+
return addConfigurationFileFormats("properties", true).addConfigurationFileFormats("yml", false);
172+
}
173+
174+
public InitializrMetadataTestBuilder addConfigurationFileFormats(String id, boolean defaultValue) {
175+
this.builder.withCustomizer((it) -> {
176+
DefaultMetadataElement element = new DefaultMetadataElement();
177+
element.setId(id);
178+
element.setName(id);
179+
element.setDefault(defaultValue);
180+
it.getConfigurationFileFormats().addContent(element);
181+
});
182+
return this;
183+
}
184+
169185
public InitializrMetadataTestBuilder addDefaultBootVersions() {
170186
return addBootVersion("2.2.17.RELEASE", false).addBootVersion("2.3.3.RELEASE", false)
171187
.addBootVersion("2.4.1", true)

0 commit comments

Comments
 (0)