From 3ef0721fe6c72cb568e80a5d639e5802484376c8 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 13 May 2019 14:17:31 +0200 Subject: [PATCH] Fixed the build --- .../internal/versions/VersionsFetcher.java | 2 +- .../versions/VersionsFetcherTests.java | 27 ++++++++++++++++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/versions/VersionsFetcher.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/versions/VersionsFetcher.java index dbc3acb8..4787a79a 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/versions/VersionsFetcher.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/versions/VersionsFetcher.java @@ -104,7 +104,7 @@ public class VersionsFetcher implements ReleaserPropertiesAware { } catch (Exception ex) { log.error( - "Failed to check the project versions. Will return that the proejct is not GA", + "Failed to check the project versions. Will return that the project is not GA", ex); return false; } diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/versions/VersionsFetcherTests.java b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/versions/VersionsFetcherTests.java index 3fe632f9..70bdb489 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/versions/VersionsFetcherTests.java +++ b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/versions/VersionsFetcherTests.java @@ -17,19 +17,36 @@ package org.springframework.cloud.release.internal.versions; import java.io.File; +import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import java.nio.file.Files; import org.assertj.core.api.BDDAssertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.cloud.release.internal.ReleaserProperties; import org.springframework.cloud.release.internal.pom.ProjectPomUpdater; import org.springframework.cloud.release.internal.pom.ProjectVersion; import org.springframework.cloud.release.internal.pom.Projects; +import org.springframework.cloud.release.internal.pom.TestUtils; +import org.springframework.util.FileSystemUtils; class VersionsFetcherTests { + File temporaryFolder; + + @BeforeEach + void setup() throws IOException, URISyntaxException { + this.temporaryFolder = Files.createTempDirectory("versions-fetcher").toFile(); + this.temporaryFolder.mkdirs(); + File projects = new File(this.temporaryFolder, "projects"); + projects.mkdirs(); + TestUtils.prepareLocalRepo(); + FileSystemUtils.copyRecursively(localFile("/projects"), projects); + } + @Test void should_return_true_when_current_version_is_the_latest_ga() throws URISyntaxException { @@ -40,7 +57,7 @@ class VersionsFetcherTests { ReleaserProperties properties = new ReleaserProperties(); properties.getVersions().setAllVersionsFileUrl(initilizrUri.toString()); properties.getGit().setReleaseTrainBomUrl( - file("/projects/spring-cloud-release/").toURI().toString()); + file("/projects/spring-cloud-release/").toURI().toString() + "/"); ProjectPomUpdater updater = new ProjectPomUpdater(properties); VersionsFetcher versionsFetcher = new VersionsFetcher(properties, updater); @@ -59,7 +76,7 @@ class VersionsFetcherTests { ReleaserProperties properties = new ReleaserProperties(); properties.getVersions().setAllVersionsFileUrl(initilizrUri.toString()); properties.getGit().setReleaseTrainBomUrl( - file("/projects/spring-cloud-release/").toURI().toString()); + file("/projects/spring-cloud-release/").toURI().toString() + "/"); ProjectPomUpdater updater = new ProjectPomUpdater(properties); VersionsFetcher versionsFetcher = new VersionsFetcher(properties, updater); @@ -119,8 +136,12 @@ class VersionsFetcherTests { BDDAssertions.then(latestGa).isFalse(); } - private File file(String relativePath) throws URISyntaxException { + private File localFile(String relativePath) throws URISyntaxException { return new File(VersionsFetcherTests.class.getResource(relativePath).toURI()); } + private File file(String relativePath) { + return new File(this.temporaryFolder, relativePath); + } + }