Repository: jclouds-labs-google Updated Branches: refs/heads/master c2fd429d5 -> f41d49cea
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/f41d49ce/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java index 7bb6782..490ed5b 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseMachineTypeTest.java @@ -39,9 +39,14 @@ public class ParseMachineTypeTest extends BaseGoogleComputeEngineParseTest<Machi @Override @Consumes(APPLICATION_JSON) public MachineType expected() { + return expected(BASE_URL); + } + + @Consumes(APPLICATION_JSON) + public MachineType expected(String baseUrl) { return MachineType.create( // "12907738072351752276", // id - URI.create(BASE_URL + "/party/zones/us-central1-a/machineTypes/n1-standard-1"), // selfLink + URI.create(baseUrl + "/party/zones/us-central1-a/machineTypes/n1-standard-1"), // selfLink "n1-standard-1", // name "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk", // description 1, // guestCpus http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/f41d49ce/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionOperationTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionOperationTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionOperationTest.java index dca6c8d..9e20c6d 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionOperationTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionOperationTest.java @@ -36,12 +36,17 @@ public class ParseRegionOperationTest extends BaseGoogleComputeEngineParseTest<O @Override @Consumes(APPLICATION_JSON) public Operation expected() { + return expected(BASE_URL); + } + + @Consumes(APPLICATION_JSON) + public Operation expected(String baseUrl) { return Operation.create( // "13053095055850848306", // id - URI.create(BASE_URL + "/party/regions/us-central1/operations/operation-1354084865060"), // selfLink + URI.create(baseUrl + "/party/regions/us-central1/operations/operation-1354084865060"), // selfLink "operation-1354084865060", // name null, // description - URI.create(BASE_URL + "/party/regions/us-central1/addresses/test-address"), // targetLink + URI.create(baseUrl + "/party/regions/us-central1/addresses/test-address"), // targetLink "13053094017547040099", // targetId null, // clientOperationId Operation.Status.DONE, // status @@ -55,7 +60,7 @@ public class ParseRegionOperationTest extends BaseGoogleComputeEngineParseTest<O null, // httpErrorMessage "insert", // operationType null, // errors - URI.create(BASE_URL + "/party/regions/us-central1"), // region + URI.create(baseUrl + "/party/regions/us-central1"), // region null // zone ); } http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/f41d49ce/google-compute-engine/src/test/resources/address_get.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/address_get.json b/google-compute-engine/src/test/resources/address_get.json index 24047a4..ea5f7e3 100644 --- a/google-compute-engine/src/test/resources/address_get.json +++ b/google-compute-engine/src/test/resources/address_get.json @@ -1,5 +1,4 @@ { - "kind": "compute#address", "id": "4439373783165447583", "creationTimestamp": "2013-07-26T13:57:20.204-07:00", http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/f41d49ce/google-compute-engine/src/test/resources/machinetype_list_central1b.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/machinetype_list_central1b.json b/google-compute-engine/src/test/resources/machinetype_list_central1b.json deleted file mode 100644 index 8ec63be..0000000 --- a/google-compute-engine/src/test/resources/machinetype_list_central1b.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "kind": "compute#machineTypeList", - "selfLink": "https://www.googleapis.com/compute/v1/projects/abayer-jclouds-test1/zones/us-central1-b/machineTypes";, - "id": "projects/abayer-jclouds-test1/zones/us-central1-b/machineTypes", - "items": [ - { - "kind": "compute#machineType", - "id": "12907738072351752276", - "creationTimestamp": "2012-06-07T20:48:14.670", - "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-b/machineTypes/n1-standard-0";, - "name": "n1-standard-0", - "description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk", - "guestCpus": 1, - "memoryMb": 3840, - "maximumPersistentDisks": 16, - "maximumPersistentDisksSizeGb": "128", - "zone": "us-central1-b" - }, - { - "kind": "compute#machineType", - "id": "12908560709887590691", - "creationTimestamp": "2012-06-07T20:51:19.936", - "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-b/machineTypes/n1-standard-8-d";, - "name": "n1-standard-8-d", - "description": "8 vCPUs, 30 GB RAM, a 10 GB ephemeral root disk, and 2 extra 1770 GB ephemeral disks", - "guestCpus": 8, - "memoryMb": 30720, - "scratchDisks": [ - { - "diskGb": 1770 - }, - { - "diskGb": 1770 - } - ], - "maximumPersistentDisks": 16, - "maximumPersistentDisksSizeGb": "1024", - "zone": "us-central1-b" - } - ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/f41d49ce/google-compute-engine/src/test/resources/machinetype_list_central1b_empty.json ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/resources/machinetype_list_central1b_empty.json b/google-compute-engine/src/test/resources/machinetype_list_central1b_empty.json deleted file mode 100644 index 670ca20..0000000 --- a/google-compute-engine/src/test/resources/machinetype_list_central1b_empty.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "kind": "compute#machineTypeList", - "id": "projects/party/zones/us-central1-b/machineTypes", - "selfLink": "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-b/machineTypes";, - "items": [] -} \ No newline at end of file
