Add test for .sdkmanrc generation

Author: Oliver Weiler

src/main/bash/sdkman-env.sh

@@ -16,18 +16,17 @@
 #   limitations under the License.
 #
 
-readonly sdkmanrc=".sdkmanrc"
-readonly java_fallback_version="11.0.7.hs-adpt"
-
 function __sdk_env() {
+	SDKMANRC=".sdkmanrc"
+
 	if [[ "$1" == "init" ]]; then
 		__sdkman_generate_sdkmanrc
 
 		return 0
 	fi
 
-	if [[ ! -f "$sdkmanrc" ]]; then
-		__sdkman_echo_red "Could not find $sdkmanrc in the current directory."
+	if [[ ! -f "$SDKMANRC" ]]; then
+		__sdkman_echo_red "Could not find $SDKMANRC in the current directory."
 		echo ""
 		__sdkman_echo_yellow "Run 'sdk env init' to create it."
 
@@ -36,7 +35,7 @@ function __sdk_env() {
 
 	while IFS= read -r line || [[ -n "$line" ]]; do
 		local normalised_line
-		normalised_line=$(__sdkman_normalise "$line")
+		normalised_line="$(__sdkman_normalise "$line")"
 
 		__sdkman_is_blank_line "$normalised_line" && continue
 
@@ -49,21 +48,24 @@ function __sdk_env() {
 		fi
 
 		__sdk_use "${normalised_line%=*}" "${normalised_line#*=}"
-	done < "$sdkmanrc"
+	done < "$SDKMANRC"
 }
 
 function __sdkman_generate_sdkmanrc() {
-	if [[ -f "$sdkmanrc" ]]; then
-		__sdkman_echo_red "$sdkmanrc already exists!"
+	if [[ -f "$SDKMANRC" ]]; then
+		__sdkman_echo_red "$SDKMANRC already exists!"
 
 		return 1
 	fi
 
 	__sdkman_determine_current_version "java"
 
-	echo "java=${CURRENT:-${java_fallback_version}}" > "$sdkmanrc"
+	local version
+	[[ -n "$CURRENT" ]] && version="$CURRENT" || version="$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/candidates/default/java")"
+
+	echo "java=$version" > "$SDKMANRC"
 
-	__sdkman_echo_green "$sdkmanrc created."
+	__sdkman_echo_green "$SDKMANRC created."
 }
 
 function __sdkman_is_blank_line() {

src/main/bash/sdkman-upgrade.sh

@@ -103,7 +103,7 @@ function __sdkman_determine_upgradable_version() {
 	fi
 
 	# Resolve remote default version
-	remote_default_version="$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/candidates/default/${candidate}")"
+	remote_default_version=x
 	if [ -z "$remote_default_version" ]; then
 		return 2
 	fi

src/test/groovy/sdkman/specs/EnvCommandSpec.groovy

@@ -3,21 +3,28 @@ package sdkman.specs
 import sdkman.support.SdkmanEnvSpecification
 
 class EnvCommandSpec extends SdkmanEnvSpecification {
+	static final String CANDIDATES_API = "http://localhost:8080/2"
+
+	static final String BROADCAST_API_LATEST_ID_ENDPOINT = "$CANDIDATES_API/broadcast/latest/id"
+	static final String CANDIDATES_DEFAULT_JAVA = "$CANDIDATES_API/candidates/default/java"
+
+	def "should generate an .sdkmanrc when called with 'init'"() {
+		given:
+		curlStub.primeWith(BROADCAST_API_LATEST_ID_ENDPOINT, "echo dbfb025be9f97fda2052b5febcca0155")
+				.primeWith(CANDIDATES_DEFAULT_JAVA, "echo 11.0.6.hs-adpt")
 
-	def setup() {
 		bash = sdkmanBashEnvBuilder
-				.withVersionCache("x.y.z")
-				.withOfflineMode(true)
-				.build()
+			.withVersionCache("x.y.z")
+			.build()
+
 		bash.start()
 		bash.execute("source $bootstrapScript")
-	}
 
-	def "should generate an .sdkmanrc when called with 'init'"() {
 		when:
 		bash.execute("sdk env init")
+
 		then:
-		new File(bash.workDir,'.sdkmanrc').text == "java=11.0.7.hs-adpt\n"
+		new File(bash.workDir, '.sdkmanrc').text == "java=11.0.6.hs-adpt\n"
 	}
 
 	def "should use the candidates contained in .sdkmanrc"() {
@@ -31,8 +38,16 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 			}
 		}
 
-		new File(bash.workDir, '.sdkmanrc').text = sdkrc
+		bash = sdkmanBashEnvBuilder
+			.withVersionCache("x.y.z")
+			.withOfflineMode(true)
+			.build()
 
+		new File(bash.workDir, '.sdkmanrc').text = sdkmanrc
+
+		bash.start()
+		bash.execute("source $bootstrapScript")
+		
 		when:
 		bash.execute("sdk env")
 
@@ -43,7 +58,7 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 		}
 
 		where:
-		sdkrc << [
+		sdkmanrc << [
 			"grails=2.1.0\ngroovy=2.4.1",
 			"grails=2.1.0\ngroovy=2.4.1\n",
 			"  grails=2.1.0\ngroovy=2.4.1\n",
@@ -52,10 +67,18 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 		]
 	}
 
-	def "should issue an error if .sdkmanrc contains malformed candidate versions"() {
+	def "should issue an error if .sdkmanrc contains a malformed candidate version"() {
 		given:
+		bash = sdkmanBashEnvBuilder
+			.withVersionCache("x.y.z")
+			.withOfflineMode(true)
+			.build()
+
 		new File(bash.workDir, ".sdkmanrc").text = "groovy 2.4.1"
 
+		bash.start()
+		bash.execute("source $bootstrapScript")
+
 		when:
 		bash.execute("sdk env")
 
@@ -74,7 +97,15 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 			}
 		}
 
-		new File(bash.workDir, ".sdkmanrc").text = sdkrc
+		bash = sdkmanBashEnvBuilder
+			.withVersionCache("x.y.z")
+			.withOfflineMode(true)
+			.build()
+
+		new File(bash.workDir, ".sdkmanrc").text = sdkmanrc
+
+		bash.start()
+		bash.execute("source $bootstrapScript")
 
 		when:
 		bash.execute("sdk env")
@@ -83,7 +114,7 @@ class EnvCommandSpec extends SdkmanEnvSpecification {
 		bash.output.contains("Using groovy version 2.4.1 in this shell.")
 
 		where:
-		sdkrc << [
+		sdkmanrc << [
 			"\ngroovy=2.4.1\n",
 			"# this is a comment\ngroovy=2.4.1\n",
 			"groovy=2.4.1 # this is a comment too\n"