From 65139f129b38c06126b4e0620ccba8741caad02e Mon Sep 17 00:00:00 2001 From: Marco Vermeulen Date: Sun, 27 Dec 2015 12:39:48 +0000 Subject: [PATCH] Rename utils package to support. --- src/test/groovy/sdkman/specs/BootstrapSpec.groovy | 2 +- src/test/groovy/sdkman/specs/CurrentCommandSpec.groovy | 2 +- src/test/groovy/sdkman/specs/InitialisationSpec.groovy | 2 +- src/test/groovy/sdkman/specs/InstallSpec.groovy | 4 ++-- src/test/groovy/sdkman/specs/SdkCompatibilitySpec.groovy | 2 +- .../groovy/sdkman/{utils => support}/FilesystemUtils.groovy | 2 +- src/test/groovy/sdkman/{utils => support}/UnixUtils.groovy | 2 +- .../sdkman/{utils => support}/WireMockServerProvider.groovy | 2 +- src/test/steps/sdkman/env.groovy | 6 ++---- src/test/steps/sdkman/installation_steps.groovy | 4 ++-- src/test/steps/sdkman/stub_steps.groovy | 6 ++---- 11 files changed, 15 insertions(+), 19 deletions(-) rename src/test/groovy/sdkman/{utils => support}/FilesystemUtils.groovy (98%) rename src/test/groovy/sdkman/{utils => support}/UnixUtils.groovy (92%) rename src/test/groovy/sdkman/{utils => support}/WireMockServerProvider.groovy (96%) diff --git a/src/test/groovy/sdkman/specs/BootstrapSpec.groovy b/src/test/groovy/sdkman/specs/BootstrapSpec.groovy index 4d395cb5..c5b6cae4 100644 --- a/src/test/groovy/sdkman/specs/BootstrapSpec.groovy +++ b/src/test/groovy/sdkman/specs/BootstrapSpec.groovy @@ -5,7 +5,7 @@ import sdkman.stubs.CurlStub import sdkman.env.SdkManBashEnvBuilder import spock.lang.Specification -import static sdkman.utils.FilesystemUtils.prepareBaseDir +import static sdkman.support.FilesystemUtils.prepareBaseDir class BootstrapSpec extends Specification { diff --git a/src/test/groovy/sdkman/specs/CurrentCommandSpec.groovy b/src/test/groovy/sdkman/specs/CurrentCommandSpec.groovy index 3c7d3a29..95c14656 100644 --- a/src/test/groovy/sdkman/specs/CurrentCommandSpec.groovy +++ b/src/test/groovy/sdkman/specs/CurrentCommandSpec.groovy @@ -8,7 +8,7 @@ import spock.lang.Specification import java.nio.file.Paths import static java.nio.file.Files.createSymbolicLink -import static sdkman.utils.FilesystemUtils.prepareBaseDir +import static sdkman.support.FilesystemUtils.prepareBaseDir class CurrentCommandSpec extends Specification { diff --git a/src/test/groovy/sdkman/specs/InitialisationSpec.groovy b/src/test/groovy/sdkman/specs/InitialisationSpec.groovy index c3b0a769..10fb28af 100644 --- a/src/test/groovy/sdkman/specs/InitialisationSpec.groovy +++ b/src/test/groovy/sdkman/specs/InitialisationSpec.groovy @@ -8,7 +8,7 @@ import spock.lang.Specification import java.nio.file.Files import java.nio.file.Paths -import static sdkman.utils.FilesystemUtils.prepareBaseDir +import static sdkman.support.FilesystemUtils.prepareBaseDir class InitialisationSpec extends Specification { diff --git a/src/test/groovy/sdkman/specs/InstallSpec.groovy b/src/test/groovy/sdkman/specs/InstallSpec.groovy index 7f2a86a4..a7adc4ec 100644 --- a/src/test/groovy/sdkman/specs/InstallSpec.groovy +++ b/src/test/groovy/sdkman/specs/InstallSpec.groovy @@ -5,12 +5,12 @@ import java.nio.file.Paths import com.github.tomakehurst.wiremock.WireMockServer import sdkman.env.BashEnv import sdkman.env.CleanBashEnvBuilder -import sdkman.utils.WireMockServerProvider +import sdkman.support.WireMockServerProvider import spock.lang.Specification import static sdkman.stubs.WebServiceStub.primeEndpointWithBinary import static sdkman.stubs.WebServiceStub.primeEndpointWithString -import static sdkman.utils.FilesystemUtils.prepareBaseDir +import static sdkman.support.FilesystemUtils.prepareBaseDir class InstallSpec extends Specification { final service = "http://localhost:8080" diff --git a/src/test/groovy/sdkman/specs/SdkCompatibilitySpec.groovy b/src/test/groovy/sdkman/specs/SdkCompatibilitySpec.groovy index d7b7c9cd..c1ca75a0 100644 --- a/src/test/groovy/sdkman/specs/SdkCompatibilitySpec.groovy +++ b/src/test/groovy/sdkman/specs/SdkCompatibilitySpec.groovy @@ -7,7 +7,7 @@ import spock.lang.Specification import java.nio.file.Files import java.nio.file.Paths -import static sdkman.utils.FilesystemUtils.prepareBaseDir +import static sdkman.support.FilesystemUtils.prepareBaseDir class SdkCompatibilitySpec extends Specification { diff --git a/src/test/groovy/sdkman/utils/FilesystemUtils.groovy b/src/test/groovy/sdkman/support/FilesystemUtils.groovy similarity index 98% rename from src/test/groovy/sdkman/utils/FilesystemUtils.groovy rename to src/test/groovy/sdkman/support/FilesystemUtils.groovy index 4937fa79..27906ac9 100644 --- a/src/test/groovy/sdkman/utils/FilesystemUtils.groovy +++ b/src/test/groovy/sdkman/support/FilesystemUtils.groovy @@ -1,4 +1,4 @@ -package sdkman.utils +package sdkman.support import java.nio.file.FileSystems import java.nio.file.Files diff --git a/src/test/groovy/sdkman/utils/UnixUtils.groovy b/src/test/groovy/sdkman/support/UnixUtils.groovy similarity index 92% rename from src/test/groovy/sdkman/utils/UnixUtils.groovy rename to src/test/groovy/sdkman/support/UnixUtils.groovy index 5d1394ed..d61eef6e 100644 --- a/src/test/groovy/sdkman/utils/UnixUtils.groovy +++ b/src/test/groovy/sdkman/support/UnixUtils.groovy @@ -1,4 +1,4 @@ -package sdkman.utils +package sdkman.support class UnixUtils { static getPlatform() { diff --git a/src/test/groovy/sdkman/utils/WireMockServerProvider.groovy b/src/test/groovy/sdkman/support/WireMockServerProvider.groovy similarity index 96% rename from src/test/groovy/sdkman/utils/WireMockServerProvider.groovy rename to src/test/groovy/sdkman/support/WireMockServerProvider.groovy index 93ee7814..796bf0cd 100644 --- a/src/test/groovy/sdkman/utils/WireMockServerProvider.groovy +++ b/src/test/groovy/sdkman/support/WireMockServerProvider.groovy @@ -1,4 +1,4 @@ -package sdkman.utils +package sdkman.support import com.github.tomakehurst.wiremock.WireMockServer import com.github.tomakehurst.wiremock.client.WireMock diff --git a/src/test/steps/sdkman/env.groovy b/src/test/steps/sdkman/env.groovy index 6e6f527f..eeb01097 100644 --- a/src/test/steps/sdkman/env.groovy +++ b/src/test/steps/sdkman/env.groovy @@ -1,11 +1,9 @@ package sdkman -import com.github.tomakehurst.wiremock.WireMockServer import com.github.tomakehurst.wiremock.client.WireMock -import sdkman.utils.UnixUtils -import sdkman.utils.WireMockServerProvider +import sdkman.support.UnixUtils +import sdkman.support.WireMockServerProvider -import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig import static cucumber.api.groovy.Hooks.After import static cucumber.api.groovy.Hooks.Before diff --git a/src/test/steps/sdkman/installation_steps.groovy b/src/test/steps/sdkman/installation_steps.groovy index 2b6e780c..b33f83d1 100644 --- a/src/test/steps/sdkman/installation_steps.groovy +++ b/src/test/steps/sdkman/installation_steps.groovy @@ -4,8 +4,8 @@ import java.nio.file.FileSystems import java.nio.file.Files import static cucumber.api.groovy.EN.And -import static sdkman.utils.FilesystemUtils.prepareCandidateWithVersionFolder -import static sdkman.utils.FilesystemUtils.prepareLocalCandidateWithVersionFolder +import static sdkman.support.FilesystemUtils.prepareCandidateWithVersionFolder +import static sdkman.support.FilesystemUtils.prepareLocalCandidateWithVersionFolder And(~'^the candidate "([^"]*)" version "([^"]*)" is installed$') { String candidate, String version -> def file = "${candidatesDir}/${candidate}/${version}" as File diff --git a/src/test/steps/sdkman/stub_steps.groovy b/src/test/steps/sdkman/stub_steps.groovy index 3229f207..95166aa4 100644 --- a/src/test/steps/sdkman/stub_steps.groovy +++ b/src/test/steps/sdkman/stub_steps.groovy @@ -1,9 +1,7 @@ -import cucumber.api.DataTable - import static cucumber.api.groovy.EN.And import static sdkman.stubs.WebServiceStub.* -import static sdkman.utils.FilesystemUtils.readCurrentFromCandidateFolder -import static sdkman.utils.FilesystemUtils.readVersionsCsvFromCandidateFolder +import static sdkman.support.FilesystemUtils.readCurrentFromCandidateFolder +import static sdkman.support.FilesystemUtils.readVersionsCsvFromCandidateFolder And(~'^the default "([^"]*)" candidate is "([^"]*)"$') { String candidate, String version -> primeEndpointWithString("/candidates/${candidate}/default", version)