From fabeda3efd5f9e6ee338b58d2842bcfdddbd7e1b Mon Sep 17 00:00:00 2001 From: Marco Vermeulen Date: Wed, 16 Nov 2016 09:11:21 +0000 Subject: [PATCH] Better differentiation between legacy and current apis in tests. --- config.groovy | 4 ++-- src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy | 4 ++-- src/test/groovy/sdkman/specs/BetaChannelBootstrapSpec.groovy | 2 +- .../groovy/sdkman/specs/CandidatesCacheBootstrapSpec.groovy | 4 ++-- src/test/groovy/sdkman/specs/VersionFileBootstrapSpec.groovy | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config.groovy b/config.groovy index 5f8c87fc..774a0ce0 100644 --- a/config.groovy +++ b/config.groovy @@ -1,8 +1,8 @@ sdkmanCliVersion = '5.0.0-SNAPSHOT' environments { local { - sdkmanLegacyApi = 'http://localhost:8080' - sdkmanCurrentApi = 'http://localhost:8080' + sdkmanLegacyApi = 'http://localhost:8080/1' + sdkmanCurrentApi = 'http://localhost:8080/2' } production { sdkmanLegacyApi = 'https://api.sdkman.io/1' diff --git a/src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy b/src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy index 993a90bd..06fb1ed5 100644 --- a/src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy +++ b/src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy @@ -15,8 +15,8 @@ class SdkmanBashEnvBuilder { private List availableCandidates = candidates private boolean offlineMode = false private String broadcast = "This is a LIVE broadcast!" - private String legacyService = "http://localhost:8080" - private String currentService = "http://localhost:8080" + private String legacyService = "http://localhost:8080/1" + private String currentService = "http://localhost:8080/2" private String sdkmanVersion = "5.0.0" private String jdkHome = "/path/to/my/jdk" private String httpProxy diff --git a/src/test/groovy/sdkman/specs/BetaChannelBootstrapSpec.groovy b/src/test/groovy/sdkman/specs/BetaChannelBootstrapSpec.groovy index 9f5dfbab..a9cf9cfd 100644 --- a/src/test/groovy/sdkman/specs/BetaChannelBootstrapSpec.groovy +++ b/src/test/groovy/sdkman/specs/BetaChannelBootstrapSpec.groovy @@ -5,7 +5,7 @@ import sdkman.support.SdkmanEnvSpecification class BetaChannelBootstrapSpec extends SdkmanEnvSpecification { static final TWO_DAYS_AGO = System.currentTimeMillis() - (48 * 60 * 60 * 1000) - static final LEGACY_API = "http://localhost:8080" + static final LEGACY_API = "http://localhost:8080/1" static final CLI_STABLE_ENDPOINT = "$LEGACY_API/candidates/app/stable" static final CLI_BETA_ENDPOINT = "$LEGACY_API/candidates/app/beta" diff --git a/src/test/groovy/sdkman/specs/CandidatesCacheBootstrapSpec.groovy b/src/test/groovy/sdkman/specs/CandidatesCacheBootstrapSpec.groovy index b93ac1b5..3118cebf 100644 --- a/src/test/groovy/sdkman/specs/CandidatesCacheBootstrapSpec.groovy +++ b/src/test/groovy/sdkman/specs/CandidatesCacheBootstrapSpec.groovy @@ -6,10 +6,10 @@ class CandidatesCacheBootstrapSpec extends SdkmanEnvSpecification { static final TWO_DAYS_IN_MILLIS = 24 * 61 * 60 * 1000 - static final LEGACY_API = "http://localhost:8080" + static final LEGACY_API = "http://localhost:8080/1" static final LEGACY_CANDIDATES_ENDPOINT = "$LEGACY_API/candidates" - static final CURRENT_API = "http://localhost:8080" + static final CURRENT_API = "http://localhost:8080/2" static final CURRENT_CANDIDATES_ENDPOINT = "$CURRENT_API/candidates/all" File candidatesFile diff --git a/src/test/groovy/sdkman/specs/VersionFileBootstrapSpec.groovy b/src/test/groovy/sdkman/specs/VersionFileBootstrapSpec.groovy index ba812e97..4ae06dd0 100644 --- a/src/test/groovy/sdkman/specs/VersionFileBootstrapSpec.groovy +++ b/src/test/groovy/sdkman/specs/VersionFileBootstrapSpec.groovy @@ -4,7 +4,7 @@ import sdkman.support.SdkmanEnvSpecification class VersionFileBootstrapSpec extends SdkmanEnvSpecification { - static final LEGACY_API = "http://localhost:8080" + static final LEGACY_API = "http://localhost:8080/1" static final CLI_VERSION_ENDPOINT = "$LEGACY_API/candidates/app/stable" File versionFile