Fixed mock tests
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/28376236 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/28376236 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/28376236 Branch: refs/heads/arm-fixes Commit: 283762369bedfa88d315bb49869ee3c6eb3853f5 Parents: 9170aa9 Author: Ignasi Barrera <[email protected]> Authored: Wed Apr 6 23:43:57 2016 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Wed Apr 6 23:43:57 2016 +0200 ---------------------------------------------------------------------- .../arm/internal/BaseAzureComputeApiMockTest.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/28376236/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiMockTest.java ---------------------------------------------------------------------- diff --git a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiMockTest.java b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiMockTest.java index ab33ab1..f6dbee3 100644 --- a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiMockTest.java +++ b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/internal/BaseAzureComputeApiMockTest.java @@ -15,7 +15,6 @@ * limitations under the License. */ package org.jclouds.azurecompute.arm.internal; -import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; import static org.jclouds.oauth.v2.config.CredentialType.BEARER_TOKEN_CREDENTIALS; import static org.jclouds.oauth.v2.config.OAuthProperties.CREDENTIAL_TYPE; @@ -60,8 +59,8 @@ public class BaseAzureComputeApiMockTest { server = new MockWebServer(); server.play(); Properties properties = new Properties(); - checkNotNull(setIfTestSystemPropertyPresent(properties, "oauth.endpoint"), "test.oauth.endpoint"); properties.put(CREDENTIAL_TYPE, BEARER_TOKEN_CREDENTIALS.toString()); + properties.put("oauth.endpoint", "https://login.microsoftonline.com/tenant-id/oauth2/token";); AzureComputeProviderMetadata pm = AzureComputeProviderMetadata.builder().build(); api = ContextBuilder.newBuilder(pm) .credentials("", MOCK_BEARER_TOKEN) @@ -128,13 +127,4 @@ public class BaseAzureComputeApiMockTest { assertEquals(parser.parse(new String(request.getBody(), Charsets.UTF_8)), parser.parse(json)); return request; } - - private String setIfTestSystemPropertyPresent(Properties overrides, String key) { - if (System.getProperties().containsKey("test." + key)) { - String val = System.getProperty("test." + key); - overrides.setProperty(key, val); - return val; - } - return null; - } }
