From da1655d183edf25aa62c505fd5570e2ea35ddebb Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 28 Nov 2018 14:40:28 +0100 Subject: [PATCH] Adapt test suite to more recent Spring Boot versions See gh-763 --- .../actuate/ActuatorIntegrationTests.java | 2 +- ...ProjectGenerationMetricsListenerTests.java | 8 ++-- .../generator/ProjectGeneratorTests.java | 38 +++++++++---------- .../resources/application-test-default.yml | 24 ++++++------ .../resources/metadata/config/test-min.json | 8 ++-- .../MainControllerDependenciesTests.java | 6 +-- .../MainControllerEnvIntegrationTests.java | 2 +- .../MainControllerIntegrationTests.java | 8 ++-- .../ProjectGenerationPostProcessorTests.java | 6 +-- .../project/ProjectGenerationSmokeTests.java | 20 +++++----- ...efaultDependencyMetadataProviderTests.java | 6 +-- .../metadata/config/test-default.json | 22 +++++------ ....1.4.json => test-dependencies-2.1.4.json} | 2 +- ....2.1.json => test-dependencies-2.2.1.json} | 2 +- .../metadata/test-default-2.0.0-ssl.json | 12 +++--- .../metadata/test-default-2.0.0.json | 12 +++--- .../metadata/test-default-2.1.0-ssl.json | 16 ++++---- .../metadata/test-default-2.1.0.json | 16 ++++---- 18 files changed, 105 insertions(+), 105 deletions(-) rename initializr-web/src/test/resources/metadata/dependencies/{test-dependencies-1.1.4.json => test-dependencies-2.1.4.json} (97%) rename initializr-web/src/test/resources/metadata/dependencies/{test-dependencies-1.2.1.json => test-dependencies-2.2.1.json} (97%) diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/ActuatorIntegrationTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/ActuatorIntegrationTests.java index 9e841d42..e04cf936 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/ActuatorIntegrationTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/ActuatorIntegrationTests.java @@ -45,7 +45,7 @@ public class ActuatorIntegrationTests String body = getRestTemplate().getForObject(createUrl("/actuator/info"), String.class); assertThat(body).contains("\"spring-boot\""); - assertThat(body).contains("\"version\":\"1.1.4.RELEASE\""); + assertThat(body).contains("\"version\":\"2.1.4.RELEASE\""); } @Test diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java index e28ec3c8..0bbe0de8 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/metric/ProjectGenerationMetricsListenerTests.java @@ -198,10 +198,10 @@ public class ProjectGenerationMetricsListenerTests { @Test public void explicitBootVersion() { ProjectRequest request = initialize(); - request.setBootVersion("1.0.2.RELEASE"); + request.setBootVersion("1.5.17.RELEASE"); request.resolve(this.metadata); 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 @@ -221,7 +221,7 @@ public class ProjectGenerationMetricsListenerTests { request.setPackaging("jar"); request.setJavaVersion("1.6"); 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.resolve(this.metadata); @@ -229,7 +229,7 @@ public class ProjectGenerationMetricsListenerTests { this.metricsAssert.hasValue(1, "initializr.requests", "initializr.dependency.web", "initializr.dependency.security", "initializr.type.gradle-project", "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); } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java index a0b5628c..945bc78f 100755 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java @@ -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) diff --git a/initializr-generator/src/test/resources/application-test-default.yml b/initializr-generator/src/test/resources/application-test-default.yml index 8dfe20cf..a3daf6ea 100644 --- a/initializr-generator/src/test/resources/application-test-default.yml +++ b/initializr-generator/src/test/resources/application-test-default.yml @@ -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 diff --git a/initializr-generator/src/test/resources/metadata/config/test-min.json b/initializr-generator/src/test/resources/metadata/config/test-min.json index 6990707d..0b6e2d1e 100644 --- a/initializr-generator/src/test/resources/metadata/config/test-min.json +++ b/initializr-generator/src/test/resources/metadata/config/test-min.json @@ -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 } ] diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDependenciesTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDependenciesTests.java index aeff9a9d..7d487eb0 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDependenciesTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerDependenciesTests.java @@ -42,17 +42,17 @@ public class MainControllerDependenciesTests "application/json"); assertThat(response.getHeaders().getFirst(HttpHeaders.ETAG)).isNotNull(); validateContentType(response, CURRENT_METADATA_MEDIA_TYPE); - validateDependenciesOutput("1.1.4", response.getBody()); + validateDependenciesOutput("2.1.4", response.getBody()); } @Test public void filteredDependencies() throws JSONException { ResponseEntity response = execute( - "/dependencies?bootVersion=1.2.1.RELEASE", String.class, null, + "/dependencies?bootVersion=2.2.1.RELEASE", String.class, null, "application/json"); assertThat(response.getHeaders().getFirst(HttpHeaders.ETAG)).isNotNull(); 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) diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerEnvIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerEnvIntegrationTests.java index b3cdd7ed..99473df4 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerEnvIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerEnvIntegrationTests.java @@ -42,7 +42,7 @@ public class MainControllerEnvIntegrationTests ResponseEntity entity = getRestTemplate().getForEntity(createUrl("/spring"), String.class); 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)); } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java index 8264fc63..89428727 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java @@ -67,7 +67,7 @@ public class MainControllerIntegrationTests @Test public void dependencyInRange() { 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) .pomAssert().hasDependenciesCount(2).hasDependency(biz); } @@ -111,7 +111,7 @@ public class MainControllerIntegrationTests @Test 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) .hasProperty("kotlin.version", "1.1"); } @@ -147,7 +147,7 @@ public class MainControllerIntegrationTests ResponseEntity entity = getRestTemplate().getForEntity(createUrl(context), ResponseEntity.class); 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; assertThat(entity.getHeaders().getLocation()).isEqualTo(new URI(expected)); } @@ -399,7 +399,7 @@ public class MainControllerIntegrationTests public void homeHasBootVersion() { String body = htmlHome(); assertThat(body).contains("name=\"bootVersion\""); - assertThat(body).contains("1.2.0.BUILD-SNAPSHOT\""); + assertThat(body).contains("2.2.0.BUILD-SNAPSHOT\""); } @Test diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationPostProcessorTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationPostProcessorTests.java index 6aacce2e..176e7ba6 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationPostProcessorTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationPostProcessorTests.java @@ -36,9 +36,9 @@ public class ProjectGenerationPostProcessorTests @Test 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() - .hasSpringBootParent("1.2.3.RELEASE").hasProperty("java.version", "1.7"); + .hasSpringBootParent("2.2.3.RELEASE").hasProperty("java.version", "1.7"); } @Configuration @@ -64,7 +64,7 @@ public class ProjectGenerationPostProcessorTests public void postProcessBeforeResolution(ProjectRequest request, InitializrMetadata metadata) { request.setJavaVersion("1.2"); - request.setBootVersion("1.2.3.RELEASE"); + request.setBootVersion("2.2.3.RELEASE"); } }; } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java index 3ea0b734..782c4a1f 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java @@ -104,10 +104,10 @@ public class ProjectGenerationSmokeTests @Test public void createSimpleProjectWithDifferentBootVersion() throws Exception { HomePage page = toHome(); - page.bootVersion("1.0.2.RELEASE"); + page.bootVersion("1.5.17.RELEASE"); page.submit(); assertSimpleProject().isMavenProject().pomAssert() - .hasSpringBootParent("1.0.2.RELEASE").hasDependenciesCount(2) + .hasSpringBootParent("1.5.17.RELEASE").hasDependenciesCount(2) .hasSpringBootStarterRootDependency().hasSpringBootStarterTest(); } @@ -140,10 +140,10 @@ public class ProjectGenerationSmokeTests HomePage page = toHome(); selectDependency(page, "Data JPA"); 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(); assertSimpleProject().isMavenProject().pomAssert() - .hasSpringBootParent("1.0.2.RELEASE").hasDependenciesCount(2) + .hasSpringBootParent("1.5.17.RELEASE").hasDependenciesCount(2) .hasSpringBootStarterDependency("data-jpa").hasSpringBootStarterTest(); } @@ -282,13 +282,13 @@ public class ProjectGenerationSmokeTests @Test 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(); 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: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:biz").isEnabled()).isFalse(); page.bootVersion("Latest SNAPSHOT"); @@ -298,13 +298,13 @@ public class ProjectGenerationSmokeTests @Test 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.dependency("org.acme:bur").click(); 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(); - 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").isSelected()).isFalse(); } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java b/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java index 479bd2fd..b4a32f90 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java @@ -37,14 +37,14 @@ public class DefaultDependencyMetadataProviderTests { @Test public void filterDependencies() { 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 third = Dependency.withId("third", "org.foo", "third"); - third.setVersionRange("1.1.8.RELEASE"); + third.setVersionRange("2.1.8.RELEASE"); InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults() .addDependencyGroup("test", first, second, third).build(); 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.getRepositories()).isEmpty(); assertThat(dependencyMetadata.getBoms()).isEmpty(); diff --git a/initializr-web/src/test/resources/metadata/config/test-default.json b/initializr-web/src/test/resources/metadata/config/test-default.json index ed62a702..48d1d921 100644 --- a/initializr-web/src/test/resources/metadata/config/test-default.json +++ b/initializr-web/src/test/resources/metadata/config/test-default.json @@ -10,18 +10,18 @@ "content": [ { "default": false, - "id": "1.2.0.BUILD-SNAPSHOT", + "id": "2.2.0.BUILD-SNAPSHOT", "name": "Latest SNAPSHOT" }, { "default": true, - "id": "1.1.4.RELEASE", - "name": "1.1.4" + "id": "2.1.4.RELEASE", + "name": "2.1.4" }, { "default": false, - "id": "1.0.2.RELEASE", - "name": "1.0.2" + "id": "1.5.17.RELEASE", + "name": "1.5.17" } ], "description": "spring boot version", @@ -40,11 +40,11 @@ "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" } ] @@ -102,14 +102,14 @@ ], "mappings": [ { - "versionRange": "[1.0.0.RELEASE,1.1.6.RELEASE)", + "versionRange": "[2.0.0.RELEASE,2.1.6.RELEASE)", "repositories": [ "my-api-repo-1" ], "version": "1.0.0.RELEASE" }, { - "versionRange": "1.2.1.RELEASE", + "versionRange": "2.2.1.RELEASE", "repositories": [ "my-api-repo-2" ], @@ -219,7 +219,7 @@ "name": "Biz", "scope": "runtime", "version": "1.3.5", - "versionRange": "1.2.0.BUILD-SNAPSHOT" + "versionRange": "2.2.0.BUILD-SNAPSHOT" }, { "starter": true, @@ -229,7 +229,7 @@ "name": "Bur", "scope": "test", "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, diff --git a/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-1.1.4.json b/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.1.4.json similarity index 97% rename from initializr-web/src/test/resources/metadata/dependencies/test-dependencies-1.1.4.json rename to initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.1.4.json index 53880feb..2ca43c79 100644 --- a/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-1.1.4.json +++ b/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.1.4.json @@ -1,5 +1,5 @@ { - "bootVersion": "1.1.4.RELEASE", + "bootVersion": "2.1.4.RELEASE", "repositories": { "my-api-repo-1": { "name": "repo1", diff --git a/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-1.2.1.json b/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.2.1.json similarity index 97% rename from initializr-web/src/test/resources/metadata/dependencies/test-dependencies-1.2.1.json rename to initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.2.1.json index a32f02a0..a254a97d 100644 --- a/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-1.2.1.json +++ b/initializr-web/src/test/resources/metadata/dependencies/test-dependencies-2.2.1.json @@ -1,5 +1,5 @@ { - "bootVersion": "1.2.1.RELEASE", + "bootVersion": "2.2.1.RELEASE", "repositories": { "my-api-repo-2": { "name": "repo2", diff --git a/initializr-web/src/test/resources/metadata/test-default-2.0.0-ssl.json b/initializr-web/src/test/resources/metadata/test-default-2.0.0-ssl.json index a5bf64f8..3f1b431e 100644 --- a/initializr-web/src/test/resources/metadata/test-default-2.0.0-ssl.json +++ b/initializr-web/src/test/resources/metadata/test-default-2.0.0-ssl.json @@ -151,19 +151,19 @@ }, "bootVersion": { "type": "single-select", - "default": "1.1.4.RELEASE", + "default": "2.1.4.RELEASE", "values": [ { - "id": "1.2.0.BUILD-SNAPSHOT", + "id": "2.2.0.BUILD-SNAPSHOT", "name": "Latest SNAPSHOT" }, { - "id": "1.1.4.RELEASE", - "name": "1.1.4" + "id": "2.1.4.RELEASE", + "name": "2.1.4" }, { - "id": "1.0.2.RELEASE", - "name": "1.0.2" + "id": "1.5.17.RELEASE", + "name": "1.5.17" } ] }, diff --git a/initializr-web/src/test/resources/metadata/test-default-2.0.0.json b/initializr-web/src/test/resources/metadata/test-default-2.0.0.json index 26af6748..ed3c0989 100644 --- a/initializr-web/src/test/resources/metadata/test-default-2.0.0.json +++ b/initializr-web/src/test/resources/metadata/test-default-2.0.0.json @@ -151,19 +151,19 @@ }, "bootVersion": { "type": "single-select", - "default": "1.1.4.RELEASE", + "default": "2.1.4.RELEASE", "values": [ { - "id": "1.2.0.BUILD-SNAPSHOT", + "id": "2.2.0.BUILD-SNAPSHOT", "name": "Latest SNAPSHOT" }, { - "id": "1.1.4.RELEASE", - "name": "1.1.4" + "id": "2.1.4.RELEASE", + "name": "2.1.4" }, { - "id": "1.0.2.RELEASE", - "name": "1.0.2" + "id": "1.5.17.RELEASE", + "name": "1.5.17" } ] }, diff --git a/initializr-web/src/test/resources/metadata/test-default-2.1.0-ssl.json b/initializr-web/src/test/resources/metadata/test-default-2.1.0-ssl.json index ff519d44..aaf50df4 100644 --- a/initializr-web/src/test/resources/metadata/test-default-2.1.0-ssl.json +++ b/initializr-web/src/test/resources/metadata/test-default-2.1.0-ssl.json @@ -80,12 +80,12 @@ { "id": "org.acme:biz", "name": "Biz", - "versionRange": "1.2.0.BUILD-SNAPSHOT" + "versionRange": "2.2.0.BUILD-SNAPSHOT" }, { "id": "org.acme: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", @@ -189,19 +189,19 @@ }, "bootVersion": { "type": "single-select", - "default": "1.1.4.RELEASE", + "default": "2.1.4.RELEASE", "values": [ { - "id": "1.2.0.BUILD-SNAPSHOT", + "id": "2.2.0.BUILD-SNAPSHOT", "name": "Latest SNAPSHOT" }, { - "id": "1.1.4.RELEASE", - "name": "1.1.4" + "id": "2.1.4.RELEASE", + "name": "2.1.4" }, { - "id": "1.0.2.RELEASE", - "name": "1.0.2" + "id": "1.5.17.RELEASE", + "name": "1.5.17" } ] }, diff --git a/initializr-web/src/test/resources/metadata/test-default-2.1.0.json b/initializr-web/src/test/resources/metadata/test-default-2.1.0.json index d741012e..7d0abdf0 100644 --- a/initializr-web/src/test/resources/metadata/test-default-2.1.0.json +++ b/initializr-web/src/test/resources/metadata/test-default-2.1.0.json @@ -80,12 +80,12 @@ { "id": "org.acme:biz", "name": "Biz", - "versionRange": "1.2.0.BUILD-SNAPSHOT" + "versionRange": "2.2.0.BUILD-SNAPSHOT" }, { "id": "org.acme: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", @@ -189,19 +189,19 @@ }, "bootVersion": { "type": "single-select", - "default": "1.1.4.RELEASE", + "default": "2.1.4.RELEASE", "values": [ { - "id": "1.2.0.BUILD-SNAPSHOT", + "id": "2.2.0.BUILD-SNAPSHOT", "name": "Latest SNAPSHOT" }, { - "id": "1.1.4.RELEASE", - "name": "1.1.4" + "id": "2.1.4.RELEASE", + "name": "2.1.4" }, { - "id": "1.0.2.RELEASE", - "name": "1.0.2" + "id": "1.5.17.RELEASE", + "name": "1.5.17" } ] },