lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2026-02-26 05:32:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adapt test suite to more recent Spring Boot versions

Browse Source 
See gh-763
This commit is contained in:
Stephane Nicoll
2018-11-28 14:40:28 +01:00
parent 2a7b8f782d
commit da1655d183
18 changed files with 105 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java
View File

@@ -486,9 +486,9 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
.setMavenParent("com.foo", "foo-parent", "1.0.0-SNAPSHOT", true).build();
applyMetadata(metadata);
ProjectRequest request = createProjectRequest("web");
request.setBootVersion("1.0.2.RELEASE");
request.setBootVersion("1.5.17.RELEASE");
generateMavenPom(request).hasParent("com.foo", "foo-parent", "1.0.0-SNAPSHOT")
.hasProperty("spring-boot.version", "1.0.2.RELEASE")
.hasProperty("spring-boot.version", "1.5.17.RELEASE")
.hasBom("org.springframework.boot", "spring-boot-dependencies",
"${spring-boot.version}")
.hasBomsCount(1);
@@ -501,11 +501,11 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
.setMavenParent("com.foo", "foo-parent", "1.0.0-SNAPSHOT", true).build();
applyMetadata(metadata);
ProjectRequest request = createProjectRequest("web");
request.setBootVersion("1.0.2.RELEASE");
request.setBootVersion("1.5.17.RELEASE");
generateGradleBuild(request)
.doesNotContain("ext['spring-boot.version'] = '1.0.2.RELEASE'")
.doesNotContain("ext['spring-boot.version'] = '1.5.17.RELEASE'")
.doesNotContain(
"mavenBom \"org.springframework.boot:spring-boot-dependencies:1.0.2.RELEASE\"");
"mavenBom \"org.springframework.boot:spring-boot-dependencies:1.5.17.RELEASE\"");
}
@Test
@@ -683,22 +683,22 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
foo.setBom("the-bom");
BillOfMaterials bom = BillOfMaterials.create("org.acme", "foo-bom");
bom.getMappings()
.add(BillOfMaterials.Mapping.create("[1.2.0.RELEASE,1.3.0.M1)", "1.0.0"));
bom.getMappings().add(BillOfMaterials.Mapping.create("1.3.0.M1", "1.2.0"));
.add(BillOfMaterials.Mapping.create("[2.2.0.RELEASE,2.3.0.M1)", "1.0.0"));
bom.getMappings().add(BillOfMaterials.Mapping.create("2.3.0.M1", "1.2.0"));
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
.addDependencyGroup("foo", foo).addBom("the-bom", bom).build();
applyMetadata(metadata);
// First version
ProjectRequest request = createProjectRequest("foo");
request.setBootVersion("1.2.5.RELEASE");
generateMavenPom(request).hasDependency(foo).hasSpringBootParent("1.2.5.RELEASE")
request.setBootVersion("2.2.5.RELEASE");
generateMavenPom(request).hasDependency(foo).hasSpringBootParent("2.2.5.RELEASE")
.hasBom("org.acme", "foo-bom", "1.0.0");
// Second version
ProjectRequest request2 = createProjectRequest("foo");
request2.setBootVersion("1.3.0.M1");
generateMavenPom(request2).hasDependency(foo).hasSpringBootParent("1.3.0.M1")
request2.setBootVersion("2.3.0.M1");
generateMavenPom(request2).hasDependency(foo).hasSpringBootParent("2.3.0.M1")
.hasBom("org.acme", "foo-bom", "1.2.0");
}
@@ -709,8 +709,8 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
BillOfMaterials bom = BillOfMaterials.create("org.acme", "foo-bom");
bom.getRepositories().add("foo-repo");
bom.getMappings()
.add(BillOfMaterials.Mapping.create("[1.2.0.RELEASE,1.3.0.M1)", "1.0.0"));
bom.getMappings().add(BillOfMaterials.Mapping.create("1.3.0.M1", "1.2.0",
.add(BillOfMaterials.Mapping.create("[2.2.0.RELEASE,2.3.0.M1)", "1.0.0"));
bom.getMappings().add(BillOfMaterials.Mapping.create("2.3.0.M1", "1.2.0",
"foo-repo", "bar-repo"));
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
.addDependencyGroup("foo", foo).addBom("the-bom", bom)
@@ -721,8 +721,8 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
// Second version
ProjectRequest request = createProjectRequest("foo");
request.setBootVersion("1.3.0.RELEASE");
generateMavenPom(request).hasDependency(foo).hasSpringBootParent("1.3.0.RELEASE")
request.setBootVersion("2.3.0.RELEASE");
generateMavenPom(request).hasDependency(foo).hasSpringBootParent("2.3.0.RELEASE")
.hasBom("org.acme", "foo-bom", "1.2.0")
.hasRepository("foo-repo", "repo", "http://example.com/foo", true)
.hasRepository("bar-repo", "repo", "http://example.com/bar", false)
@@ -843,16 +843,16 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
@Test
public void versionRangeWithPostProcessor() {
Dependency foo = Dependency.withId("foo", "org.acme", "foo");
foo.getMappings().add(Dependency.Mapping.create("[1.2.0.RELEASE,1.3.0.M1)", null,
foo.getMappings().add(Dependency.Mapping.create("[2.2.0.RELEASE,2.3.0.M1)", null,
null, "1.0.0"));
foo.getMappings().add(Dependency.Mapping.create("1.3.0.M1", null, null, "1.2.0"));
foo.getMappings().add(Dependency.Mapping.create("2.3.0.M1", null, null, "1.2.0"));
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
.addDependencyGroup("foo", foo).build();
applyMetadata(metadata);
// First without processor, get the correct version
ProjectRequest request = createProjectRequest("foo");
request.setBootVersion("1.2.5.RELEASE");
request.setBootVersion("2.2.5.RELEASE");
generateMavenPom(request)
.hasDependency(Dependency.withId("foo", "org.acme", "foo", "1.0.0"));
@@ -862,7 +862,7 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
@Override
public void postProcessBeforeResolution(ProjectRequest r,
InitializrMetadata m) {
r.setBootVersion("1.3.0.M2");
r.setBootVersion("2.3.0.M2");
}
})));
generateMavenPom(request)

24
initializr-generator/src/test/resources/application-test-default.yml
View File

@@ -1,6 +1,6 @@
info:
spring-boot:
version: 1.1.4.RELEASE
version: 2.1.4.RELEASE
initializr:
env:
@@ -11,10 +11,10 @@ initializr:
versionProperty: my-api.version
additionalBoms: ['my-api-dependencies-bom']
mappings:
- versionRange: "[1.0.0.RELEASE,1.1.6.RELEASE)"
- versionRange: "[2.0.0.RELEASE,2.1.6.RELEASE)"
version: 1.0.0.RELEASE
repositories: my-api-repo-1
- versionRange: "1.2.1.RELEASE"
- versionRange: "2.2.1.RELEASE"
version: 2.0.0.RELEASE
repositories: my-api-repo-2
my-api-dependencies-bom:
@@ -25,9 +25,9 @@ initializr:
kotlin:
defaultVersion: 1.2
mappings:
- versionRange: "[1.0.0.RELEASE,1.2.0.RELEASE)"
- versionRange: "[1.5.0.RELEASE,2.0.0.M1)"
version: 1.0
- versionRange: "[1.2.0.RELEASE,1.5.0.RELEASE)"
- versionRange: "[2.0.0.M1,2.1.0.M1)"
version: 1.1
repositories:
my-api-repo-1:
@@ -85,12 +85,12 @@ initializr:
artifactId: biz
scope: runtime
version: 1.3.5
versionRange: 1.2.0.BUILD-SNAPSHOT
versionRange: 2.2.0.BUILD-SNAPSHOT
- name: Bur
id: org.acme:bur
version: 2.1.0
scope: test
versionRange: "[1.1.4.RELEASE,1.2.0.BUILD-SNAPSHOT)"
versionRange: "[2.1.4.RELEASE,2.2.0.BUILD-SNAPSHOT)"
- name: My API
id : my-api
groupId: org.acme
@@ -156,12 +156,12 @@ initializr:
default: false
bootVersions:
- name : Latest SNAPSHOT
id: 1.2.0.BUILD-SNAPSHOT
id: 2.2.0.BUILD-SNAPSHOT
default: false
- name: 1.1.4
id: 1.1.4.RELEASE
- name: 2.1.4
id: 2.1.4.RELEASE
default: true
- name: 1.0.2
id: 1.0.2.RELEASE
- name: 1.5.17
id: 1.5.17.RELEASE
default: false

8
initializr-generator/src/test/resources/metadata/config/test-min.json
View File

@@ -47,13 +47,13 @@
"description": null,
"content": [
{
"name": "1.1.4",
"id": "1.1.4.RELEASE",
"name": "2.1.4",
"id": "2.1.4.RELEASE",
"default": true
},
{
"name": "1.0.2",
"id": "1.0.2.RELEASE",
"name": "1.5.17",
"id": "1.5.17.RELEASE",
"default": false
}
]