lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-09-18 17:48:14 +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

2
initializr-actuator/src/test/java/io/spring/initializr/actuate/ActuatorIntegrationTests.java
View File

@@ -45,7 +45,7 @@ public class ActuatorIntegrationTests
String body = getRestTemplate().getForObject(createUrl("/actuator/info"), String body = getRestTemplate().getForObject(createUrl("/actuator/info"),
String.class); String.class);
assertThat(body).contains("\"spring-boot\""); assertThat(body).contains("\"spring-boot\"");
assertThat(body).contains("\"version\":\"1.1.4.RELEASE\""); assertThat(body).contains("\"version\":\"2.1.4.RELEASE\"");
} }
@Test @Test

8
initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java
View File

@@ -198,10 +198,10 @@ public class ProjectGenerationMetricsListenerTests {
@Test @Test
public void explicitBootVersion() { public void explicitBootVersion() {
ProjectRequest request = initialize(); ProjectRequest request = initialize();
request.setBootVersion("1.0.2.RELEASE"); request.setBootVersion("1.5.17.RELEASE");
request.resolve(this.metadata); request.resolve(this.metadata);
fireProjectGeneratedEvent(request); fireProjectGeneratedEvent(request);
this.metricsAssert.hasValue(1, "initializr.boot_version.1_0_2_RELEASE"); this.metricsAssert.hasValue(1, "initializr.boot_version.1_5_17_RELEASE");
} }
@Test @Test
@@ -221,7 +221,7 @@ public class ProjectGenerationMetricsListenerTests {
request.setPackaging("jar"); request.setPackaging("jar");
request.setJavaVersion("1.6"); request.setJavaVersion("1.6");
request.setLanguage("groovy"); request.setLanguage("groovy");
request.setBootVersion("1.0.2.RELEASE"); request.setBootVersion("1.5.17.RELEASE");
request.getParameters().put("user-agent", "SpringBootCli/1.3.0.RELEASE"); request.getParameters().put("user-agent", "SpringBootCli/1.3.0.RELEASE");
request.resolve(this.metadata); request.resolve(this.metadata);
@@ -229,7 +229,7 @@ public class ProjectGenerationMetricsListenerTests {
this.metricsAssert.hasValue(1, "initializr.requests", "initializr.dependency.web", this.metricsAssert.hasValue(1, "initializr.requests", "initializr.dependency.web",
"initializr.dependency.security", "initializr.type.gradle-project", "initializr.dependency.security", "initializr.type.gradle-project",
"initializr.packaging.jar", "initializr.java_version.1_6", "initializr.packaging.jar", "initializr.java_version.1_6",
"initializr.language.groovy", "initializr.boot_version.1_0_2_RELEASE", "initializr.language.groovy", "initializr.boot_version.1_5_17_RELEASE",
"initializr.client_id.spring").metricsCount(9); "initializr.client_id.spring").metricsCount(9);
} }

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

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

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

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

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

6
initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDependenciesTests.java
View File

@@ -42,17 +42,17 @@ public class MainControllerDependenciesTests
"application/json"); "application/json");
assertThat(response.getHeaders().getFirst(HttpHeaders.ETAG)).isNotNull(); assertThat(response.getHeaders().getFirst(HttpHeaders.ETAG)).isNotNull();
validateContentType(response, CURRENT_METADATA_MEDIA_TYPE); validateContentType(response, CURRENT_METADATA_MEDIA_TYPE);
validateDependenciesOutput("1.1.4", response.getBody()); validateDependenciesOutput("2.1.4", response.getBody());
} }
@Test @Test
public void filteredDependencies() throws JSONException { public void filteredDependencies() throws JSONException {
ResponseEntity<String> response = execute( ResponseEntity<String> response = execute(
"/dependencies?bootVersion=1.2.1.RELEASE", String.class, null, "/dependencies?bootVersion=2.2.1.RELEASE", String.class, null,
"application/json"); "application/json");
assertThat(response.getHeaders().getFirst(HttpHeaders.ETAG)).isNotNull(); assertThat(response.getHeaders().getFirst(HttpHeaders.ETAG)).isNotNull();
validateContentType(response, CURRENT_METADATA_MEDIA_TYPE); validateContentType(response, CURRENT_METADATA_MEDIA_TYPE);
validateDependenciesOutput("1.2.1", response.getBody()); validateDependenciesOutput("2.2.1", response.getBody());
} }
protected void validateDependenciesOutput(String version, String actual) protected void validateDependenciesOutput(String version, String actual)

2
initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerEnvIntegrationTests.java
View File

@@ -42,7 +42,7 @@ public class MainControllerEnvIntegrationTests
ResponseEntity<?> entity = getRestTemplate().getForEntity(createUrl("/spring"), ResponseEntity<?> entity = getRestTemplate().getForEntity(createUrl("/spring"),
String.class); String.class);
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND);
String expected = "https://repo.spring.io/lib-release/org/springframework/boot/spring-boot-cli/1.1.4.RELEASE/spring-boot-cli-1.1.4.RELEASE-bin.zip"; String expected = "https://repo.spring.io/lib-release/org/springframework/boot/spring-boot-cli/2.1.4.RELEASE/spring-boot-cli-2.1.4.RELEASE-bin.zip";
assertThat(entity.getHeaders().getLocation()).isEqualTo(new URI(expected)); assertThat(entity.getHeaders().getLocation()).isEqualTo(new URI(expected));
} }

8
initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java
View File

@@ -67,7 +67,7 @@ public class MainControllerIntegrationTests
@Test @Test
public void dependencyInRange() { public void dependencyInRange() {
Dependency biz = Dependency.create("org.acme", "biz", "1.3.5", "runtime"); Dependency biz = Dependency.create("org.acme", "biz", "1.3.5", "runtime");
downloadTgz("/starter.tgz?style=org.acme:biz&bootVersion=1.2.1.RELEASE") downloadTgz("/starter.tgz?style=org.acme:biz&bootVersion=2.2.1.RELEASE")
.isJavaProject().isMavenProject().hasStaticAndTemplatesResources(false) .isJavaProject().isMavenProject().hasStaticAndTemplatesResources(false)
.pomAssert().hasDependenciesCount(2).hasDependency(biz); .pomAssert().hasDependenciesCount(2).hasDependency(biz);
} }
@@ -111,7 +111,7 @@ public class MainControllerIntegrationTests
@Test @Test
public void kotlinRange() { public void kotlinRange() {
downloadZip("/starter.zip?style=web&language=kotlin&bootVersion=1.2.1.RELEASE") downloadZip("/starter.zip?style=web&language=kotlin&bootVersion=2.0.1.RELEASE")
.isKotlinProject().isMavenProject().pomAssert().hasDependenciesCount(4) .isKotlinProject().isMavenProject().pomAssert().hasDependenciesCount(4)
.hasProperty("kotlin.version", "1.1"); .hasProperty("kotlin.version", "1.1");
} }
@@ -147,7 +147,7 @@ public class MainControllerIntegrationTests
ResponseEntity<?> entity = getRestTemplate().getForEntity(createUrl(context), ResponseEntity<?> entity = getRestTemplate().getForEntity(createUrl(context),
ResponseEntity.class); ResponseEntity.class);
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND);
String expected = "https://repo.spring.io/release/org/springframework/boot/spring-boot-cli/1.1.4.RELEASE/spring-boot-cli-1.1.4.RELEASE-bin." String expected = "https://repo.spring.io/release/org/springframework/boot/spring-boot-cli/2.1.4.RELEASE/spring-boot-cli-2.1.4.RELEASE-bin."
+ extension; + extension;
assertThat(entity.getHeaders().getLocation()).isEqualTo(new URI(expected)); assertThat(entity.getHeaders().getLocation()).isEqualTo(new URI(expected));
} }
@@ -399,7 +399,7 @@ public class MainControllerIntegrationTests
public void homeHasBootVersion() { public void homeHasBootVersion() {
String body = htmlHome(); String body = htmlHome();
assertThat(body).contains("name=\"bootVersion\""); assertThat(body).contains("name=\"bootVersion\"");
assertThat(body).contains("1.2.0.BUILD-SNAPSHOT\""); assertThat(body).contains("2.2.0.BUILD-SNAPSHOT\"");
} }
@Test @Test

6
initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationPostProcessorTests.java
View File

@@ -36,9 +36,9 @@ public class ProjectGenerationPostProcessorTests
@Test @Test
public void postProcessorsInvoked() { public void postProcessorsInvoked() {
downloadZip("/starter.zip?bootVersion=1.2.4.RELEASE&javaVersion=1.6") downloadZip("/starter.zip?bootVersion=2.0.4.RELEASE&javaVersion=1.8")
.isJavaProject().isMavenProject().pomAssert() .isJavaProject().isMavenProject().pomAssert()
.hasSpringBootParent("1.2.3.RELEASE").hasProperty("java.version", "1.7"); .hasSpringBootParent("2.2.3.RELEASE").hasProperty("java.version", "1.7");
} }
@Configuration @Configuration
@@ -64,7 +64,7 @@ public class ProjectGenerationPostProcessorTests
public void postProcessBeforeResolution(ProjectRequest request, public void postProcessBeforeResolution(ProjectRequest request,
InitializrMetadata metadata) { InitializrMetadata metadata) {
request.setJavaVersion("1.2"); request.setJavaVersion("1.2");
request.setBootVersion("1.2.3.RELEASE"); request.setBootVersion("2.2.3.RELEASE");
} }
}; };
} }

20
initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java
View File

@@ -104,10 +104,10 @@ public class ProjectGenerationSmokeTests
@Test @Test
public void createSimpleProjectWithDifferentBootVersion() throws Exception { public void createSimpleProjectWithDifferentBootVersion() throws Exception {
HomePage page = toHome(); HomePage page = toHome();
page.bootVersion("1.0.2.RELEASE"); page.bootVersion("1.5.17.RELEASE");
page.submit(); page.submit();
assertSimpleProject().isMavenProject().pomAssert() assertSimpleProject().isMavenProject().pomAssert()
.hasSpringBootParent("1.0.2.RELEASE").hasDependenciesCount(2) .hasSpringBootParent("1.5.17.RELEASE").hasDependenciesCount(2)
.hasSpringBootStarterRootDependency().hasSpringBootStarterTest(); .hasSpringBootStarterRootDependency().hasSpringBootStarterTest();
} }
@@ -140,10 +140,10 @@ public class ProjectGenerationSmokeTests
HomePage page = toHome(); HomePage page = toHome();
selectDependency(page, "Data JPA"); selectDependency(page, "Data JPA");
selectDependency(page, "org.acme:bur"); selectDependency(page, "org.acme:bur");
page.bootVersion("1.0.2.RELEASE"); // Bur isn't available anymore page.bootVersion("1.5.17.RELEASE"); // Bur isn't available anymore
page.submit(); page.submit();
assertSimpleProject().isMavenProject().pomAssert() assertSimpleProject().isMavenProject().pomAssert()
.hasSpringBootParent("1.0.2.RELEASE").hasDependenciesCount(2) .hasSpringBootParent("1.5.17.RELEASE").hasDependenciesCount(2)
.hasSpringBootStarterDependency("data-jpa").hasSpringBootStarterTest(); .hasSpringBootStarterDependency("data-jpa").hasSpringBootStarterTest();
} }
@@ -282,13 +282,13 @@ public class ProjectGenerationSmokeTests
@Test @Test
public void dependencyHiddenAccordingToRange() throws Exception { public void dependencyHiddenAccordingToRange() throws Exception {
HomePage page = toHome(); // bur: [1.1.4.RELEASE,1.2.0.BUILD-SNAPSHOT) HomePage page = toHome(); // bur: [2.1.4.RELEASE,2.2.0.BUILD-SNAPSHOT)
page.advanced(); page.advanced();
assertThat(page.dependency("org.acme:bur").isEnabled()).isTrue(); assertThat(page.dependency("org.acme:bur").isEnabled()).isTrue();
page.bootVersion("1.0.2.RELEASE"); page.bootVersion("1.5.17.RELEASE");
assertThat(page.dependency("org.acme:bur").isEnabled()).isFalse(); assertThat(page.dependency("org.acme:bur").isEnabled()).isFalse();
assertThat(page.dependency("org.acme:biz").isEnabled()).isFalse(); assertThat(page.dependency("org.acme:biz").isEnabled()).isFalse();
page.bootVersion("1.1.4.RELEASE"); page.bootVersion("2.1.4.RELEASE");
assertThat(page.dependency("org.acme:bur").isEnabled()).isTrue(); assertThat(page.dependency("org.acme:bur").isEnabled()).isTrue();
assertThat(page.dependency("org.acme:biz").isEnabled()).isFalse(); assertThat(page.dependency("org.acme:biz").isEnabled()).isFalse();
page.bootVersion("Latest SNAPSHOT"); page.bootVersion("Latest SNAPSHOT");
@@ -298,13 +298,13 @@ public class ProjectGenerationSmokeTests
@Test @Test
public void dependencyUncheckedWhenHidden() throws Exception { public void dependencyUncheckedWhenHidden() throws Exception {
HomePage page = toHome(); // bur: [1.1.4.RELEASE,1.2.0.BUILD-SNAPSHOT) HomePage page = toHome(); // bur: [2.1.4.RELEASE,2.2.0.BUILD-SNAPSHOT)
page.advanced(); page.advanced();
page.dependency("org.acme:bur").click(); page.dependency("org.acme:bur").click();
assertThat(page.dependency("org.acme:bur").isSelected()).isTrue(); assertThat(page.dependency("org.acme:bur").isSelected()).isTrue();
page.bootVersion("1.0.2.RELEASE"); page.bootVersion("1.5.17.RELEASE");
assertThat(page.dependency("org.acme:bur").isEnabled()).isFalse(); assertThat(page.dependency("org.acme:bur").isEnabled()).isFalse();
page.bootVersion("1.1.4.RELEASE"); page.bootVersion("2.1.4.RELEASE");
assertThat(page.dependency("org.acme:bur").isEnabled()).isTrue(); assertThat(page.dependency("org.acme:bur").isEnabled()).isTrue();
assertThat(page.dependency("org.acme:bur").isSelected()).isFalse(); assertThat(page.dependency("org.acme:bur").isSelected()).isFalse();
} }

6
initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java
View File

@@ -37,14 +37,14 @@ public class DefaultDependencyMetadataProviderTests {
@Test @Test
public void filterDependencies() { public void filterDependencies() {
Dependency first = Dependency.withId("first", "org.foo", "first"); Dependency first = Dependency.withId("first", "org.foo", "first");
first.setVersionRange("1.1.4.RELEASE"); first.setVersionRange("2.1.4.RELEASE");
Dependency second = Dependency.withId("second", "org.foo", "second"); Dependency second = Dependency.withId("second", "org.foo", "second");
Dependency third = Dependency.withId("third", "org.foo", "third"); Dependency third = Dependency.withId("third", "org.foo", "third");
third.setVersionRange("1.1.8.RELEASE"); third.setVersionRange("2.1.8.RELEASE");
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults() InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
.addDependencyGroup("test", first, second, third).build(); .addDependencyGroup("test", first, second, third).build();
DependencyMetadata dependencyMetadata = this.provider.get(metadata, DependencyMetadata dependencyMetadata = this.provider.get(metadata,
Version.parse("1.1.5.RELEASE")); Version.parse("2.1.5.RELEASE"));
assertThat(dependencyMetadata.getDependencies()).hasSize(2); assertThat(dependencyMetadata.getDependencies()).hasSize(2);
assertThat(dependencyMetadata.getRepositories()).isEmpty(); assertThat(dependencyMetadata.getRepositories()).isEmpty();
assertThat(dependencyMetadata.getBoms()).isEmpty(); assertThat(dependencyMetadata.getBoms()).isEmpty();

22
initializr-web/src/test/resources/metadata/config/test-default.json
View File

@@ -10,18 +10,18 @@
"content": [ "content": [
{ {
"default": false, "default": false,
"id": "1.2.0.BUILD-SNAPSHOT", "id": "2.2.0.BUILD-SNAPSHOT",
"name": "Latest SNAPSHOT" "name": "Latest SNAPSHOT"
}, },
{ {
"default": true, "default": true,
"id": "1.1.4.RELEASE", "id": "2.1.4.RELEASE",
"name": "1.1.4" "name": "2.1.4"
}, },
{ {
"default": false, "default": false,
"id": "1.0.2.RELEASE", "id": "1.5.17.RELEASE",
"name": "1.0.2" "name": "1.5.17"
} }
], ],
"description": "spring boot version", "description": "spring boot version",
@@ -40,11 +40,11 @@
"defaultVersion": "1.2", "defaultVersion": "1.2",
"mappings": [ "mappings": [
{ {
"versionRange": "[1.0.0.RELEASE,1.2.0.RELEASE)", "versionRange": "[1.5.0.RELEASE,2.0.0.M1)",
"version": "1.0" "version": "1.0"
}, },
{ {
"versionRange": "[1.2.0.RELEASE,1.5.0.RELEASE)", "versionRange": "[2.0.0.M1,2.1.0.M1)",
"version": "1.1" "version": "1.1"
} }
] ]
@@ -102,14 +102,14 @@
], ],
"mappings": [ "mappings": [
{ {
"versionRange": "[1.0.0.RELEASE,1.1.6.RELEASE)", "versionRange": "[2.0.0.RELEASE,2.1.6.RELEASE)",
"repositories": [ "repositories": [
"my-api-repo-1" "my-api-repo-1"
], ],
"version": "1.0.0.RELEASE" "version": "1.0.0.RELEASE"
}, },
{ {
"versionRange": "1.2.1.RELEASE", "versionRange": "2.2.1.RELEASE",
"repositories": [ "repositories": [
"my-api-repo-2" "my-api-repo-2"
], ],
@@ -219,7 +219,7 @@
"name": "Biz", "name": "Biz",
"scope": "runtime", "scope": "runtime",
"version": "1.3.5", "version": "1.3.5",
"versionRange": "1.2.0.BUILD-SNAPSHOT" "versionRange": "2.2.0.BUILD-SNAPSHOT"
}, },
{ {
"starter": true, "starter": true,
@@ -229,7 +229,7 @@
"name": "Bur", "name": "Bur",
"scope": "test", "scope": "test",
"version": "2.1.0", "version": "2.1.0",
"versionRange": "[1.1.4.RELEASE,1.2.0.BUILD-SNAPSHOT)" "versionRange": "[2.1.4.RELEASE,2.2.0.BUILD-SNAPSHOT)"
}, },
{ {
"starter": true, "starter": true,

2
initializr-web/src/test/resources/metadata/dependencies/test-dependencies-1.1.4.json → initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.1.4.json
View File

@@ -1,5 +1,5 @@
{ {
"bootVersion": "1.1.4.RELEASE", "bootVersion": "2.1.4.RELEASE",
"repositories": { "repositories": {
"my-api-repo-1": { "my-api-repo-1": {
"name": "repo1", "name": "repo1",

2
initializr-web/src/test/resources/metadata/dependencies/test-dependencies-1.2.1.json → initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.2.1.json
View File

@@ -1,5 +1,5 @@
{ {
"bootVersion": "1.2.1.RELEASE", "bootVersion": "2.2.1.RELEASE",
"repositories": { "repositories": {
"my-api-repo-2": { "my-api-repo-2": {
"name": "repo2", "name": "repo2",

12
initializr-web/src/test/resources/metadata/test-default-2.0.0-ssl.json
View File

@@ -151,19 +151,19 @@
}, },
"bootVersion": { "bootVersion": {
"type": "single-select", "type": "single-select",
"default": "1.1.4.RELEASE", "default": "2.1.4.RELEASE",
"values": [ "values": [
{ {
"id": "1.2.0.BUILD-SNAPSHOT", "id": "2.2.0.BUILD-SNAPSHOT",
"name": "Latest SNAPSHOT" "name": "Latest SNAPSHOT"
}, },
{ {
"id": "1.1.4.RELEASE", "id": "2.1.4.RELEASE",
"name": "1.1.4" "name": "2.1.4"
}, },
{ {
"id": "1.0.2.RELEASE", "id": "1.5.17.RELEASE",
"name": "1.0.2" "name": "1.5.17"
} }
] ]
}, },

12
initializr-web/src/test/resources/metadata/test-default-2.0.0.json
View File

@@ -151,19 +151,19 @@
}, },
"bootVersion": { "bootVersion": {
"type": "single-select", "type": "single-select",
"default": "1.1.4.RELEASE", "default": "2.1.4.RELEASE",
"values": [ "values": [
{ {
"id": "1.2.0.BUILD-SNAPSHOT", "id": "2.2.0.BUILD-SNAPSHOT",
"name": "Latest SNAPSHOT" "name": "Latest SNAPSHOT"
}, },
{ {
"id": "1.1.4.RELEASE", "id": "2.1.4.RELEASE",
"name": "1.1.4" "name": "2.1.4"
}, },
{ {
"id": "1.0.2.RELEASE", "id": "1.5.17.RELEASE",
"name": "1.0.2" "name": "1.5.17"
} }
] ]
}, },

16
initializr-web/src/test/resources/metadata/test-default-2.1.0-ssl.json
View File

@@ -80,12 +80,12 @@
{ {
"id": "org.acme:biz", "id": "org.acme:biz",
"name": "Biz", "name": "Biz",
"versionRange": "1.2.0.BUILD-SNAPSHOT" "versionRange": "2.2.0.BUILD-SNAPSHOT"
}, },
{ {
"id": "org.acme:bur", "id": "org.acme:bur",
"name": "Bur", "name": "Bur",
"versionRange": "[1.1.4.RELEASE,1.2.0.BUILD-SNAPSHOT)" "versionRange": "[2.1.4.RELEASE,2.2.0.BUILD-SNAPSHOT)"
}, },
{ {
"id": "my-api", "id": "my-api",
@@ -189,19 +189,19 @@
}, },
"bootVersion": { "bootVersion": {
"type": "single-select", "type": "single-select",
"default": "1.1.4.RELEASE", "default": "2.1.4.RELEASE",
"values": [ "values": [
{ {
"id": "1.2.0.BUILD-SNAPSHOT", "id": "2.2.0.BUILD-SNAPSHOT",
"name": "Latest SNAPSHOT" "name": "Latest SNAPSHOT"
}, },
{ {
"id": "1.1.4.RELEASE", "id": "2.1.4.RELEASE",
"name": "1.1.4" "name": "2.1.4"
}, },
{ {
"id": "1.0.2.RELEASE", "id": "1.5.17.RELEASE",
"name": "1.0.2" "name": "1.5.17"
} }
] ]
}, },

16
initializr-web/src/test/resources/metadata/test-default-2.1.0.json
View File

@@ -80,12 +80,12 @@
{ {
"id": "org.acme:biz", "id": "org.acme:biz",
"name": "Biz", "name": "Biz",
"versionRange": "1.2.0.BUILD-SNAPSHOT" "versionRange": "2.2.0.BUILD-SNAPSHOT"
}, },
{ {
"id": "org.acme:bur", "id": "org.acme:bur",
"name": "Bur", "name": "Bur",
"versionRange": "[1.1.4.RELEASE,1.2.0.BUILD-SNAPSHOT)" "versionRange": "[2.1.4.RELEASE,2.2.0.BUILD-SNAPSHOT)"
}, },
{ {
"id": "my-api", "id": "my-api",
@@ -189,19 +189,19 @@
}, },
"bootVersion": { "bootVersion": {
"type": "single-select", "type": "single-select",
"default": "1.1.4.RELEASE", "default": "2.1.4.RELEASE",
"values": [ "values": [
{ {
"id": "1.2.0.BUILD-SNAPSHOT", "id": "2.2.0.BUILD-SNAPSHOT",
"name": "Latest SNAPSHOT" "name": "Latest SNAPSHOT"
}, },
{ {
"id": "1.1.4.RELEASE", "id": "2.1.4.RELEASE",
"name": "1.1.4" "name": "2.1.4"
}, },
{ {
"id": "1.0.2.RELEASE", "id": "1.5.17.RELEASE",
"name": "1.0.2" "name": "1.5.17"
} }
] ]
}, },