http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d147afdc/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapListTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapListTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapListTest.java index 73dd7ec..5c7f945 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapListTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapListTest.java @@ -22,13 +22,13 @@ import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; -import org.jclouds.googlecomputeengine.domain.ListPage; -import org.jclouds.googlecomputeengine.domain.Resource; +import org.jclouds.googlecloud.domain.ForwardingListPage; +import org.jclouds.googlecloud.domain.ListPage; import org.jclouds.googlecomputeengine.domain.UrlMap; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; import org.testng.annotations.Test; -import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableList; @Test(groups = "unit") public class ParseUrlMapListTest extends BaseGoogleComputeEngineParseTest<ListPage<UrlMap>> { @@ -41,21 +41,20 @@ public class ParseUrlMapListTest extends BaseGoogleComputeEngineParseTest<ListPa @Override @Consumes(MediaType.APPLICATION_JSON) public ListPage<UrlMap> expected() { - return ListPage.<UrlMap>builder() - .kind(Resource.Kind.URL_MAP_LIST) - .id("projects/myproject/global/urlMaps") - .selfLink(URI.create("https://www.googleapis.com/compute/v1/projects/myproject/global/urlMaps";)) - .items(ImmutableSet.of(new ParseUrlMapTest().expected(), - UrlMap.builder() - .id("13741966667737398120") - .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2014-07-23T12:39:50.022-07:00")) - .selfLink(URI.create("https://www.googleapis"; + - ".com/compute/v1/projects/myproject/global/urlMaps/jclouds-test-2")) - .name("jclouds-test-2") - .description("Basic url map") - .defaultService(URI.create("https://www.googleapis.com/compute/v1/projects/myproject/global/backendServices/jclouds-test";)) - .fingerprint("EDqhvJucpz4=") - .build())) - .build(); + return ForwardingListPage.create( + ImmutableList.of(new ParseUrlMapTest().expected(), + UrlMap.create("13741966667737398120", // id + new SimpleDateFormatDateService().iso8601DateParse("2014-07-23T12:39:50.022-07:00"), // creationTimestamp + URI.create("https://www.googleapis"; + + ".com/compute/v1/projects/myproject/global/urlMaps/jclouds-test-2"), // selfLink + "jclouds-test-2", // name + "Basic url map", // description + null, // hostRules + null, // pathMatchers + null, // urlMapTests + URI.create("https://www.googleapis.com/compute/v1/projects/"; + + "myproject/global/backendServices/jclouds-test"), // defaultService + "EDqhvJucpz4=")), // fingerprint + null); } }
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d147afdc/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapTest.java index ffeccb8..e29b8dd 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapTest.java @@ -17,19 +17,21 @@ package org.jclouds.googlecomputeengine.parse; import java.net.URI; +import java.util.List; import javax.ws.rs.Consumes; import javax.ws.rs.core.MediaType; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.googlecomputeengine.domain.UrlMap; +import org.jclouds.googlecomputeengine.domain.UrlMap.UrlMapTest; import org.jclouds.googlecomputeengine.domain.UrlMap.HostRule; import org.jclouds.googlecomputeengine.domain.UrlMap.PathMatcher; -import org.jclouds.googlecomputeengine.domain.UrlMap.PathRule; +import org.jclouds.googlecomputeengine.domain.UrlMap.PathMatcher.PathRule; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; import org.testng.annotations.Test; -import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableList; @Test(groups = "unit") public class ParseUrlMapTest extends BaseGoogleComputeEngineParseTest<UrlMap> { @@ -43,25 +45,32 @@ public class ParseUrlMapTest extends BaseGoogleComputeEngineParseTest<UrlMap> { @Consumes(MediaType.APPLICATION_JSON) public UrlMap expected() { URI service = URI.create("https://www.googleapis.com/compute/v1/projects/myproject/global/backendServices/jclouds-test";); - return UrlMap.builder() - .id("13741966667737398119") - .creationTimestamp(new SimpleDateFormatDateService().iso8601DateParse("2014-07-23T12:39:50.022-07:00")) - .selfLink(URI.create("https://www.googleapis.com/compute/v1/projects/myproject/global/urlMaps/jclouds-test";)) - .name("jclouds-test") - .description("Sample url map") - .hostRules(ImmutableSet.<HostRule>of(HostRule.builder().hosts(ImmutableSet.<String>of("jclouds-test")).pathMatcher("path").build())) - .pathMatchers(ImmutableSet.<PathMatcher>of(PathMatcher.builder().name("path") - .defaultService(service) - .pathRules(ImmutableSet.<PathRule>of(PathRule.builder().service(service) - .addPath("/") - .build())) - .build())) - .urlMapTests(ImmutableSet.<UrlMap.UrlMapTest>of(UrlMap.UrlMapTest.builder().host("jclouds-test") - .path("/test/path") - .service(service) - .build())) - .defaultService(service) - .fingerprint("EDmhvJucpz4=") - .build(); + + List<HostRule> hostRules = ImmutableList.of(HostRule.create(null, // description + ImmutableList.of("jclouds-test"), // hosts + "path")); // pathMatcher + + List<PathMatcher> pathMatchers = ImmutableList.of(PathMatcher.create("path", // name + null, // description + service, // defaultService + ImmutableList.of(PathRule.create(ImmutableList.of("/"), // paths + service // service + )))); // pathRules + + List<UrlMapTest> urlMapTests = ImmutableList.of(UrlMapTest.create(null, // description + "jclouds-test", // host + "/test/path", // path + service)); // service + + return UrlMap.create("13741966667737398119", // id + new SimpleDateFormatDateService().iso8601DateParse("2014-07-23T12:39:50.022-07:00"), // creationTimestamp + URI.create("https://www.googleapis.com/compute/v1/projects/myproject/global/urlMaps/jclouds-test";), // selfLink + "jclouds-test", // name + "Sample url map", // description + hostRules, // hostRules + pathMatchers, // pathMatchers + urlMapTests, // urlMapTests + service, // defaultService + "EDmhvJucpz4="); // fingerprint } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d147afdc/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapValidateTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapValidateTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapValidateTest.java index 953f448..20380c0 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapValidateTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseUrlMapValidateTest.java @@ -17,15 +17,17 @@ package org.jclouds.googlecomputeengine.parse; import java.net.URI; +import static javax.ws.rs.core.MediaType.APPLICATION_JSON; import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; import org.jclouds.googlecomputeengine.domain.UrlMapValidateResult; -import org.jclouds.googlecomputeengine.domain.UrlMapValidateResult.TestFailure; +import org.jclouds.googlecomputeengine.domain.UrlMapValidateResult.UrlMapValidateResultInternal.TestFailure; import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineParseTest; import org.testng.annotations.Test; +import com.google.common.collect.ImmutableList; + @Test(groups = "unit") public class ParseUrlMapValidateTest extends BaseGoogleComputeEngineParseTest<UrlMapValidateResult> { @@ -35,17 +37,15 @@ public class ParseUrlMapValidateTest extends BaseGoogleComputeEngineParseTest<Ur } @Override - @Consumes(MediaType.APPLICATION_JSON) + @Consumes(APPLICATION_JSON) public UrlMapValidateResult expected() { - return UrlMapValidateResult.builder() - .loadSucceeded(false) - .addLoadError("jclouds-test") - .testPassed(false) - .addTestFailure(TestFailure.builder().host("jclouds-test") - .path("/test/path") - .expectedService(URI.create("https://www.googleapis.com/compute/v1/projects/myproject/global/backendServices/jclouds-test";)) - .actualService(URI.create("https://www.googleapis.com/compute/v1/projects/myproject/global/backendServices/jclouds-test-2";)) - .build()) - .build(); + return UrlMapValidateResult.create(false, // loadSucceded + ImmutableList.of("jclouds-test"), // loadError + false, // testPassed + ImmutableList.of(TestFailure.create("jclouds-test", // host + "/test/path", // path + URI.create("https://www.googleapis.com/compute/v1/projects/myproject/global/backendServices/jclouds-test";), // expectedService + URI.create("https://www.googleapis.com/compute/v1/projects/myproject/global/backendServices/jclouds-test-2";) //actualService + ))); //testFailures) } } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d147afdc/google-compute-engine/src/test/resources/backend_service_get_health.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/backend_service_get_health.json b/google-compute-engine/src/test/resources/backend_service_get_health.json index 7548971..7e01eed 100644 --- a/google-compute-engine/src/test/resources/backend_service_get_health.json +++ b/google-compute-engine/src/test/resources/backend_service_get_health.json @@ -2,6 +2,7 @@ "kind": "compute#backendServiceGroupHealth", "healthStatus": [ { + "port": 80, "instance": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/jclouds-test";, "healthState": "HEALTHY" } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d147afdc/google-compute-engine/src/test/resources/resource_view_get_region.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/resource_view_get_region.json b/google-compute-engine/src/test/resources/resource_view_get_region.json deleted file mode 100644 index 264a26a..0000000 --- a/google-compute-engine/src/test/resources/resource_view_get_region.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "kind": "compute#resourceView", - "id": "13050421646334304115", - "creationTime": "2012-11-25T01:38:48.306", - "selfLink": "https://www.googleapis.com/resourceviews/v1beta1/projects/myproject/regions/us-central1/resourceViews/jclouds-test";, - "name": "jclouds-test", - "description": "Simple resource view", - "numMembers": 0 -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d147afdc/google-compute-engine/src/test/resources/resource_view_get_zone.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/resource_view_get_zone.json b/google-compute-engine/src/test/resources/resource_view_get_zone.json deleted file mode 100644 index 97f384d..0000000 --- a/google-compute-engine/src/test/resources/resource_view_get_zone.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "kind": "compute#resourceView", - "id": "13050421646334304115", - "creationTime": "2012-11-25T01:38:48.306", - "selfLink": "https://www.googleapis.com/resourceviews/v1beta1/projects/myproject/zones/us-central1-a/resourceViews/jclouds-test";, - "name": "jclouds-test", - "description": "Simple resource view", - "numMembers": 0 -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d147afdc/google-compute-engine/src/test/resources/resource_view_insert.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/resource_view_insert.json b/google-compute-engine/src/test/resources/resource_view_insert.json deleted file mode 100644 index b49c07e..0000000 --- a/google-compute-engine/src/test/resources/resource_view_insert.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"jclouds-test","description":"Simple resource view"} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d147afdc/google-compute-engine/src/test/resources/resource_view_list_region.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/resource_view_list_region.json b/google-compute-engine/src/test/resources/resource_view_list_region.json deleted file mode 100644 index 88ccb8d..0000000 --- a/google-compute-engine/src/test/resources/resource_view_list_region.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "resourceViews": [ - { - "kind": "compute#resourceView", - "id": "13050421646334304115", - "creationTime": "2012-11-25T01:38:48.306", - "selfLink": "https://www.googleapis.com/resourceviews/v1beta1/projects/myproject/regions/us-central1/resourceViews/jclouds-test";, - "name": "jclouds-test", - "description": "Simple resource view", - "numMembers": 0 - }, - { - "kind": "compute#resourceView", - "id": "13050421646334304116", - "creationTime": "2012-11-25T01:38:48.306", - "selfLink": "https://www.googleapis.com/resourceviews/v1beta1/projects/myproject/regions/us-central1/resourceViews/jclouds-test-2";, - "name": "jclouds-test-2", - "description": "Simple resource view", - "numMembers": 1, - "members": [ - "https://www.googleapis.com/compute/projects/myproject/zones/us-central1-a/instances/jclouds-test"; - ] - } - ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d147afdc/google-compute-engine/src/test/resources/resource_view_list_zone.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/resource_view_list_zone.json b/google-compute-engine/src/test/resources/resource_view_list_zone.json deleted file mode 100644 index 04268cd..0000000 --- a/google-compute-engine/src/test/resources/resource_view_list_zone.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "resourceViews": [ - { - "kind": "compute#resourceView", - "id": "13050421646334304115", - "creationTime": "2012-11-25T01:38:48.306", - "selfLink": "https://www.googleapis.com/resourceviews/v1beta1/projects/myproject/zones/us-central1-a/resourceViews/jclouds-test";, - "name": "jclouds-test", - "description": "Simple resource view", - "numMembers": 0 - }, - { - "kind": "compute#resourceView", - "id": "13050421646334304116", - "creationTime": "2012-11-25T01:38:48.306", - "selfLink": "https://www.googleapis.com/resourceviews/v1beta1/projects/myproject/zones/us-central1-a/resourceViews/jclouds-test-2";, - "name": "jclouds-test-2", - "description": "Simple resource view", - "numMembers": 1, - "members": [ - "https://www.googleapis.com/compute/projects/myproject/zones/us-central1-a/instances/jclouds-test"; - ] - } - ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d147afdc/google-compute-engine/src/test/resources/resource_view_resources_list.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/resource_view_resources_list.json b/google-compute-engine/src/test/resources/resource_view_resources_list.json deleted file mode 100644 index 53f46f1..0000000 --- a/google-compute-engine/src/test/resources/resource_view_resources_list.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "members": [ - "https://googleapis.com/compute/projects/myproject/zones/us-central1-a/instances/jclouds-test-1";, - "https://googleapis.com/compute/projects/myproject/zones/us-central1-a/instances/jclouds-test-2"; - ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/d147afdc/googlecloud/src/main/java/org/jclouds/googlecloud/internal/AdvancingIterator.java ---------------------------------------------------------------------- diff --git a/googlecloud/src/main/java/org/jclouds/googlecloud/internal/AdvancingIterator.java b/googlecloud/src/main/java/org/jclouds/googlecloud/internal/AdvancingIterator.java index fd6b7a8..0010804 100644 --- a/googlecloud/src/main/java/org/jclouds/googlecloud/internal/AdvancingIterator.java +++ b/googlecloud/src/main/java/org/jclouds/googlecloud/internal/AdvancingIterator.java @@ -18,8 +18,6 @@ package org.jclouds.googlecloud.internal; import org.jclouds.googlecloud.domain.ListPage; -import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineExpectTest; - import com.google.common.base.Function; import com.google.common.collect.AbstractIterator;
