Skip to content

Commit a5f07d6

Browse files
committed
Fix broken platform tests and remove obsolete PlatformSpec.
1 parent 33a4adf commit a5f07d6

File tree

6 files changed

+23
-70
lines changed

6 files changed

+23
-70
lines changed

src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package sdkman.env
33
import groovy.transform.ToString
44
import sdkman.stubs.CurlStub
55
import sdkman.stubs.UnameStub
6+
import sdkman.support.UnixUtils
67

78
@ToString(includeNames = true)
89
class SdkmanBashEnvBuilder {
@@ -19,6 +20,7 @@ class SdkmanBashEnvBuilder {
1920
private Optional<CurlStub> curlStub = Optional.empty()
2021
private Optional<UnameStub> unameStub = Optional.empty()
2122
private List candidates = ['groovy', 'grails', 'java']
23+
private String platform = UnixUtils.inferPlatform()
2224
private boolean offlineMode = false
2325
private String candidatesApi = "http://localhost:8080/2"
2426
private String jdkHome = "/path/to/my/jdk"
@@ -53,6 +55,11 @@ class SdkmanBashEnvBuilder {
5355
this.unameStub = Optional.of(unameStub)
5456
this
5557
}
58+
59+
SdkmanBashEnvBuilder withPlatform(String platform) {
60+
this.platform = platform
61+
this
62+
}
5663

5764
SdkmanBashEnvBuilder withCandidates(List candidates) {
5865
this.candidates = candidates
@@ -116,6 +123,7 @@ class SdkmanBashEnvBuilder {
116123

117124
initializeCandidates(sdkmanCandidatesDir, candidates)
118125
initializeCandidatesCache(sdkmanVarDir, candidates)
126+
initializePlatformDescriptor(sdkmanEtcDir, platform)
119127
initializeConfiguration(sdkmanEtcDir, config)
120128
initializeScriptVersionFile(sdkmanVarDir, scriptVersion)
121129
initializeNativeVersionFile(sdkmanVarDir, nativeVersion)
@@ -172,6 +180,11 @@ class SdkmanBashEnvBuilder {
172180
candidatesCache << ""
173181
}
174182
}
183+
184+
private initializePlatformDescriptor(File folder, String platform) {
185+
def platformDescriptor = new File(folder, "platform")
186+
platformDescriptor << platform
187+
}
175188

176189
private initializeConfiguration(File targetFolder, Map config) {
177190
def configFile = new File(targetFolder, "config")

src/test/groovy/sdkman/specs/CompletionSpec.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class CompletionSpec extends SdkmanEnvSpecification {
4949
bash = sdkmanBashEnvBuilder
5050
.withConfiguration("sdkman_auto_complete", "true")
5151
.withUnameStub(unameStub)
52+
.withPlatform("darwinx64")
5253
.build()
5354

5455
bash.start()

src/test/groovy/sdkman/specs/PlatformSpec.groovy

Lines changed: 0 additions & 62 deletions
This file was deleted.

src/test/groovy/sdkman/stubs/UnameStub.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package sdkman.stubs
33
class UnameStub {
44

55
private File file
6-
private kernel = "Linux"
7-
private machine = "X86_64"
6+
def kernel = "Linux"
7+
def machine = "x86_64"
88

99
static UnameStub prepareIn(File folder) {
1010
folder.mkdirs()

src/test/groovy/sdkman/support/UnixUtils.groovy

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ class UnixUtils {
44

55
private static platforms = [
66
"Linux" : [
7-
"x86_64": "LinuxX64"
7+
"x86_64": "linuxx64",
8+
"aarch64": "linuxarm64",
9+
810
],
911
"Darwin": [
10-
"x86_64": "DarwinX64",
11-
"arm64": "DarwinX64",
12+
"x86_64": "darwinx64",
13+
"arm64": "darwinarm64",
1214
]
1315
]
1416

@@ -23,6 +25,6 @@ class UnixUtils {
2325
static inferPlatform(
2426
String osName = osName(),
2527
String architecture = osArch()) {
26-
(platforms[osName][architecture] ?: osName).toLowerCase()
28+
platforms[osName][architecture] ?: osName.toLowerCase()
2729
}
2830
}

src/test/resources/features/mnemonics.feature

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ Feature: Mnemonics
8181
And the candidate "groovy" version "2.0.5" should be the default
8282

8383
Scenario: Shortcut for displaying Home directory
84-
Given an initialised environment without debug prints
85-
And the candidate "grails" version "2.1.0" is already installed and default
84+
Given the candidate "grails" version "2.1.0" is already installed and default
8685
And the candidate "grails" version "2.1.0" is a valid candidate version
8786
And the system is bootstrapped
8887
When I enter "sdk h grails 2.1.0"

0 commit comments

Comments
 (0)