From e7da3e83729a3a1d2e07327ad086dffceea71273 Mon Sep 17 00:00:00 2001 From: Marco Vermeulen Date: Fri, 20 Nov 2015 13:37:03 +0000 Subject: [PATCH] FIX - Broken tests repaired after SDK bin folder changes. --- src/test/groovy/sdkman/specs/CurrentCommandSpec.groovy | 5 ++++- src/test/groovy/sdkman/specs/SdkCompatibilitySpec.groovy | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/test/groovy/sdkman/specs/CurrentCommandSpec.groovy b/src/test/groovy/sdkman/specs/CurrentCommandSpec.groovy index 20187fe4..3c7d3a29 100644 --- a/src/test/groovy/sdkman/specs/CurrentCommandSpec.groovy +++ b/src/test/groovy/sdkman/specs/CurrentCommandSpec.groovy @@ -54,6 +54,8 @@ class CurrentCommandSpec extends Specification { bash = SdkManBashEnvBuilder .create(sdkmanBaseDir) .withCurlStub(curlStub) + .withOnlineMode(true) + .withForcedOfflineMode(false) .withAvailableCandidates(allCandidates) .withCandidates(installedCandidates.keySet().toList()) .withVersionToken("x.y.z") @@ -82,9 +84,10 @@ class CurrentCommandSpec extends Specification { private prepareFoldersFor(Map installedCandidates) { installedCandidates.forEach { candidate, version -> def candidateVersionDir = "$candidatesDir/$candidate/$version" + def candidateVersionBinDir = "$candidateVersionDir/bin" + new File(candidateVersionBinDir).mkdirs() def candidateVersionPath = Paths.get(candidateVersionDir) def symlink = Paths.get("$candidatesDir/$candidate/current") - new File(candidateVersionDir).mkdirs() createSymbolicLink(symlink, candidateVersionPath) } } diff --git a/src/test/groovy/sdkman/specs/SdkCompatibilitySpec.groovy b/src/test/groovy/sdkman/specs/SdkCompatibilitySpec.groovy index 9060d69e..d7b7c9cd 100644 --- a/src/test/groovy/sdkman/specs/SdkCompatibilitySpec.groovy +++ b/src/test/groovy/sdkman/specs/SdkCompatibilitySpec.groovy @@ -92,4 +92,9 @@ class SdkCompatibilitySpec extends Specification { candidateCurrentDir.toString() } + void cleanup(){ + println bash.output + bash.stop() + assert sdkmanBaseDirectory.deleteDir() + } }