You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2015/06/02 20:18:40 UTC
[1/3] jclouds-labs-google git commit: Name test buckets jclouds
instead of jcloud
Repository: jclouds-labs-google
Updated Branches:
refs/heads/1.9.x f29ac6d6a -> 814f38f78
Name test buckets jclouds instead of jcloud
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/7073eec0
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/7073eec0
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/7073eec0
Branch: refs/heads/1.9.x
Commit: 7073eec0b2419908fdc056c7e37a7e53790ae02d
Parents: f29ac6d
Author: Andrew Gaul <ga...@apache.org>
Authored: Fri May 29 13:44:51 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Tue Jun 2 10:34:42 2015 -0700
----------------------------------------------------------------------
.../BucketAccessControlsApiExpectTest.java | 18 ++++++++--------
.../features/BucketApiExpectTest.java | 4 ++--
.../features/BucketApiLiveTest.java | 2 +-
...efaultObjectAccessControlsApiExpectTest.java | 18 ++++++++--------
.../DefaultObjectAccessControlsApiLiveTest.java | 2 +-
.../ObjectAccessControlsApiExpectTest.java | 22 ++++++++++----------
.../features/ObjectApiLiveTest.java | 2 +-
.../parse/BucketAclGetTest.java | 4 ++--
.../parse/BucketAclInsertTest.java | 4 ++--
.../parse/BucketAclListTest.java | 8 +++----
.../parse/BucketAclUpdateTest.java | 4 ++--
.../parse/FullBucketGetTest.java | 8 +++----
.../parse/ObjectAclGetTest.java | 4 ++--
.../parse/ObjectAclInsertTest.java | 2 +-
.../parse/ObjectAclListTest.java | 4 ++--
.../parse/ObjectAclUpdateTest.java | 2 +-
.../src/test/resources/bucket_acl_get.json | 6 +++---
.../resources/bucket_acl_insert_response.json | 6 +++---
.../src/test/resources/bucket_acl_list.json | 12 +++++------
.../resources/bucket_acl_update_response.json | 6 +++---
.../src/test/resources/full_bucket_get.json | 12 +++++------
.../resources/list_bucket_with_options.json | 8 +++----
.../src/test/resources/object_acl_get.json | 6 +++---
.../resources/object_acl_insert_response.json | 4 ++--
.../src/test/resources/object_acl_list.json | 6 +++---
.../resources/object_acl_update_initial.json | 4 ++--
.../resources/object_acl_update_response.json | 4 ++--
27 files changed, 91 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiExpectTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiExpectTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiExpectTest.java
index ab6484f..79f96f6 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiExpectTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiExpectTest.java
@@ -36,10 +36,10 @@ import org.testng.annotations.Test;
@Test(groups = "unit", testName = "BucketAccessControlsApiExpectTest")
public class BucketAccessControlsApiExpectTest extends BaseGoogleCloudStorageApiExpectTest {
- private static final String EXPECTED_TEST_BUCKET = "jcloudtestbucket";
+ private static final String EXPECTED_TEST_BUCKET = "jcloudstestbucket";
public static final HttpRequest GET_BUCKETACL_REQUEST = HttpRequest.builder().method("GET")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/acl/allUsers")
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
private final HttpResponse GET_BUCKETACL_RESPONSE = HttpResponse.builder().statusCode(200)
@@ -49,7 +49,7 @@ public class BucketAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.payload(staticPayloadFromResource("/bucket_acl_insert_response.json")).build();
private final HttpRequest LIST_BUCKETACL_REQUEST = HttpRequest.builder().method("GET")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/acl")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/acl")
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
private final HttpResponse LIST_BUCKETACL_RESPONSE = HttpResponse.builder().statusCode(200)
@@ -91,7 +91,7 @@ public class BucketAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
BucketAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE,
LIST_BUCKETACL_REQUEST, listResponse).getBucketAccessControlsApi();
- assertNull(api.listBucketAccessControls("jcloudtestbucket"));
+ assertNull(api.listBucketAccessControls("jcloudstestbucket"));
}
// Test insertBucketAccessControls
@@ -99,7 +99,7 @@ public class BucketAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
HttpRequest insertRequest = HttpRequest
.builder()
.method("POST")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/acl")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/acl")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromResourceWithContentType("/bucket_acl_insert_initial.json",
@@ -116,7 +116,7 @@ public class BucketAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
// Test deleteBucketAccessControls
public void testDeleteBucketAclResponseIs2xx() throws Exception {
HttpRequest delete = HttpRequest.builder().method("DELETE")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allAuthenticatedUsers")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/acl/allAuthenticatedUsers")
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
HttpResponse deleteResponse = HttpResponse.builder().statusCode(204).build();
@@ -129,7 +129,7 @@ public class BucketAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
public void testDeleteBucketAclResponseIs4xx() throws Exception {
HttpRequest delete = HttpRequest.builder().method("DELETE")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allAuthenticatedUsers")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/acl/allAuthenticatedUsers")
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
HttpResponse deleteResponse = HttpResponse.builder().statusCode(404).build();
@@ -145,7 +145,7 @@ public class BucketAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
HttpRequest update = HttpRequest
.builder()
.method("PUT")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/acl/allUsers")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromResourceWithContentType("/bucket_acl_update_initial.json",
@@ -168,7 +168,7 @@ public class BucketAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
HttpRequest patchRequest = HttpRequest
.builder()
.method("PATCH")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/acl/allUsers")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromResourceWithContentType("/bucket_acl_update_initial.json",
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java
index 4970b19..5c42617 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java
@@ -61,7 +61,7 @@ public class BucketApiExpectTest extends BaseGoogleCloudStorageApiExpectTest {
public static final HttpRequest LIST_BUCKET_REQUEST_WITHOPTIONS = HttpRequest.builder().method("GET")
.endpoint("https://www.googleapis.com/storage/v1/b").addQueryParam("project", EXPECTED_TEST_PROJECT_NUMBER)
- .addQueryParam("maxResults", "2").addQueryParam("pageToken", "jcloudtestbucket500")
+ .addQueryParam("maxResults", "2").addQueryParam("pageToken", "jcloudstestbucket500")
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
private final HttpResponse LIST_BUCKET_RESPONSE = HttpResponse.builder().statusCode(200)
@@ -112,7 +112,7 @@ public class BucketApiExpectTest extends BaseGoogleCloudStorageApiExpectTest {
BucketApi api = requestsSendResponses(requestForScopes(STORAGE_READONLY_SCOPE), TOKEN_RESPONSE,
LIST_BUCKET_REQUEST_WITHOPTIONS, LIST_BUCKET_RESPONSE).getBucketApi();
- ListOptions options = new ListOptions().maxResults(2).pageToken("jcloudtestbucket500");
+ ListOptions options = new ListOptions().maxResults(2).pageToken("jcloudstestbucket500");
assertEquals(api.listBucket(EXPECTED_TEST_PROJECT_NUMBER, options), new NoAclBucketListTest().expected());
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java
index 762e7f2..9c81aa5 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java
@@ -60,7 +60,7 @@ public class BucketApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
private static final String BUCKET_NAME_NEARLINE = "jcloudstestbucketnearline" + (int) (Math.random() * 10000);
- private static final String BUCKET_NAME_WITHOPTIONS = "jcloudtestbucketoptions" + (int) (Math.random() * 10000);
+ private static final String BUCKET_NAME_WITHOPTIONS = "jcloudstestbucketoptions" + (int) (Math.random() * 10000);
private static final String LOG_BUCKET_NAME = "jcloudslogbucket" + (int) (Math.random() * 10000);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java
index acc7093..42804be 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java
@@ -36,14 +36,14 @@ import org.testng.annotations.Test;
@Test(groups = "unit", testName = "DefaultObjectAccessControlsApiExpectTest")
public class DefaultObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApiExpectTest {
- private static final String EXPECTED_TEST_BUCKET = "jcloudtestbucket";
+ private static final String EXPECTED_TEST_BUCKET = "jcloudstestbucket";
private static final String EXPECTED_TEST_GROUP_ENTITY = "group-00b4903a971ec6cff233284d6d24f5bf5cba904c4ade4d43ebd6a5d33800e68b";
private static final HttpRequest GET_DEFAULT_OBJECT_ACL_REQUEST = HttpRequest
.builder()
.method("GET")
.endpoint(
- "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/defaultObjectAcl/group-00b4903a971ec6cff233284d6d24f5bf5cba904c4ade4d43ebd6a5d33800e68b")
+ "https://www.googleapis.com/storage/v1/b/jcloudstestbucket/defaultObjectAcl/group-00b4903a971ec6cff233284d6d24f5bf5cba904c4ade4d43ebd6a5d33800e68b")
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
private final HttpResponse GET_DEFAULT_OBJECT_ACL_RESPONSE = HttpResponse.builder().statusCode(200)
@@ -53,7 +53,7 @@ public class DefaultObjectAccessControlsApiExpectTest extends BaseGoogleCloudSto
.payload(staticPayloadFromResource("/default_object_acl_insert_response.json")).build();
public final HttpRequest LIST_DEFAULT_OBJECT_ACL_REQUEST = HttpRequest.builder().method("GET")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/defaultObjectAcl")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/defaultObjectAcl")
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
private final HttpResponse LIST_DEFAULT_OBJECT_ACL_RESPONSE = HttpResponse.builder().statusCode(200)
@@ -105,7 +105,7 @@ public class DefaultObjectAccessControlsApiExpectTest extends BaseGoogleCloudSto
HttpRequest insertRequest = HttpRequest
.builder()
.method("POST")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/defaultObjectAcl")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/defaultObjectAcl")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromResourceWithContentType("/default_object_acl_insert_request_payload.json",
@@ -123,7 +123,7 @@ public class DefaultObjectAccessControlsApiExpectTest extends BaseGoogleCloudSto
// Test deleteDefaultObjectAccessControls
public void testDeleteDefaultObjectAclResponseIs2xx() throws Exception {
HttpRequest delete = HttpRequest.builder().method("DELETE")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/defaultObjectAcl/allUsers")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/defaultObjectAcl/allUsers")
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
HttpResponse deleteResponse = HttpResponse.builder().statusCode(204).build();
@@ -136,7 +136,7 @@ public class DefaultObjectAccessControlsApiExpectTest extends BaseGoogleCloudSto
public void testDeleteObjectAclResponseIs4xx() throws Exception {
HttpRequest delete = HttpRequest.builder().method("DELETE")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/defaultObjectAcl/allUsers")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/defaultObjectAcl/allUsers")
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
HttpResponse deleteResponse = HttpResponse.builder().statusCode(404).build();
@@ -152,7 +152,7 @@ public class DefaultObjectAccessControlsApiExpectTest extends BaseGoogleCloudSto
HttpRequest update = HttpRequest
.builder()
.method("PUT")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/defaultObjectAcl/allUsers")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/defaultObjectAcl/allUsers")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromResourceWithContentType("/default_object_acl_update_request_payload.json",
@@ -175,7 +175,7 @@ public class DefaultObjectAccessControlsApiExpectTest extends BaseGoogleCloudSto
HttpRequest update = HttpRequest
.builder()
.method("PUT")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/defaultObjectAcl/allUsers")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/defaultObjectAcl/allUsers")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
.addQueryParam("role", ObjectRole.OWNER.toString())
@@ -199,7 +199,7 @@ public class DefaultObjectAccessControlsApiExpectTest extends BaseGoogleCloudSto
HttpRequest update = HttpRequest
.builder()
.method("PATCH")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/defaultObjectAcl/allUsers")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/defaultObjectAcl/allUsers")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromResourceWithContentType("/default_object_acl_update_request_payload.json",
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java
index d15391e..55c45bf 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java
@@ -32,7 +32,7 @@ import org.testng.annotations.Test;
public class DefaultObjectAccessControlsApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
- protected static final String BUCKET_NAME = "jcloudtestbucketdefaultoacl" + UUID.randomUUID();
+ protected static final String BUCKET_NAME = "jcloudstestbucketdefaultoacl" + UUID.randomUUID();
private DefaultObjectAccessControlsApi api() {
return api.getDefaultObjectAccessControlsApi();
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java
index 2a6e5cf..abf6010 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java
@@ -36,7 +36,7 @@ import org.testng.annotations.Test;
@Test(groups = "unit", testName = "ObjectAccessControlsApiExpectTest")
public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApiExpectTest {
- private static final String EXPECTED_TEST_BUCKET = "jcloudtestbucket";
+ private static final String EXPECTED_TEST_BUCKET = "jcloudstestbucket";
private static final String EXPECTED_TEST_OBJECT = "foo.txt";
private static final String EXPECTED_TEST_GROUP_ENTITY = "group-00b4903a971ec6cff233284d6d24f5bf5cba904c4ade4d43ebd6a5d33800e68b";
private static final String EXPECTED_TEST_USER_ENTITY = "user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d";
@@ -45,14 +45,14 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.builder()
.method("GET")
.endpoint(
- "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/group-00b4903a971ec6cff233284d6d24f5bf5cba904c4ade4d43ebd6a5d33800e68b")
+ "https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl/group-00b4903a971ec6cff233284d6d24f5bf5cba904c4ade4d43ebd6a5d33800e68b")
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
public static final HttpRequest GET_OBJECT_ACL_REQUEST_WITHOPTIONS = HttpRequest
.builder()
.method("GET")
.endpoint(
- "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/group-00b4903a971ec6cff233284d6d24f5bf5cba904c4ade4d43ebd6a5d33800e68b")
+ "https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl/group-00b4903a971ec6cff233284d6d24f5bf5cba904c4ade4d43ebd6a5d33800e68b")
.addQueryParam("generation", "100").addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build();
@@ -63,11 +63,11 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
.payload(staticPayloadFromResource("/object_acl_insert_response.json")).build();
public final HttpRequest LIST_OBJECT_ACL_REQUEST = HttpRequest.builder().method("GET")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl")
.addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build();
public final HttpRequest LIST_OBJECT_ACL_REQUEST_WITHOPTIONS = HttpRequest.builder().method("GET")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl")
.addQueryParam("generation", "100").addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN).build();
@@ -141,7 +141,7 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
HttpRequest insertRequest = HttpRequest
.builder()
.method("POST")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromResourceWithContentType("/object_acl_insert_request_payload.json",
@@ -161,7 +161,7 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
HttpRequest insertRequest = HttpRequest
.builder()
.method("POST")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
.addQueryParam("generation", "100")
@@ -185,7 +185,7 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
HttpRequest update = HttpRequest
.builder()
.method("PUT")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/allUsers")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl/allUsers")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromResourceWithContentType("/object_acl_request_payload.json",
@@ -207,7 +207,7 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
HttpRequest update = HttpRequest
.builder()
.method("PUT")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/allUsers")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl/allUsers")
.addQueryParam("generation", "100")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
@@ -232,7 +232,7 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
HttpRequest patchRequest = HttpRequest
.builder()
.method("PATCH")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/allUsers")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl/allUsers")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
.payload(payloadFromResourceWithContentType("/object_acl_request_payload.json",
@@ -254,7 +254,7 @@ public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApi
HttpRequest patchRequest = HttpRequest
.builder()
.method("PATCH")
- .endpoint("https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/allUsers")
+ .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl/allUsers")
.addQueryParam("generation", "100")
.addHeader("Accept", "application/json")
.addHeader("Authorization", "Bearer " + TOKEN)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
index aa35d22..a5728f8 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
@@ -68,7 +68,7 @@ import com.google.common.primitives.Bytes;
public class ObjectApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
private static final String BUCKET_NAME = "jcloudsobjectoperations" + UUID.randomUUID();
- private static final String BUCKET_NAME2 = "jcloudobjectdestination" + UUID.randomUUID();
+ private static final String BUCKET_NAME2 = "jcloudsobjectdestination" + UUID.randomUUID();
private static final String UPLOAD_OBJECT_NAME = "objectOperation.txt";
private static final String UPLOAD_OBJECT_NAME2 = "jcloudslogo.jpg";
private static final String MULTIPART_UPLOAD_OBJECT = "multipart_related.jpg";
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclGetTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclGetTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclGetTest.java
index 21494f0..4544128 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclGetTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclGetTest.java
@@ -33,7 +33,7 @@ public class BucketAclGetTest extends BaseGoogleCloudStorageParseTest<BucketAcce
@Override
@Consumes(MediaType.APPLICATION_JSON)
public BucketAccessControls expected() {
- return BucketAccessControls.builder().bucket("jcloudtestbucket").entity("allUsers").role(Role.READER)
- .id("jcloudtestbucket/allUsers").build();
+ return BucketAccessControls.builder().bucket("jcloudstestbucket").entity("allUsers").role(Role.READER)
+ .id("jcloudstestbucket/allUsers").build();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclInsertTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclInsertTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclInsertTest.java
index b38ce42..d7cac85 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclInsertTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclInsertTest.java
@@ -35,8 +35,8 @@ public class BucketAclInsertTest extends BaseGoogleCloudStorageParseTest<BucketA
public BucketAccessControls expected() {
return BucketAccessControls
.builder()
- .id("jcloudtestbucket/allAuthenticatedUsers")
- .bucket("jcloudtestbucket").entity("allAuthenticatedUsers").role(Role.WRITER).build();
+ .id("jcloudstestbucket/allAuthenticatedUsers")
+ .bucket("jcloudstestbucket").entity("allAuthenticatedUsers").role(Role.WRITER).build();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclListTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclListTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclListTest.java
index 077eb46..3f6a0d4 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclListTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclListTest.java
@@ -32,14 +32,14 @@ import com.google.common.collect.ImmutableList;
public class BucketAclListTest extends BaseGoogleCloudStorageParseTest<List<BucketAccessControls>> {
- private BucketAccessControls item_1 = BucketAccessControls.builder().id("jcloudtestbucket/allUsers")
- .bucket("jcloudtestbucket").entity("allUsers").role(Role.READER).build();
+ private BucketAccessControls item_1 = BucketAccessControls.builder().id("jcloudstestbucket/allUsers")
+ .bucket("jcloudstestbucket").entity("allUsers").role(Role.READER).build();
private BucketAccessControls item_2 = BucketAccessControls
.builder()
- .id("jcloudtestbucket/project-owners-1082289308625")
+ .id("jcloudstestbucket/project-owners-1082289308625")
.projectTeam(ProjectTeam.create("1082289308625", Team.OWNERS))
- .bucket("jcloudtestbucket").entity("project-owners-1082289308625").role(Role.OWNER).build();
+ .bucket("jcloudstestbucket").entity("project-owners-1082289308625").role(Role.OWNER).build();
@Override
public String resource() {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclUpdateTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclUpdateTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclUpdateTest.java
index bfba5e1..b3548f2 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclUpdateTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/BucketAclUpdateTest.java
@@ -33,7 +33,7 @@ public class BucketAclUpdateTest extends BaseGoogleCloudStorageParseTest<BucketA
@Override
@Consumes(MediaType.APPLICATION_JSON)
public BucketAccessControls expected() {
- return BucketAccessControls.builder().id("jcloudtestbucket/allUsers")
- .bucket("jcloudtestbucket").entity("allUsers").role(Role.OWNER).build();
+ return BucketAccessControls.builder().id("jcloudstestbucket/allUsers")
+ .bucket("jcloudstestbucket").entity("allUsers").role(Role.OWNER).build();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/FullBucketGetTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/FullBucketGetTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/FullBucketGetTest.java
index 3f2759b..60ef7fd 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/FullBucketGetTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/FullBucketGetTest.java
@@ -39,8 +39,8 @@ public class FullBucketGetTest extends BaseGoogleCloudStorageParseTest<Bucket> {
private final BucketAccessControls acl1 = BucketAccessControls
.builder()
- .id("jcloudtestbucket3500/project-owners-1082289308625")
- .bucket("jcloudtestbucket3500").entity("project-owners-1082289308625").role(Role.OWNER)
+ .id("jcloudstestbucket3500/project-owners-1082289308625")
+ .bucket("jcloudstestbucket3500").entity("project-owners-1082289308625").role(Role.OWNER)
.projectTeam(ProjectTeam.create("1082289308625", Team.OWNERS))
.build();
@@ -60,8 +60,8 @@ public class FullBucketGetTest extends BaseGoogleCloudStorageParseTest<Bucket> {
@Consumes(MediaType.APPLICATION_JSON)
public Bucket expected() {
return Bucket.create(
- "jcloudtestbucket3500", // id
- "jcloudtestbucket3500", // name
+ "jcloudstestbucket3500", // id
+ "jcloudstestbucket3500", // name
1082289308625l, // projectNumber
new SimpleDateFormatDateService().iso8601DateParse("2014-06-19T14:03:22.345Z"), // timeCreated
10l, // metageneration
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclGetTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclGetTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclGetTest.java
index d50c284..0cef68e 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclGetTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclGetTest.java
@@ -37,13 +37,13 @@ public class ObjectAclGetTest extends BaseGoogleCloudStorageParseTest<ObjectAcce
public ObjectAccessControls expected() {
return ObjectAccessControls
.builder()
- .bucket("jcloudtestbucket")
+ .bucket("jcloudstestbucket")
.object("foo.txt")
.generation(1394121608485000L)
.entity("project-owners-1082289308625")
.role(ObjectRole.OWNER)
.projectTeam(ProjectTeam.create("1082289308625", Team.OWNERS))
- .id("jcloudtestbucket/foo.txt/1394121608485000/project-owners-1082289308625").build();
+ .id("jcloudstestbucket/foo.txt/1394121608485000/project-owners-1082289308625").build();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclInsertTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclInsertTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclInsertTest.java
index 595687b..b4ccfa2 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclInsertTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclInsertTest.java
@@ -35,7 +35,7 @@ public class ObjectAclInsertTest extends BaseGoogleCloudStorageParseTest<ObjectA
public ObjectAccessControls expected() {
return ObjectAccessControls
.builder()
- .bucket("jcloudtestbucket").object("foo.txt")
+ .bucket("jcloudstestbucket").object("foo.txt")
.entity("user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d")
.entityId("00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d").role(ObjectRole.OWNER)
.build();
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclListTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclListTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclListTest.java
index 7e7c4ed..426da0d 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclListTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclListTest.java
@@ -31,8 +31,8 @@ public class ObjectAclListTest extends BaseGoogleCloudStorageParseTest<List<Obje
private ObjectAccessControls item1 = ObjectAccessControls
.builder()
- .id("jcloudtestbucket/foo.txt/1394121608485000/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d")
- .bucket("jcloudtestbucket").object("foo.txt").generation(Long.valueOf("1394121608485000"))
+ .id("jcloudstestbucket/foo.txt/1394121608485000/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d")
+ .bucket("jcloudstestbucket").object("foo.txt").generation(Long.valueOf("1394121608485000"))
.entity("user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d")
.entityId("00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d").role(ObjectRole.OWNER)
.build();
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclUpdateTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclUpdateTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclUpdateTest.java
index 5b5cd60..205622e 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclUpdateTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/parse/ObjectAclUpdateTest.java
@@ -34,7 +34,7 @@ public class ObjectAclUpdateTest extends BaseGoogleCloudStorageParseTest<ObjectA
@Consumes(MediaType.APPLICATION_JSON)
public ObjectAccessControls expected() {
return ObjectAccessControls.builder()
- .bucket("jcloudtestbucket").object("foo.txt").entity("allUsers").role(ObjectRole.OWNER).build();
+ .bucket("jcloudstestbucket").object("foo.txt").entity("allUsers").role(ObjectRole.OWNER).build();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/resources/bucket_acl_get.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucket_acl_get.json b/google-cloud-storage/src/test/resources/bucket_acl_get.json
index 1df3d84..27f3d3f 100644
--- a/google-cloud-storage/src/test/resources/bucket_acl_get.json
+++ b/google-cloud-storage/src/test/resources/bucket_acl_get.json
@@ -1,8 +1,8 @@
{
"kind": "storage#bucketAccessControl",
- "id": "jcloudtestbucket/allUsers",
- "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers",
- "bucket": "jcloudtestbucket",
+ "id": "jcloudstestbucket/allUsers",
+ "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudstestbucket/acl/allUsers",
+ "bucket": "jcloudstestbucket",
"entity": "allUsers",
"role": "READER",
"etag": "CAM="
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/resources/bucket_acl_insert_response.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucket_acl_insert_response.json b/google-cloud-storage/src/test/resources/bucket_acl_insert_response.json
index f03dae2..144aa32 100644
--- a/google-cloud-storage/src/test/resources/bucket_acl_insert_response.json
+++ b/google-cloud-storage/src/test/resources/bucket_acl_insert_response.json
@@ -1,8 +1,8 @@
{
"kind": "storage#bucketAccessControl",
- "id": "jcloudtestbucket/allAuthenticatedUsers",
- "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allAuthenticatedUsers",
- "bucket": "jcloudtestbucket",
+ "id": "jcloudstestbucket/allAuthenticatedUsers",
+ "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudstestbucket/acl/allAuthenticatedUsers",
+ "bucket": "jcloudstestbucket",
"entity": "allAuthenticatedUsers",
"role": "WRITER",
"etag": "CAQ="
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/resources/bucket_acl_list.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucket_acl_list.json b/google-cloud-storage/src/test/resources/bucket_acl_list.json
index e0ed5a4..dd8ca03 100644
--- a/google-cloud-storage/src/test/resources/bucket_acl_list.json
+++ b/google-cloud-storage/src/test/resources/bucket_acl_list.json
@@ -3,18 +3,18 @@
"items": [
{
"kind": "storage#bucketAccessControl",
- "id": "jcloudtestbucket/allUsers",
- "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers",
- "bucket": "jcloudtestbucket",
+ "id": "jcloudstestbucket/allUsers",
+ "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudstestbucket/acl/allUsers",
+ "bucket": "jcloudstestbucket",
"entity": "allUsers",
"role": "READER",
"etag": "CAc="
},
{
"kind": "storage#bucketAccessControl",
- "id": "jcloudtestbucket/project-owners-1082289308625",
- "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/project-owners-1082289308625",
- "bucket": "jcloudtestbucket",
+ "id": "jcloudstestbucket/project-owners-1082289308625",
+ "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudstestbucket/acl/project-owners-1082289308625",
+ "bucket": "jcloudstestbucket",
"entity": "project-owners-1082289308625",
"role": "OWNER",
"projectTeam": {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/resources/bucket_acl_update_response.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/bucket_acl_update_response.json b/google-cloud-storage/src/test/resources/bucket_acl_update_response.json
index f16f7a4..5859e13 100644
--- a/google-cloud-storage/src/test/resources/bucket_acl_update_response.json
+++ b/google-cloud-storage/src/test/resources/bucket_acl_update_response.json
@@ -1,8 +1,8 @@
{
"kind": "storage#bucketAccessControl",
- "id": "jcloudtestbucket/allUsers",
- "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudtestbucket/acl/allUsers",
- "bucket": "jcloudtestbucket",
+ "id": "jcloudstestbucket/allUsers",
+ "selfLink": "https://content.googleapis.com/storage/v1/b/jcloudstestbucket/acl/allUsers",
+ "bucket": "jcloudstestbucket",
"entity": "allUsers",
"role": "OWNER",
"etag": "CAg="
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/resources/full_bucket_get.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/full_bucket_get.json b/google-cloud-storage/src/test/resources/full_bucket_get.json
index 3cea72e..42e2cf4 100644
--- a/google-cloud-storage/src/test/resources/full_bucket_get.json
+++ b/google-cloud-storage/src/test/resources/full_bucket_get.json
@@ -1,17 +1,17 @@
{
"kind": "storage#bucket",
- "id": "jcloudtestbucket3500",
- "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket3500",
+ "id": "jcloudstestbucket3500",
+ "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudstestbucket3500",
"projectNumber": "1082289308625",
- "name": "jcloudtestbucket3500",
+ "name": "jcloudstestbucket3500",
"timeCreated": "2014-06-19T14:03:22.345Z",
"metageneration": "10",
"acl": [
{
"kind": "storage#bucketAccessControl",
- "id": "jcloudtestbucket3500/project-owners-1082289308625",
- "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket3500/acl/project-owners-1082289308625",
- "bucket": "jcloudtestbucket3500",
+ "id": "jcloudstestbucket3500/project-owners-1082289308625",
+ "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudstestbucket3500/acl/project-owners-1082289308625",
+ "bucket": "jcloudstestbucket3500",
"entity": "project-owners-1082289308625",
"role": "OWNER",
"projectTeam": {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/resources/list_bucket_with_options.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/list_bucket_with_options.json b/google-cloud-storage/src/test/resources/list_bucket_with_options.json
index bceb735..ad28c1b 100644
--- a/google-cloud-storage/src/test/resources/list_bucket_with_options.json
+++ b/google-cloud-storage/src/test/resources/list_bucket_with_options.json
@@ -1,13 +1,13 @@
{
"kind": "storage#buckets",
- "nextPageToken": "jcloudtestbucket500",
+ "nextPageToken": "jcloudstestbucket500",
"items": [
{
"kind": "storage#bucket",
- "id": "jcloudtestbucket500",
- "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket500",
+ "id": "jcloudstestbucket500",
+ "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudstestbucket500",
"projectNumber": "1082289308625",
- "name": "jcloudtestbucket500",
+ "name": "jcloudstestbucket500",
"timeCreated": "2014-06-17T14:17:50.155Z",
"metageneration": "1",
"owner": {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/resources/object_acl_get.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/object_acl_get.json b/google-cloud-storage/src/test/resources/object_acl_get.json
index dd2417d..6b09d42 100644
--- a/google-cloud-storage/src/test/resources/object_acl_get.json
+++ b/google-cloud-storage/src/test/resources/object_acl_get.json
@@ -1,8 +1,8 @@
{
"kind": "storage#objectAccessControl",
- "id": "jcloudtestbucket/foo.txt/1394121608485000/project-owners-1082289308625",
- "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/project-owners-1082289308625",
- "bucket": "jcloudtestbucket",
+ "id": "jcloudstestbucket/foo.txt/1394121608485000/project-owners-1082289308625",
+ "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl/project-owners-1082289308625",
+ "bucket": "jcloudstestbucket",
"object": "foo.txt",
"generation": "1394121608485000",
"entity": "project-owners-1082289308625",
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/resources/object_acl_insert_response.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/object_acl_insert_response.json b/google-cloud-storage/src/test/resources/object_acl_insert_response.json
index 1a477b8..4197a6c 100644
--- a/google-cloud-storage/src/test/resources/object_acl_insert_response.json
+++ b/google-cloud-storage/src/test/resources/object_acl_insert_response.json
@@ -1,7 +1,7 @@
{
"kind": "storage#objectAccessControl",
- "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
- "bucket": "jcloudtestbucket",
+ "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
+ "bucket": "jcloudstestbucket",
"object": "foo.txt",
"entity": "user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
"role": "OWNER",
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/resources/object_acl_list.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/object_acl_list.json b/google-cloud-storage/src/test/resources/object_acl_list.json
index 9a7a677..dd8883a 100644
--- a/google-cloud-storage/src/test/resources/object_acl_list.json
+++ b/google-cloud-storage/src/test/resources/object_acl_list.json
@@ -3,9 +3,9 @@
"items": [
{
"kind": "storage#objectAccessControl",
- "id": "jcloudtestbucket/foo.txt/1394121608485000/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
- "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
- "bucket": "jcloudtestbucket",
+ "id": "jcloudstestbucket/foo.txt/1394121608485000/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
+ "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl/user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
+ "bucket": "jcloudstestbucket",
"object": "foo.txt",
"generation": "1394121608485000",
"entity": "user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d",
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/resources/object_acl_update_initial.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/object_acl_update_initial.json b/google-cloud-storage/src/test/resources/object_acl_update_initial.json
index c3ee980..b888ed4 100644
--- a/google-cloud-storage/src/test/resources/object_acl_update_initial.json
+++ b/google-cloud-storage/src/test/resources/object_acl_update_initial.json
@@ -1,7 +1,7 @@
{
"kind": "storage#objectAccessControl",
- "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/allUsers",
- "bucket": "jcloudtestbucket",
+ "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl/allUsers",
+ "bucket": "jcloudstestbucket",
"object": "foo.txt",
"entity": "allUsers",
"role": "OWNER",
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7073eec0/google-cloud-storage/src/test/resources/object_acl_update_response.json
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/resources/object_acl_update_response.json b/google-cloud-storage/src/test/resources/object_acl_update_response.json
index c3ee980..b888ed4 100644
--- a/google-cloud-storage/src/test/resources/object_acl_update_response.json
+++ b/google-cloud-storage/src/test/resources/object_acl_update_response.json
@@ -1,7 +1,7 @@
{
"kind": "storage#objectAccessControl",
- "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudtestbucket/o/foo.txt/acl/allUsers",
- "bucket": "jcloudtestbucket",
+ "selfLink": "https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl/allUsers",
+ "bucket": "jcloudstestbucket",
"object": "foo.txt",
"entity": "allUsers",
"role": "OWNER",
[3/3] jclouds-labs-google git commit: Fix
DefaultObjectAccessControlsApiLiveTest, ResumableUploadApiLiveTest,
ObjectApiLiveTest
Posted by ga...@apache.org.
Fix DefaultObjectAccessControlsApiLiveTest, ResumableUploadApiLiveTest, ObjectApiLiveTest
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/814f38f7
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/814f38f7
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/814f38f7
Branch: refs/heads/1.9.x
Commit: 814f38f781f376e2601a9f81c40d7f37788b0b8d
Parents: 06cf78c
Author: Daniel Broudy <br...@google.com>
Authored: Mon Jun 1 17:18:33 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Tue Jun 2 10:34:49 2015 -0700
----------------------------------------------------------------------
.../features/DefaultObjectAccessControlsApiLiveTest.java | 2 +-
.../googlecloudstorage/features/ObjectApiLiveTest.java | 8 +-------
.../features/ResumableUploadApiLiveTest.java | 2 +-
3 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/814f38f7/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java
index 55c45bf..d2697d4 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java
@@ -32,7 +32,7 @@ import org.testng.annotations.Test;
public class DefaultObjectAccessControlsApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
- protected static final String BUCKET_NAME = "jcloudstestbucketdefaultoacl" + UUID.randomUUID();
+ protected static final String BUCKET_NAME = "jcloudsdefaultoacltest" + UUID.randomUUID();
private DefaultObjectAccessControlsApi api() {
return api.getDefaultObjectAccessControlsApi();
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/814f38f7/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
index a5728f8..3cef893 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
@@ -63,7 +63,6 @@ import com.beust.jcommander.internal.Lists;
import com.google.common.collect.ImmutableMap;
import com.google.common.hash.Hashing;
import com.google.common.io.ByteSource;
-import com.google.common.primitives.Bytes;
public class ObjectApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
@@ -435,6 +434,7 @@ public class ObjectApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
assertTrue(api().deleteObject(BUCKET_NAME2, COMPOSED_OBJECT2));
assertTrue(api().deleteObject(BUCKET_NAME2, COMPOSED_OBJECT));
assertTrue(api().deleteObject(BUCKET_NAME2, COPIED_OBJECT_NAME));
+ assertTrue(api().deleteObject(BUCKET_NAME2, COPIED_OBJECT_NAME2));
assertFalse(api().deleteObject(BUCKET_NAME, UPLOAD_OBJECT_NAME));
assertTrue(api().deleteObject(BUCKET_NAME, UPLOAD_OBJECT_NAME2));
assertTrue(api().deleteObject(BUCKET_NAME, MULTIPART_UPLOAD_OBJECT));
@@ -453,10 +453,4 @@ public class ObjectApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
api.getBucketApi().deleteBucket(BUCKET_NAME);
api.getBucketApi().deleteBucket(BUCKET_NAME2);
}
-
- private static byte[] reverse(byte[] b) {
- List<Byte> hashByte = Bytes.asList(b);
- List<Byte> reversedList = com.google.common.collect.Lists.reverse(hashByte);
- return Bytes.toArray(reversedList);
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/814f38f7/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ResumableUploadApiLiveTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ResumableUploadApiLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ResumableUploadApiLiveTest.java
index 7718281..441c255 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ResumableUploadApiLiveTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ResumableUploadApiLiveTest.java
@@ -136,7 +136,7 @@ public class ResumableUploadApiLiveTest extends BaseGoogleCloudStorageApiLiveTes
// Uploading First chunk
ByteSourcePayload payload = Payloads.newByteSourcePayload(byteSource.slice(offset, chunkSize));
long length = byteSource.slice(offset, chunkSize).size();
- String Content_Range = generateContentRange(0L, length, totalSize);
+ String Content_Range = generateContentRange(0L, length - 1, totalSize);
ResumableUpload uploadResponse = api().chunkUpload(BUCKET_NAME, uploadId, "application/pdf", length,
Content_Range, payload);
[2/3] jclouds-labs-google git commit: Remove bucket litter during
integration tests
Posted by ga...@apache.org.
Remove bucket litter during integration tests
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/06cf78c9
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/06cf78c9
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/06cf78c9
Branch: refs/heads/1.9.x
Commit: 06cf78c90bbb3832261363a0773d86efc1b646a2
Parents: 7073eec
Author: Andrew Gaul <ga...@apache.org>
Authored: Fri May 29 14:11:51 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Tue Jun 2 10:34:46 2015 -0700
----------------------------------------------------------------------
.../jclouds/googlecloudstorage/features/BucketApiLiveTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/06cf78c9/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java
----------------------------------------------------------------------
diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java
index 9c81aa5..12226dc 100644
--- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java
+++ b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java
@@ -116,6 +116,8 @@ public class BucketApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
assertEquals(response.name(), BUCKET_NAME_STANDARD);
assertEquals(response.location(), Location.US);
assertThat(response.storageClass()).isEqualTo(StorageClass.STANDARD);
+
+ api().deleteBucket(BUCKET_NAME_STANDARD);
}
@Test(groups = "live")
@@ -131,6 +133,8 @@ public class BucketApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
assertEquals(response.name(), BUCKET_NAME_NEARLINE);
assertEquals(response.location(), Location.US);
assertThat(response.storageClass()).isEqualTo(StorageClass.NEARLINE);
+
+ api().deleteBucket(BUCKET_NAME_NEARLINE);
}
@Test(groups = "live", dependsOnMethods = { "testCreateBucket" })