This commit is contained in:
Stephane Nicoll
2019-03-15 14:19:54 +01:00
parent 9465a70fa6
commit 1ad3dae770
6 changed files with 18 additions and 33 deletions

View File

@@ -178,11 +178,10 @@ class BuildComplianceTests extends AbstractComplianceTests {
bom.setVersionProperty("foo.version");
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
.addDependencyGroup("foo", foo).addBom("the-bom", bom).build();
ProjectAssert project = generateProject(java, build, "2.1.1.RELEASE",
(description) -> {
description.addDependency("foo",
MetadataBuildItemMapper.toDependency(foo));
}, metadata);
ProjectAssert project = generateProject(
java, build, "2.1.1.RELEASE", (description) -> description
.addDependency("foo", MetadataBuildItemMapper.toDependency(foo)),
metadata);
project.sourceCodeAssert(fileName).equalsTo(new ClassPathResource(
"project/" + build + "/bom-property-" + getAssertFileName(fileName)));
}

View File

@@ -62,9 +62,7 @@ class CodeComplianceTests extends AbstractComplianceTests {
@MethodSource("parameters")
void currentGenerationWar(Language language, String extension) {
ProjectAssert project = generateProject(language, maven, "2.1.1.RELEASE",
(description) -> {
description.setPackaging(Packaging.forId("war"));
});
(description) -> description.setPackaging(Packaging.forId("war")));
project.isGenericProject(ProjectAssert.DEFAULT_PACKAGE_NAME,
ProjectAssert.DEFAULT_APPLICATION_NAME, language.id(), extension);
}
@@ -84,9 +82,8 @@ class CodeComplianceTests extends AbstractComplianceTests {
@MethodSource("parameters")
void previousGenerationMainClass(Language language, String extension) {
ProjectAssert project = generateProject(language, maven, "2.1.1.RELEASE",
(description) -> {
description.setPlatformVersion(Version.parse("1.5.18.RELEASE"));
});
(description) -> description
.setPlatformVersion(Version.parse("1.5.18.RELEASE")));
project.sourceCodeAssert(
"src/main/" + language + "/com/example/demo/DemoApplication." + extension)
.equalsTo(new ClassPathResource("project/" + language + "/previous/"
@@ -108,10 +105,8 @@ class CodeComplianceTests extends AbstractComplianceTests {
@MethodSource("parameters")
void currentGenerationTestClassWeb(Language language, String extension) {
ProjectAssert project = generateProject(language, maven, "2.1.1.RELEASE",
(description) -> {
description.addDependency("web",
MetadataBuildItemMapper.toDependency(WEB));
});
(description) -> description.addDependency("web",
MetadataBuildItemMapper.toDependency(WEB)));
project.sourceCodeAssert("src/test/" + language
+ "/com/example/demo/DemoApplicationTests." + extension)
.equalsTo(new ClassPathResource(
@@ -123,9 +118,7 @@ class CodeComplianceTests extends AbstractComplianceTests {
@MethodSource("parameters")
void currentGenerationServletInitializer(Language language, String extension) {
ProjectAssert project = generateProject(language, maven, "2.1.1.RELEASE",
(description) -> {
description.setPackaging(Packaging.forId("war"));
});
(description) -> description.setPackaging(Packaging.forId("war")));
project.sourceCodeAssert("src/main/" + language
+ "/com/example/demo/ServletInitializer." + extension)
.equalsTo(new ClassPathResource("project/" + language + "/standard/"