Rename utils package to support.

This commit is contained in:
Marco Vermeulen
2015-12-27 12:39:48 +00:00
parent 78f065975a
commit 65139f129b
11 changed files with 15 additions and 19 deletions

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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"

View File

@@ -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 {

View File

@@ -1,4 +1,4 @@
package sdkman.utils
package sdkman.support
import java.nio.file.FileSystems
import java.nio.file.Files

View File

@@ -1,4 +1,4 @@
package sdkman.utils
package sdkman.support
class UnixUtils {
static getPlatform() {

View File

@@ -1,4 +1,4 @@
package sdkman.utils
package sdkman.support
import com.github.tomakehurst.wiremock.WireMockServer
import com.github.tomakehurst.wiremock.client.WireMock

View File

@@ -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

View File

@@ -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

View File

@@ -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)