mirror/sdkman-cli
1
0
Fork 0
mirror of https://github.com/sdkman/sdkman-cli.git synced 2026-04-23 16:43:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve naming around UnitUtils.

Browse Source
This commit is contained in:
Marco Vermeulen
2021-03-31 11:10:23 +01:00
committed by Marco Vermeulen
parent 444e84a952
commit ca918e7b0f
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/test/groovy/sdkman/steps/stub_steps.groovy
View File

@@ -11,9 +11,9 @@ import static sdkman.support.FilesystemUtils.readVersionsCsvFromCandidateFolder
And(~'^the default "([^"]*)" version is "([^"]*)"$') { String candidate, String version ->
primeEndpointWithString("/candidates/default/${candidate}", version)
primeDownloadFor(SERVICE_UP_URL, candidate, version, UnixUtils.asSdkmanPlatform())
primeEndpointWithString("/hooks/pre/${candidate}/${version}/${UnixUtils.asSdkmanPlatform()}", preInstallationHookSuccess())
primeEndpointWithString("/hooks/post/${candidate}/${version}/${UnixUtils.asSdkmanPlatform()}", postInstallationHookSuccess())
primeDownloadFor(SERVICE_UP_URL, candidate, version, UnixUtils.inferPlatform())
primeEndpointWithString("/hooks/pre/${candidate}/${version}/${UnixUtils.inferPlatform()}", preInstallationHookSuccess())
primeEndpointWithString("/hooks/post/${candidate}/${version}/${UnixUtils.inferPlatform()}", postInstallationHookSuccess())
}
And(~'^an available selfupdate$') { ->
@@ -21,67 +21,67 @@ And(~'^an available selfupdate$') { ->
}
And(~'^the candidate "([^"]*)" version "([^"]*)" is available for download$') { String candidate, String version ->
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${UnixUtils.asSdkmanPlatform()}", "valid")
primeDownloadFor(SERVICE_UP_URL, candidate, version, UnixUtils.asSdkmanPlatform())
primeEndpointWithString("/hooks/pre/${candidate}/${version}/${UnixUtils.asSdkmanPlatform()}", preInstallationHookSuccess())
primeEndpointWithString("/hooks/post/${candidate}/${version}/${UnixUtils.asSdkmanPlatform()}", postInstallationHookSuccess())
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${UnixUtils.inferPlatform()}", "valid")
primeDownloadFor(SERVICE_UP_URL, candidate, version, UnixUtils.inferPlatform())
primeEndpointWithString("/hooks/pre/${candidate}/${version}/${UnixUtils.inferPlatform()}", preInstallationHookSuccess())
primeEndpointWithString("/hooks/post/${candidate}/${version}/${UnixUtils.inferPlatform()}", postInstallationHookSuccess())
}
And(~/^the appropriate universal hooks are available for "([^"]*)" version "([^"]*)" on "([^"]*)"$/) { String candidate, String version, String platform ->
String lcPlatform = UnixUtils.asSdkmanPlatform(platform)
And(~/^the appropriate universal hooks are available for "([^"]*)" version "([^"]*)" on "([^"]*)"$/) { String candidate, String version, String os ->
String lcPlatform = UnixUtils.inferPlatform(os)
primeUniversalHookFor("pre", candidate, version, lcPlatform)
primeUniversalHookFor("post", candidate, version, lcPlatform)
}
And(~/^the appropriate multi-platform hooks are available for "([^"]*)" version "([^"]*)" on "([^"]*)" with architecture "(.*)"$/) { String candidate, String version, String platform, String architecture ->
String lcPlatform = UnixUtils.asSdkmanPlatform(platform, architecture)
And(~/^the appropriate multi-platform hooks are available for "([^"]*)" version "([^"]*)" on "([^"]*)" with architecture "(.*)"$/) { String candidate, String version, String os, String architecture ->
String lcPlatform = UnixUtils.inferPlatform(os, architecture)
primePlatformSpecificHookFor("pre", candidate, version, lcPlatform)
primePlatformSpecificHookFor("post", candidate, version, lcPlatform)
}
And(~'^the candidate "([^"]*)" version "([^"]*)" is not available for download$') { String candidate, String version ->
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${UnixUtils.asSdkmanPlatform()}", "invalid")
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${UnixUtils.inferPlatform()}", "invalid")
}
And(~/^the candidate "(.*)" version "(.*)" is available for download on "(.*)" with architecture "(.*)"$/) { String candidate, String version, String platform, String architecture ->
String lcPlatform = UnixUtils.asSdkmanPlatform(platform, architecture)
And(~/^the candidate "(.*)" version "(.*)" is available for download on "(.*)" with architecture "(.*)"$/) { String candidate, String version, String os, String architecture ->
String lcPlatform = UnixUtils.inferPlatform(os, architecture)
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${lcPlatform}", "valid")
primeDownloadFor(SERVICE_UP_URL, candidate, version, lcPlatform)
}
And(~/^a "([^"]*)" install hook is served for "([^"]*)" "([^"]*)" on "([^"]*)" with architecture "([^"]*)" that returns successfully$/) { String phase, String candidate, String version, String platform, String architecture ->
String lcPlatform = UnixUtils.asSdkmanPlatform(platform, architecture)
And(~/^a "([^"]*)" install hook is served for "([^"]*)" "([^"]*)" on "([^"]*)" with architecture "([^"]*)" that returns successfully$/) { String phase, String candidate, String version, String os, String architecture ->
String lcPlatform = UnixUtils.inferPlatform(os, architecture)
primeEndpointWithString("/hooks/${phase}/${candidate}/${version}/${lcPlatform}", phase == "pre" ? preInstallationHookSuccess() : postInstallationHookSuccess())
}
And(~/^a "([^"]*)" install hook is served for "([^"]*)" "([^"]*)" on "([^"]*)" with architecture "([^"]*)" that returns a failure$/) { String phase, String candidate, String version, String platform, String architecture ->
String lcPlatform = UnixUtils.asSdkmanPlatform(platform, architecture)
And(~/^a "([^"]*)" install hook is served for "([^"]*)" "([^"]*)" on "([^"]*)" with architecture "([^"]*)" that returns a failure$/) { String phase, String candidate, String version, String os, String architecture ->
String lcPlatform = UnixUtils.inferPlatform(os, architecture)
primeEndpointWithString("/hooks/${phase}/${candidate}/${version}/${lcPlatform}", phase == "pre" ? preInstallationHookFailure() : postInstallationHookFailure())
}
And(~/^the candidate "(.*?)" version "(.*?)" is not available for download on "(.*?)"$/) { String candidate, String version, String platform ->
String lcPlatform = UnixUtils.asSdkmanPlatform(platform)
And(~/^the candidate "(.*?)" version "(.*?)" is not available for download on "(.*?)"$/) { String candidate, String version, String os ->
String lcPlatform = UnixUtils.inferPlatform(os)
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${lcPlatform}", "invalid")
}
And(~'^a "([^"]*)" list view is available for consumption$') { String candidate ->
primeEndpointWithString("/candidates/${candidate}/${UnixUtils.asSdkmanPlatform()}/versions/list?current=&installed=", "Available ${candidate.capitalize()} Versions")
primeEndpointWithString("/candidates/${candidate}/${UnixUtils.inferPlatform()}/versions/list?current=&installed=", "Available ${candidate.capitalize()} Versions")
}
And(~'^the candidate "([^"]*)" version "([^"]*)" is a valid candidate version$') { String candidate, String version ->
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${UnixUtils.asSdkmanPlatform()}", "valid")
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${UnixUtils.inferPlatform()}", "valid")
}
And(~'^the candidate "([^"]*)" version "([^"]*)" is not a valid candidate version$') { String candidate, String version ->
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${UnixUtils.asSdkmanPlatform()}", "invalid")
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${UnixUtils.inferPlatform()}", "invalid")
}
And(~/^the candidate "(.*?)" has a version list available$/) { String candidate ->
def current = readCurrentFromCandidateFolder(candidatesDir, candidate)
def versions = readVersionsCsvFromCandidateFolder(candidatesDir, candidate)
def url = "/candidates/${candidate}/${UnixUtils.asSdkmanPlatform()}/versions/list?current=${current}&installed=${versions}"
def url = "/candidates/${candidate}/${UnixUtils.inferPlatform()}/versions/list?current=${current}&installed=${versions}"
println("Priming url: $url")
primeEndpointWithString(url, "Candidate: $candidate; Versions: $versions; Current: $current; Platform: ${UnixUtils.asSdkmanPlatform()}")
primeEndpointWithString(url, "Candidate: $candidate; Versions: $versions; Current: $current; Platform: ${UnixUtils.inferPlatform()}")
}
And(~/^The candidate list is available$/) { ->

6
src/test/groovy/sdkman/support/UnixUtils.groovy
View File

@@ -11,9 +11,9 @@ class UnixUtils {
]
]
static asSdkmanPlatform(
platform = System.getProperty("os.name"),
static inferPlatform(
osName = System.getProperty("os.name"),
architecture = System.getProperty("os.arch")) {
(platforms[platform][architecture] ?: platform).toLowerCase()
(platforms[osName][architecture] ?: osName).toLowerCase()
}
}