You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2016/04/13 23:51:08 UTC
jclouds-labs git commit: JCLOUDS-664 Update live tests for
Azurecompute-arm LocationApi
Repository: jclouds-labs
Updated Branches:
refs/heads/master 559fdecf8 -> b1752c9a0
JCLOUDS-664 Update live tests for Azurecompute-arm LocationApi
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/b1752c9a
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/b1752c9a
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/b1752c9a
Branch: refs/heads/master
Commit: b1752c9a0b1e6c7ce7726e0a6bd08454c031b03c
Parents: 559fdec
Author: Rita Zhang <ri...@gmail.com>
Authored: Mon Apr 11 17:00:13 2016 -0700
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Apr 13 23:43:22 2016 +0200
----------------------------------------------------------------------
.../org/jclouds/azurecompute/arm/domain/Region.java | 5 ++---
.../azurecompute/arm/features/LocationApi.java | 2 +-
.../arm/features/LocationApiLiveTest.java | 15 +++++++++++++--
3 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b1752c9a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Region.java
----------------------------------------------------------------------
diff --git a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Region.java b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Region.java
index 5c85493..feffa7b 100644
--- a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Region.java
+++ b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/Region.java
@@ -68,14 +68,13 @@ public enum Region {
public static Region byName(final String name) {
Preconditions.checkNotNull(name);
- Region result = null;
for (Region region : values()) {
if (name.equals(region.name)) {
- result = region;
+ return region;
}
}
- return result;
+ return null;
}
public static Set<String> iso3166Codes() {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b1752c9a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocationApi.java
----------------------------------------------------------------------
diff --git a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocationApi.java b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocationApi.java
index 772b3cb..8f31d31 100644
--- a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocationApi.java
+++ b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/features/LocationApi.java
@@ -49,7 +49,7 @@ public interface LocationApi {
/**
* The List Locations operation lists all of the data center locations that are valid for your subscription.
*/
- @Named("ListLocations")
+ @Named("location:list")
@GET
@SelectJson("value")
@Fallback(EmptyListOnNotFoundOr404.class)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b1752c9a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LocationApiLiveTest.java
----------------------------------------------------------------------
diff --git a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LocationApiLiveTest.java b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LocationApiLiveTest.java
index 2c63a70..fbfa88e 100644
--- a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LocationApiLiveTest.java
+++ b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LocationApiLiveTest.java
@@ -20,6 +20,7 @@ import org.jclouds.azurecompute.arm.domain.Location;
import org.jclouds.azurecompute.arm.internal.BaseAzureComputeApiLiveTest;
import org.testng.annotations.Test;
+import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
@Test(groups = "live", testName = "LocationApiLiveTest")
@@ -27,13 +28,23 @@ public class LocationApiLiveTest extends BaseAzureComputeApiLiveTest {
@Test
public void testList() {
+ assertTrue(!api().list().isEmpty());
+
for (Location location : api().list()) {
- assertTrue(!location.id().isEmpty());
+ assertTrue(!location.id().isEmpty());
+ checkLocation(location);
}
- assertTrue(!api().list().isEmpty());
}
private LocationApi api() {
return api.getLocationApi();
}
+
+ private void checkLocation(final Location location) {
+ assertNotNull(location.name(), "Name cannot be null for a Location.");
+ assertNotNull(location.displayName(), "DisplayName cannot be null for: " + location.name());
+ assertNotNull(location.id(), "Id cannot be null for: " + location.name());
+ assertNotNull(location.latitude(), "Latitude cannot be null for: " + location.name());
+ assertNotNull(location.longitude(), "Longitude cannot be null for: " + location.name());
+ }
}