http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/a4acb11f/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiLiveTest.java ---------------------------------------------------------------------- diff --git a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiLiveTest.java b/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiLiveTest.java deleted file mode 100644 index c44c38b..0000000 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketAccessControlsApiLiveTest.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.googlecloudstorage.features; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; - -import java.util.List; -import java.util.UUID; - -import org.jclouds.googlecloudstorage.domain.Bucket; -import org.jclouds.googlecloudstorage.domain.BucketAccessControls; -import org.jclouds.googlecloudstorage.domain.BucketAccessControls.Role; -import org.jclouds.googlecloudstorage.domain.templates.BucketAccessControlsTemplate; -import org.jclouds.googlecloudstorage.domain.templates.BucketTemplate; -import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageApiLiveTest; -import org.testng.annotations.Test; - -public class BucketAccessControlsApiLiveTest extends BaseGoogleCloudStorageApiLiveTest { - - protected static final String BUCKET_NAME = "jcloudstestbucketacl" + UUID.randomUUID(); - - private BucketAccessControlsApi api() { - return api.getBucketAccessControlsApi(); - } - - private void createBucket(String BucketName) { - BucketTemplate template = new BucketTemplate().name(BucketName); - Bucket response = api.getBucketApi().createBucket(PROJECT_NUMBER, template); - assertNotNull(response); - } - - @Test(groups = "live") - public void testCreateBucketAcl() { - createBucket(BUCKET_NAME); - BucketAccessControlsTemplate bucketAcl = BucketAccessControlsTemplate.create("allUsers", Role.READER); - BucketAccessControls response = api().createBucketAccessControls(BUCKET_NAME, bucketAcl); - - assertNotNull(response); - assertEquals(response.id(), BUCKET_NAME + "/allUsers"); - } - - @Test(groups = "live", dependsOnMethods = "testCreateBucketAcl") - public void testUpdateBucketAcl() { - BucketAccessControlsTemplate template = BucketAccessControlsTemplate.create("allUsers", Role.WRITER); - BucketAccessControls response = api().updateBucketAccessControls(BUCKET_NAME, "allUsers", template); - - assertNotNull(response); - assertEquals(response.id(), BUCKET_NAME + "/allUsers"); - assertEquals(response.role(), Role.WRITER); - } - - @Test(groups = "live", dependsOnMethods = "testUpdateBucketAcl") - public void testGetBucketAcl() { - BucketAccessControls response = api().getBucketAccessControls(BUCKET_NAME, "allUsers"); - - assertNotNull(response); - assertEquals(response.id(), BUCKET_NAME + "/allUsers"); - assertEquals(response.role(), Role.WRITER); - } - - @Test(groups = "live", dependsOnMethods = "testUpdateBucketAcl") - public void testListBucketAcl() { - List<BucketAccessControls> response = api().listBucketAccessControls(BUCKET_NAME); - - assertNotNull(response); - } - - @Test(groups = "live", dependsOnMethods = "testUpdateBucketAcl") - public void testPatchBucketAcl() { - BucketAccessControlsTemplate template = BucketAccessControlsTemplate.create("allUsers", Role.READER); - BucketAccessControls response = api().patchBucketAccessControls(BUCKET_NAME, "allUsers", template); - - assertNotNull(response); - assertEquals(response.id(), BUCKET_NAME + "/allUsers"); - assertEquals(response.role(), Role.READER); - } - - @Test(groups = "live", dependsOnMethods = "testPatchBucketAcl") - public void testDeleteBucketAcl() { - api().deleteBucketAccessControls(BUCKET_NAME, "allUsers"); - deleteBucket(BUCKET_NAME); - } - - @Test(groups = "live", dependsOnMethods = "testDeleteBucketAcl") - public void testDeleteNotExistingBucketAccessControls() { - api().deleteBucketAccessControls(BUCKET_NAME, "allUsers"); - } - - private void deleteBucket(String BucketName) { - api.getBucketApi().deleteBucket(BucketName); - } -}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/a4acb11f/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 deleted file mode 100644 index 5c42617..0000000 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiExpectTest.java +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.googlecloudstorage.features; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; -import static org.testng.AssertJUnit.assertNull; - -import javax.ws.rs.core.MediaType; - -import org.jclouds.googlecloudstorage.domain.BucketAccessControls; -import org.jclouds.googlecloudstorage.domain.BucketAccessControls.Role; -import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Projection; -import org.jclouds.googlecloudstorage.domain.templates.BucketTemplate; -import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageApiExpectTest; -import org.jclouds.googlecloudstorage.options.GetBucketOptions; -import org.jclouds.googlecloudstorage.options.ListOptions; -import org.jclouds.googlecloudstorage.options.UpdateBucketOptions; -import org.jclouds.googlecloudstorage.parse.BucketUpdateTest; -import org.jclouds.googlecloudstorage.parse.NoAclBucketListTest; -import org.jclouds.googlecloudstorage.parse.NoAclBucketTest; -import org.jclouds.http.HttpRequest; -import org.jclouds.http.HttpResponse; -import org.testng.annotations.Test; - -@Test(groups = "unit", testName = "BucketApiExpectTest") -public class BucketApiExpectTest extends BaseGoogleCloudStorageApiExpectTest { - - private static final String EXPECTED_TEST_BUCKET = "bhashbucket"; - private static final String EXPECTED_TEST_PROJECT_NUMBER = "1082289308625"; - - private static final HttpRequest GET_BUCKET_REQUEST = HttpRequest.builder().method("GET") - .endpoint("https://www.googleapis.com/storage/v1/b/bhashbucket";).addHeader("Accept", "application/json") - .addHeader("Authorization", "Bearer " + TOKEN).build(); - - private static final HttpRequest GET_BUCKET_REQUEST_WITHOPTIONS = HttpRequest.builder().method("GET") - .endpoint("https://www.googleapis.com/storage/v1/b/bhashbucket";) - .addQueryParam("ifMetagenerationNotMatch", "100").addQueryParam("projection", "full") - .addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build(); - - private final HttpResponse BUCKET_RESPONSE = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/no_acl_bucket.json")).build(); - - public static final HttpRequest LIST_BUCKET_REQUEST = HttpRequest.builder().method("GET") - .endpoint("https://www.googleapis.com/storage/v1/b";).addQueryParam("project", EXPECTED_TEST_PROJECT_NUMBER) - .addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build(); - - 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", "jcloudstestbucket500") - .addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build(); - - private final HttpResponse LIST_BUCKET_RESPONSE = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/no_acl_bucket_list.json")).build(); - - // Test getBucket without options - public void testGetBucketWithNoOptionsResponseIs2xx() throws Exception { - - BucketApi api = requestsSendResponses(requestForScopes(STORAGE_READONLY_SCOPE), TOKEN_RESPONSE, - GET_BUCKET_REQUEST, BUCKET_RESPONSE).getBucketApi(); - - assertEquals(api.getBucket(EXPECTED_TEST_BUCKET), new NoAclBucketTest().expected()); - } - - public void testGetBucketResponseIs4xx() throws Exception { - - HttpResponse getResponse = HttpResponse.builder().statusCode(404).build(); - - BucketApi api = requestsSendResponses(requestForScopes(STORAGE_READONLY_SCOPE), TOKEN_RESPONSE, - GET_BUCKET_REQUEST, getResponse).getBucketApi(); - - assertNull("404", api.getBucket(EXPECTED_TEST_BUCKET)); - } - - // Test getBucket with options - public void testGetBucketWithOptionsResponseIs2xx() throws Exception { - - BucketApi api = requestsSendResponses(requestForScopes(STORAGE_READONLY_SCOPE), TOKEN_RESPONSE, - GET_BUCKET_REQUEST_WITHOPTIONS, BUCKET_RESPONSE).getBucketApi(); - - GetBucketOptions options = new GetBucketOptions().ifMetagenerationNotMatch(Long.valueOf(100)).projection( - Projection.FULL); - assertEquals(api.getBucket(EXPECTED_TEST_BUCKET, options), new NoAclBucketTest().expected()); - } - - // Test listBucket without options - public void testListBucketWithNoOptionsResponseIs2xx() throws Exception { - - BucketApi api = requestsSendResponses(requestForScopes(STORAGE_READONLY_SCOPE), TOKEN_RESPONSE, - LIST_BUCKET_REQUEST, LIST_BUCKET_RESPONSE).getBucketApi(); - - assertEquals(api.listBucket(EXPECTED_TEST_PROJECT_NUMBER), new NoAclBucketListTest().expected()); - - } - - public void testListBucketWithOptionsResponseIs2xx() throws Exception { - - BucketApi api = requestsSendResponses(requestForScopes(STORAGE_READONLY_SCOPE), TOKEN_RESPONSE, - LIST_BUCKET_REQUEST_WITHOPTIONS, LIST_BUCKET_RESPONSE).getBucketApi(); - - ListOptions options = new ListOptions().maxResults(2).pageToken("jcloudstestbucket500"); - - assertEquals(api.listBucket(EXPECTED_TEST_PROJECT_NUMBER, options), new NoAclBucketListTest().expected()); - - } - - @Test(enabled = false) - public void listBucketEmpty() throws Exception { - HttpResponse listResponse = null; // TODO: get a copy of an empty bucket response - - BucketApi api = requestsSendResponses(requestForScopes(STORAGE_READONLY_SCOPE), TOKEN_RESPONSE, - LIST_BUCKET_REQUEST, listResponse).getBucketApi(); - - assertTrue(api.listBucket(EXPECTED_TEST_PROJECT_NUMBER).isEmpty()); - } - - // Test createBucket without options - public void testCreateBucketWithNoOptionsResponseIs2xx() throws Exception { - - HttpRequest createRequest = HttpRequest - .builder() - .method("POST") - .endpoint("https://www.googleapis.com/storage/v1/b";) - .addHeader("Accept", "application/json") - .addQueryParam("project", EXPECTED_TEST_PROJECT_NUMBER) - .addHeader("Authorization", "Bearer " + TOKEN) - .payload(payloadFromResourceWithContentType("/bucket_insert_request_payload.json", - MediaType.APPLICATION_JSON)).build(); - - BucketApi api = requestsSendResponses(requestForScopes(STORAGE_READWRITE_SCOPE), TOKEN_RESPONSE, - createRequest, BUCKET_RESPONSE).getBucketApi(); - - BucketTemplate template = new BucketTemplate().name("bhashbucket"); - - assertEquals(api.createBucket(EXPECTED_TEST_PROJECT_NUMBER, template), new NoAclBucketTest().expected()); - - } - - public void testUpdateBucketWithNoOptionsResponseIs2xx() throws Exception { - - BucketAccessControls bucketacl = BucketAccessControls.builder().bucket(EXPECTED_TEST_BUCKET) - .entity("allAuthenticatedUsers").role(Role.OWNER).build(); - - BucketTemplate template = new BucketTemplate().name(EXPECTED_TEST_BUCKET).addAcl(bucketacl); - - HttpRequest updateRequest = HttpRequest - .builder() - .method("PUT") - .endpoint("https://www.googleapis.com/storage/v1/b/"; + EXPECTED_TEST_BUCKET) - .addHeader("Accept", "application/json") - .addHeader("Authorization", "Bearer " + TOKEN) - .payload(payloadFromResourceWithContentType("/bucket_update_request_payload.json", - MediaType.APPLICATION_JSON)).build(); - - HttpResponse updateResponse = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/bucket_update_response.json")).build(); - - BucketApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, - updateRequest, updateResponse).getBucketApi(); - - assertEquals(api.updateBucket(EXPECTED_TEST_BUCKET, template), new BucketUpdateTest().expected()); - } - - public void testUpdateBucketWithOptionsResponseIs2xx() throws Exception { - - BucketAccessControls bucketacl = BucketAccessControls.builder().bucket(EXPECTED_TEST_BUCKET) - .entity("allAuthenticatedUsers").role(Role.OWNER).build(); - UpdateBucketOptions options = new UpdateBucketOptions().projection(Projection.NO_ACL).ifMetagenerationNotMatch( - Long.valueOf(100)); - BucketTemplate template = new BucketTemplate().name(EXPECTED_TEST_BUCKET).addAcl(bucketacl); - - HttpRequest updateRequest = HttpRequest - .builder() - .method("PUT") - .endpoint("https://www.googleapis.com/storage/v1/b/"; + EXPECTED_TEST_BUCKET) - .addHeader("Accept", "application/json") - .addHeader("Authorization", "Bearer " + TOKEN) - .addQueryParam("projection", Projection.NO_ACL.toString()) - .addQueryParam("ifMetagenerationNotMatch", "100") - .payload(payloadFromResourceWithContentType("/bucket_update_request_payload.json", - MediaType.APPLICATION_JSON)).build(); - - HttpResponse updateResponse = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/bucket_update_response.json")).build(); - - BucketApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, - updateRequest, updateResponse).getBucketApi(); - - assertEquals(api.updateBucket(EXPECTED_TEST_BUCKET, template, options), new BucketUpdateTest().expected()); - } - - public void testPatchBucketWithNoOptionsResponseIs2xx() throws Exception { - - BucketAccessControls bucketacl = BucketAccessControls.builder().bucket(EXPECTED_TEST_BUCKET) - .entity("allAuthenticatedUsers").role(Role.OWNER).build(); - - BucketTemplate template = new BucketTemplate().name(EXPECTED_TEST_BUCKET).addAcl(bucketacl); - - HttpRequest patchRequest = HttpRequest - .builder() - .method("PATCH") - .endpoint("https://www.googleapis.com/storage/v1/b/"; + EXPECTED_TEST_BUCKET) - .addHeader("Accept", "application/json") - .addHeader("Authorization", "Bearer " + TOKEN) - .payload(payloadFromResourceWithContentType("/bucket_update_request_payload.json", - MediaType.APPLICATION_JSON)).build(); - - HttpResponse patchResponse = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/bucket_update_response.json")).build(); - - BucketApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, patchRequest, - patchResponse).getBucketApi(); - - assertEquals(api.patchBucket(EXPECTED_TEST_BUCKET, template), new BucketUpdateTest().expected()); - } - - public void testPatchBucketWithOptionsResponseIs2xx() throws Exception { - - BucketAccessControls bucketacl = BucketAccessControls.builder().bucket(EXPECTED_TEST_BUCKET) - .entity("allAuthenticatedUsers").role(Role.OWNER).build(); - UpdateBucketOptions options = new UpdateBucketOptions().projection(Projection.NO_ACL).ifMetagenerationNotMatch( - Long.valueOf(100)); - BucketTemplate template = new BucketTemplate().name(EXPECTED_TEST_BUCKET).addAcl(bucketacl); - - HttpRequest patchRequest = HttpRequest - .builder() - .method("PUT") - .endpoint("https://www.googleapis.com/storage/v1/b/"; + EXPECTED_TEST_BUCKET) - .addHeader("Accept", "application/json") - .addHeader("Authorization", "Bearer " + TOKEN) - .addQueryParam("projection", Projection.NO_ACL.toString()) - .addQueryParam("ifMetagenerationNotMatch", "100") - .payload(payloadFromResourceWithContentType("/bucket_update_request_payload.json", - MediaType.APPLICATION_JSON)).build(); - - HttpResponse patchResponse = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/bucket_update_response.json")).build(); - - BucketApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, patchRequest, - patchResponse).getBucketApi(); - - assertEquals(api.updateBucket(EXPECTED_TEST_BUCKET, template, options), new BucketUpdateTest().expected()); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/a4acb11f/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 deleted file mode 100644 index c59a82f..0000000 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java +++ /dev/null @@ -1,301 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.googlecloudstorage.features; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertSame; -import static org.testng.Assert.assertTrue; - -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - -import org.jclouds.googlecloud.domain.ListPage; -import org.jclouds.googlecloudstorage.domain.Bucket; -import org.jclouds.googlecloudstorage.domain.Bucket.Cors; -import org.jclouds.googlecloudstorage.domain.Bucket.Logging; -import org.jclouds.googlecloudstorage.domain.Bucket.Versioning; -import org.jclouds.googlecloudstorage.domain.BucketAccessControls; -import org.jclouds.googlecloudstorage.domain.BucketAccessControls.Role; -import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Location; -import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; -import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.Projection; -import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.StorageClass; -import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; -import org.jclouds.googlecloudstorage.domain.templates.BucketTemplate; -import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageApiLiveTest; -import org.jclouds.googlecloudstorage.options.DeleteBucketOptions; -import org.jclouds.googlecloudstorage.options.GetBucketOptions; -import org.jclouds.googlecloudstorage.options.InsertBucketOptions; -import org.jclouds.googlecloudstorage.options.UpdateBucketOptions; -import org.testng.annotations.Test; - -import com.google.common.collect.Lists; - -public class BucketApiLiveTest extends BaseGoogleCloudStorageApiLiveTest { - - // TODO: what removes these buckets? - - private static final String BUCKET_NAME = "jcloudstestbucket" + (int) (Math.random() * 10000); - - private static final String BUCKET_NAME_STANDARD = "jcloudstestbucketstandard" + (int) (Math.random() * 10000); - - private static final String BUCKET_NAME_COLDLINE = "jcloudstestbucketcoldline" + (int) (Math.random() * 10000); - - private static final String BUCKET_NAME_MULTI_REGIONAL = "jcloudstestbucketmultiregional" + (int) (Math.random() * 10000); - - private static final String BUCKET_NAME_NEARLINE = "jcloudstestbucketnearline" + (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); - - private Long metageneration; - - private BucketApi api() { - return api.getBucketApi(); - } - - // TODO: should this test use STANDARD storage class? - @Test(groups = "live") - public void testCreateBucket() { - - BucketTemplate logTemplate = new BucketTemplate().name(LOG_BUCKET_NAME); - Bucket logResponse = api().createBucket(PROJECT_NUMBER, logTemplate); - assertNotNull(logResponse); - - BucketAccessControls acl = BucketAccessControls.builder().bucket(BUCKET_NAME).entity("allUsers").role(Role.OWNER) - .build(); - ObjectAccessControls oac = ObjectAccessControls.builder().bucket(BUCKET_NAME).entity("allUsers") - .role(ObjectRole.OWNER).build(); - Cors cors = Cors.create(Arrays.asList("http://example.appspot.com";), Arrays.asList("GET", "HEAD"), - Arrays.asList("x-meta-goog-custom"), 10); - Versioning version = Versioning.create(true); - - Logging log = Logging.create(LOG_BUCKET_NAME, BUCKET_NAME); - - BucketTemplate template = new BucketTemplate().name(BUCKET_NAME).addAcl(acl).addDefaultObjectAccessControls(oac) - .versioning(version).location(Location.US_CENTRAL2).logging(log) - .storageClass(StorageClass.DURABLE_REDUCED_AVAILABILITY).addCORS(cors); - - Bucket response = api().createBucket(PROJECT_NUMBER, template); - - assertNotNull(response); - assertNotNull(response.cors()); - assertTrue(response.cors().size() == 1); - assertEquals(response.name(), BUCKET_NAME); - assertEquals(response.location(), Location.US_CENTRAL2); - assertThat(response.storageClass()).isEqualTo(StorageClass.DURABLE_REDUCED_AVAILABILITY); - assertTrue(response.versioning().enabled()); - } - - @Test(groups = "live") - public void testCreateBucketStandard() { - BucketTemplate template = new BucketTemplate() - .name(BUCKET_NAME_STANDARD) - .location(Location.US) - .storageClass(StorageClass.STANDARD); - - Bucket response = api().createBucket(PROJECT_NUMBER, template); - - assertNotNull(response); - 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") - public void testCreateBucketColdline() { - BucketTemplate template = new BucketTemplate() - .name(BUCKET_NAME_COLDLINE) - .location(Location.US) - .storageClass(StorageClass.COLDLINE); - - Bucket response = api().createBucket(PROJECT_NUMBER, template); - - assertNotNull(response); - assertEquals(response.name(), BUCKET_NAME_COLDLINE); - assertEquals(response.location(), Location.US); - assertThat(response.storageClass()).isEqualTo(StorageClass.COLDLINE); - - api().deleteBucket(BUCKET_NAME_COLDLINE); - } - - @Test(groups = "live") - public void testCreateBucketMultiregional() { - BucketTemplate template = new BucketTemplate() - .name(BUCKET_NAME_MULTI_REGIONAL) - .location(Location.US) - .storageClass(StorageClass.MULTI_REGIONAL); - - Bucket response = api().createBucket(PROJECT_NUMBER, template); - - assertNotNull(response); - assertEquals(response.name(), BUCKET_NAME_MULTI_REGIONAL); - assertEquals(response.location(), Location.US); - assertThat(response.storageClass()).isEqualTo(StorageClass.MULTI_REGIONAL); - - api().deleteBucket(BUCKET_NAME_NEARLINE); - } - - @Test(groups = "live") - public void testCreateBucketNearline() { - BucketTemplate template = new BucketTemplate() - .name(BUCKET_NAME_NEARLINE) - .location(Location.US) - .storageClass(StorageClass.NEARLINE); - - Bucket response = api().createBucket(PROJECT_NUMBER, template); - - assertNotNull(response); - 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" }) - public void testCreateAlreadyExistBucket() { - - BucketTemplate template = new BucketTemplate().name(BUCKET_NAME).location(Location.US_CENTRAL2) - .storageClass(StorageClass.DURABLE_REDUCED_AVAILABILITY); - - assertNull(api().createBucket(PROJECT_NUMBER, template)); - } - - @Test(groups = "live") - public void testCreateBucketWithOptions() { - ObjectAccessControls oac = ObjectAccessControls.builder().bucket(BUCKET_NAME_WITHOPTIONS) - .entity("allUsers").role(ObjectRole.OWNER).build(); - Cors cors = Cors.create(Arrays.asList("http://example.appspot.com";), Arrays.asList("GET", "HEAD"), - Arrays.asList("x-meta-goog-custom"), 10); - Versioning version = Versioning.create(true); - - BucketTemplate template = new BucketTemplate().name(BUCKET_NAME_WITHOPTIONS).addDefaultObjectAccessControls(oac) - .versioning(version).location(Location.US_CENTRAL2) - .storageClass(StorageClass.DURABLE_REDUCED_AVAILABILITY).addCORS(cors); - - InsertBucketOptions options = new InsertBucketOptions().projection(Projection.FULL); - - Bucket response = api().createBucket(PROJECT_NUMBER, template, options); - - assertNotNull(response); - assertNotNull(response.cors()); - assertEquals(response.name(), BUCKET_NAME_WITHOPTIONS); - assertEquals(response.location(), Location.US_CENTRAL2); - assertTrue(response.versioning().enabled()); - } - - @Test(groups = "live", dependsOnMethods = "testCreateBucket") - public void testUpdateBucket() { - BucketAccessControls bucketacl = BucketAccessControls.builder().bucket(BUCKET_NAME) - .entity("allAuthenticatedUsers").role(Role.OWNER).build(); - BucketTemplate template = new BucketTemplate().name(BUCKET_NAME).addAcl(bucketacl); - Bucket response = api().updateBucket(BUCKET_NAME, template); - - assertNotNull(response); - assertEquals(response.name(), BUCKET_NAME); - assertNotNull(response.acl()); - } - - @Test(groups = "live", dependsOnMethods = "testCreateBucketWithOptions") - public void testUpdateBucketWithOptions() { - BucketAccessControls bucketacl = BucketAccessControls.builder().bucket(BUCKET_NAME_WITHOPTIONS) - .entity("allAuthenticatedUsers").role(Role.OWNER).build(); - UpdateBucketOptions options = new UpdateBucketOptions().projection(Projection.FULL); - BucketTemplate template = new BucketTemplate().name(BUCKET_NAME_WITHOPTIONS).addAcl(bucketacl); - Bucket response = api().updateBucket(BUCKET_NAME_WITHOPTIONS, template, options); - - assertNotNull(response); - - metageneration = response.metageneration(); - - assertEquals(response.name(), BUCKET_NAME_WITHOPTIONS); - assertNotNull(response.acl()); - } - - @Test(groups = "live", dependsOnMethods = "testCreateBucket") - public void testGetBucket() { - Bucket response = api().getBucket(BUCKET_NAME); - - assertNotNull(response); - assertEquals(response.name(), BUCKET_NAME); - } - - @Test(groups = "live", dependsOnMethods = "testUpdateBucketWithOptions") - public void testGetBucketWithOptions() { - GetBucketOptions options = new GetBucketOptions().ifMetagenerationMatch(metageneration); - Bucket response = api().getBucket(BUCKET_NAME_WITHOPTIONS, options); - - assertNotNull(response); - assertEquals(response.name(), BUCKET_NAME_WITHOPTIONS); - } - - @Test(groups = "live", dependsOnMethods = "testCreateBucket") - public void testListBucket() { - ListPage<Bucket> bucket = api().listBucket(PROJECT_NUMBER); - - Iterator<Bucket> pageIterator = bucket.iterator(); - assertTrue(pageIterator.hasNext()); - - Bucket iteratedBucket = pageIterator.next(); - List<Bucket> bucketAsList = Lists.newArrayList(iteratedBucket); - - assertNotNull(iteratedBucket); - assertSame(bucketAsList.size(), 1); - } - - @Test(groups = "live", dependsOnMethods = "testCreateBucket") - public void testPatchBucket() { - Logging logging = Logging.create(LOG_BUCKET_NAME, BUCKET_NAME); - BucketTemplate template = new BucketTemplate().name(BUCKET_NAME).logging(logging); - - Bucket response = api().patchBucket(BUCKET_NAME, template); - - assertNotNull(response); - assertEquals(response.name(), BUCKET_NAME); - assertEquals(response.logging().logBucket(), LOG_BUCKET_NAME); - } - - @Test(groups = "live", dependsOnMethods = { "testListBucket", "testGetBucket", "testUpdateBucket" }) - public void testDeleteBucket() { - assertTrue(api().deleteBucket(BUCKET_NAME)); - assertTrue(api().deleteBucket(LOG_BUCKET_NAME)); - } - - @Test(groups = "live", dependsOnMethods = { "testDeleteBucket" }) - public void testDeleteNotExistingBucket() { - assertFalse(api().deleteBucket(BUCKET_NAME)); - } - - @Test(groups = "live", dependsOnMethods = { "testGetBucketWithOptions" }) - public void testDeleteBucketWithOptions() { - - DeleteBucketOptions options = new DeleteBucketOptions().ifMetagenerationMatch(metageneration) - .ifMetagenerationNotMatch(metageneration + 1); - - api().deleteBucket(BUCKET_NAME_WITHOPTIONS, options); - - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/a4acb11f/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 deleted file mode 100644 index 42804be..0000000 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiExpectTest.java +++ /dev/null @@ -1,219 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jclouds.googlecloudstorage.features; - -import static org.testng.Assert.assertEquals; -import static org.testng.AssertJUnit.assertNull; - -import javax.ws.rs.core.MediaType; - -import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; -import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; -import org.jclouds.googlecloudstorage.domain.templates.ObjectAccessControlsTemplate; -import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageApiExpectTest; -import org.jclouds.googlecloudstorage.parse.DefaultObjectAclGetTest; -import org.jclouds.googlecloudstorage.parse.DefaultObjectAclInsertTest; -import org.jclouds.googlecloudstorage.parse.DefaultObjectAclListTest; -import org.jclouds.http.HttpRequest; -import org.jclouds.http.HttpResponse; -import org.testng.annotations.Test; - -@Test(groups = "unit", testName = "DefaultObjectAccessControlsApiExpectTest") -public class DefaultObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApiExpectTest { - - 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/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) - .payload(staticPayloadFromResource("/default_object_acl_get.json")).build(); - - private final HttpResponse CREATE_DEFAULT_OBJECT_ACL_RESPONSE = HttpResponse.builder().statusCode(200) - .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/jcloudstestbucket/defaultObjectAcl";) - .addHeader("Accept", "application/json").addHeader("Authorization", "Bearer " + TOKEN).build(); - - private final HttpResponse LIST_DEFAULT_OBJECT_ACL_RESPONSE = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/default_object_acl_list.json")).build(); - - // Test getDefaultObjectAccessControls - public void testGetDefaultObjectAclResponseIs2xx() throws Exception { - - DefaultObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), - TOKEN_RESPONSE, GET_DEFAULT_OBJECT_ACL_REQUEST, GET_DEFAULT_OBJECT_ACL_RESPONSE) - .getDefaultObjectAccessControlsApi(); - - assertEquals(api.getDefaultObjectAccessControls(EXPECTED_TEST_BUCKET, EXPECTED_TEST_GROUP_ENTITY), - new DefaultObjectAclGetTest().expected()); - } - - public void testGetDefaultObjectAclResponseIs4xx() throws Exception { - - HttpResponse getResponse = HttpResponse.builder().statusCode(404).build(); - - DefaultObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), - TOKEN_RESPONSE, GET_DEFAULT_OBJECT_ACL_REQUEST, getResponse).getDefaultObjectAccessControlsApi(); - - assertNull(api.getDefaultObjectAccessControls(EXPECTED_TEST_BUCKET, EXPECTED_TEST_GROUP_ENTITY)); - } - - // Test listDefaultObjectAccessControls - public void testListDefaultObjectAclWithNoOptionsResponseIs2xx() throws Exception { - - DefaultObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), - TOKEN_RESPONSE, LIST_DEFAULT_OBJECT_ACL_REQUEST, LIST_DEFAULT_OBJECT_ACL_RESPONSE) - .getDefaultObjectAccessControlsApi(); - - assertEquals(api.listDefaultObjectAccessControls(EXPECTED_TEST_BUCKET), new DefaultObjectAclListTest().expected()); - } - - public void testListDefaultObjectAclResponseIs4xx() throws Exception { - - HttpResponse listResponse = HttpResponse.builder().statusCode(404).build(); - - DefaultObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), - TOKEN_RESPONSE, LIST_DEFAULT_OBJECT_ACL_REQUEST, listResponse).getDefaultObjectAccessControlsApi(); - - assertNull(api.listDefaultObjectAccessControls(EXPECTED_TEST_BUCKET)); - } - - // Test insertDefaultObjectAccessControls - public void testInsertDefaultObjectAclResponseIs2xx() throws Exception { - HttpRequest insertRequest = HttpRequest - .builder() - .method("POST") - .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", - MediaType.APPLICATION_JSON)).build(); - - DefaultObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), - TOKEN_RESPONSE, insertRequest, CREATE_DEFAULT_OBJECT_ACL_RESPONSE).getDefaultObjectAccessControlsApi(); - - ObjectAccessControlsTemplate template = ObjectAccessControlsTemplate.create("allUsers", ObjectRole.OWNER); - - assertEquals(api.createDefaultObjectAccessControls(EXPECTED_TEST_BUCKET, template), - new DefaultObjectAclInsertTest().expected()); - } - - // Test deleteDefaultObjectAccessControls - public void testDeleteDefaultObjectAclResponseIs2xx() throws Exception { - HttpRequest delete = HttpRequest.builder().method("DELETE") - .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(); - - DefaultObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), - TOKEN_RESPONSE, delete, deleteResponse).getDefaultObjectAccessControlsApi(); - - assertEquals(api.deleteDefaultObjectAccessControls(EXPECTED_TEST_BUCKET, "allUsers"), deleteResponse); - } - - public void testDeleteObjectAclResponseIs4xx() throws Exception { - HttpRequest delete = HttpRequest.builder().method("DELETE") - .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(); - - DefaultObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), - TOKEN_RESPONSE, delete, deleteResponse).getDefaultObjectAccessControlsApi(); - - assertNull(api.deleteDefaultObjectAccessControls(EXPECTED_TEST_BUCKET, "allUsers")); - } - - // Test updateDefaultObjectAccessControls - public void testUpdateDefaultObjectAclWithNoOptionsResponseIs2xx() throws Exception { - HttpRequest update = HttpRequest - .builder() - .method("PUT") - .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", - MediaType.APPLICATION_JSON)).build(); - - HttpResponse updateResponse = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/default_object_acl_update_initial.json")).build(); - - DefaultObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), - TOKEN_RESPONSE, update, updateResponse).getDefaultObjectAccessControlsApi(); - - ObjectAccessControls options = ObjectAccessControls.builder().entity("allUsers").role(ObjectRole.OWNER).build(); - - assertEquals(api.updateDefaultObjectAccessControls(EXPECTED_TEST_BUCKET, "allUsers", options), - new DefaultObjectAclInsertTest().expected()); - } - - // Test updateDefaultObjectAccessControls - public void testUpdateDefaultObjectAclWithOptionsResponseIs2xx() throws Exception { - HttpRequest update = HttpRequest - .builder() - .method("PUT") - .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/defaultObjectAcl/allUsers";) - .addHeader("Accept", "application/json") - .addHeader("Authorization", "Bearer " + TOKEN) - .addQueryParam("role", ObjectRole.OWNER.toString()) - .payload(payloadFromResourceWithContentType("/default_object_acl_update_request_payload.json", - MediaType.APPLICATION_JSON)).build(); - - HttpResponse updateResponse = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/default_object_acl_update_initial.json")).build(); - - DefaultObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), - TOKEN_RESPONSE, update, updateResponse).getDefaultObjectAccessControlsApi(); - - ObjectAccessControls options = ObjectAccessControls.builder().entity("allUsers").role(ObjectRole.OWNER).build(); - - assertEquals(api.updateDefaultObjectAccessControls(EXPECTED_TEST_BUCKET, "allUsers", options, ObjectRole.OWNER), - new DefaultObjectAclInsertTest().expected()); - } - - // Test patchDefaultObjectAccessControls - public void testPatchDefaultObjectAclWithNoOptionsResponseIs2xx() throws Exception { - HttpRequest update = HttpRequest - .builder() - .method("PATCH") - .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", - MediaType.APPLICATION_JSON)).build(); - - HttpResponse updateResponse = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/default_object_acl_update_initial.json")).build(); - - DefaultObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), - TOKEN_RESPONSE, update, updateResponse).getDefaultObjectAccessControlsApi(); - - ObjectAccessControls options = ObjectAccessControls.builder().entity("allUsers").role(ObjectRole.OWNER).build(); - - assertEquals(api.patchDefaultObjectAccessControls(EXPECTED_TEST_BUCKET, "allUsers", options), - new DefaultObjectAclInsertTest().expected()); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/a4acb11f/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 deleted file mode 100644 index d2697d4..0000000 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.googlecloudstorage.features; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; - -import java.util.List; -import java.util.UUID; - -import org.jclouds.googlecloudstorage.domain.Bucket; -import org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole; -import org.jclouds.googlecloudstorage.domain.ObjectAccessControls; -import org.jclouds.googlecloudstorage.domain.templates.BucketTemplate; -import org.jclouds.googlecloudstorage.domain.templates.ObjectAccessControlsTemplate; -import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageApiLiveTest; -import org.testng.annotations.Test; - -public class DefaultObjectAccessControlsApiLiveTest extends BaseGoogleCloudStorageApiLiveTest { - - protected static final String BUCKET_NAME = "jcloudsdefaultoacltest" + UUID.randomUUID(); - - private DefaultObjectAccessControlsApi api() { - return api.getDefaultObjectAccessControlsApi(); - } - - private void createBucket(String BucketName) { - BucketTemplate template = new BucketTemplate().name(BucketName); - Bucket response = api.getBucketApi().createBucket(PROJECT_NUMBER, template); - assertNotNull(response); - } - - @Test(groups = "live") - public void testCreateDefaultObjectAcl() { - createBucket(BUCKET_NAME); - ObjectAccessControlsTemplate template = ObjectAccessControlsTemplate.create("allUsers", ObjectRole.READER); - - ObjectAccessControls response = api().createDefaultObjectAccessControls(BUCKET_NAME, template); - - assertNotNull(response); - assertEquals(response.entity(), "allUsers"); - assertEquals(response.role(), ObjectRole.READER); - } - - @Test(groups = "live", dependsOnMethods = "testCreateDefaultObjectAcl") - public void testUpdateDefaultObjectAcl() { - ObjectAccessControls defaultObjectAcl = ObjectAccessControls.builder().bucket(BUCKET_NAME) - .entity("allUsers").role(ObjectRole.OWNER).build(); - ObjectAccessControls response = api().updateDefaultObjectAccessControls(BUCKET_NAME, "allUsers", defaultObjectAcl); - - assertNotNull(response); - assertEquals(response.entity(), "allUsers"); - assertEquals(response.role(), ObjectRole.OWNER); - } - - @Test(groups = "live", dependsOnMethods = "testUpdateDefaultObjectAcl") - public void testGetDefaultObjectAcl() { - ObjectAccessControls response = api().getDefaultObjectAccessControls(BUCKET_NAME, "allUsers"); - - assertNotNull(response); - assertEquals(response.entity(), "allUsers"); - assertEquals(response.role(), ObjectRole.OWNER); - } - - @Test(groups = "live", dependsOnMethods = "testUpdateDefaultObjectAcl") - public void testListDefaultObjectAcl() { - List<ObjectAccessControls> response = api().listDefaultObjectAccessControls(BUCKET_NAME); - assertNotNull(response); - } - - @Test(groups = "live", dependsOnMethods = "testUpdateDefaultObjectAcl") - public void testPatchDefaultObjectAcl() { - ObjectAccessControls defaultObjectAcl = ObjectAccessControls.builder().bucket(BUCKET_NAME) - .entity("allUsers").role(ObjectRole.READER).build(); - ObjectAccessControls response = api().patchDefaultObjectAccessControls(BUCKET_NAME, "allUsers", defaultObjectAcl); - - assertNotNull(response); - assertEquals(response.entity(), "allUsers"); - assertEquals(response.role(), ObjectRole.READER); - } - - @Test(groups = "live", dependsOnMethods = "testPatchDefaultObjectAcl") - public void testDeleteBucketAcl() { - api().deleteDefaultObjectAccessControls(BUCKET_NAME, "allUsers"); - deleteBucket(BUCKET_NAME); - } - - @Test(groups = "live", dependsOnMethods = "testDeleteBucketAcl") - public void testDeleteNotExistingBucketAccessControls() { - api().deleteDefaultObjectAccessControls(BUCKET_NAME, "allUsers"); - } - - private void deleteBucket(String bucketName) { - api.getBucketApi().deleteBucket(bucketName); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/a4acb11f/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 deleted file mode 100644 index abf6010..0000000 --- a/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectAccessControlsApiExpectTest.java +++ /dev/null @@ -1,276 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jclouds.googlecloudstorage.features; - -import static org.jclouds.googlecloudstorage.domain.DomainResourceReferences.ObjectRole.OWNER; -import static org.testng.Assert.assertEquals; -import static org.testng.AssertJUnit.assertNull; - -import javax.ws.rs.core.MediaType; - -import org.jclouds.googlecloudstorage.domain.templates.ObjectAccessControlsTemplate; -import org.jclouds.googlecloudstorage.internal.BaseGoogleCloudStorageApiExpectTest; -import org.jclouds.googlecloudstorage.parse.ObjectAclGetTest; -import org.jclouds.googlecloudstorage.parse.ObjectAclInsertTest; -import org.jclouds.googlecloudstorage.parse.ObjectAclListTest; -import org.jclouds.googlecloudstorage.parse.ObjectAclUpdateTest; -import org.jclouds.http.HttpRequest; -import org.jclouds.http.HttpResponse; -import org.testng.annotations.Test; - -@Test(groups = "unit", testName = "ObjectAccessControlsApiExpectTest") -public class ObjectAccessControlsApiExpectTest extends BaseGoogleCloudStorageApiExpectTest { - - 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"; - - public static final HttpRequest GET_OBJECT_ACL_REQUEST = HttpRequest - .builder() - .method("GET") - .endpoint( - "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/jcloudstestbucket/o/foo.txt/acl/group-00b4903a971ec6cff233284d6d24f5bf5cba904c4ade4d43ebd6a5d33800e68b";) - .addQueryParam("generation", "100").addHeader("Accept", "application/json") - .addHeader("Authorization", "Bearer " + TOKEN).build(); - - public final HttpResponse GET_OBJECT_ACL_RESPONSE = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/object_acl_get.json")).build(); - - public final HttpResponse CREATE_OBJECT_ACL_RESPONSE = HttpResponse.builder().statusCode(200) - .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/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/jcloudstestbucket/o/foo.txt/acl";) - .addQueryParam("generation", "100").addHeader("Accept", "application/json") - .addHeader("Authorization", "Bearer " + TOKEN).build(); - - public final HttpResponse LIST_OBJECT_ACL_RESPONSE = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/object_acl_list.json")).build(); - - // Test getObjectAccessControls - public void testGetObjectaclWithNoOptionsResponseIs2xx() throws Exception { - - ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, - GET_OBJECT_ACL_REQUEST, GET_OBJECT_ACL_RESPONSE).getObjectAccessControlsApi(); - - assertEquals(api.getObjectAccessControls(EXPECTED_TEST_BUCKET, EXPECTED_TEST_OBJECT, EXPECTED_TEST_GROUP_ENTITY), - new ObjectAclGetTest().expected()); - } - - public void testGetObjectaclWithOptionsResponseIs2xx() throws Exception { - - ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, - GET_OBJECT_ACL_REQUEST_WITHOPTIONS, GET_OBJECT_ACL_RESPONSE).getObjectAccessControlsApi(); - - assertEquals( - api.getObjectAccessControls(EXPECTED_TEST_BUCKET, EXPECTED_TEST_OBJECT, EXPECTED_TEST_GROUP_ENTITY, - Long.valueOf(100)), new ObjectAclGetTest().expected()); - } - - public void testGetObjectaclResponseIs4xx() throws Exception { - - HttpResponse getResponse = HttpResponse.builder().statusCode(404).build(); - - ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, - GET_OBJECT_ACL_REQUEST, getResponse).getObjectAccessControlsApi(); - - assertNull(api.getObjectAccessControls(EXPECTED_TEST_BUCKET, EXPECTED_TEST_OBJECT, EXPECTED_TEST_GROUP_ENTITY)); - } - - // Test listObjectAccessControls - public void testListObjectaclWithNoOptionsResponseIs2xx() throws Exception { - - ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, - LIST_OBJECT_ACL_REQUEST, LIST_OBJECT_ACL_RESPONSE).getObjectAccessControlsApi(); - - assertEquals(api.listObjectAccessControls(EXPECTED_TEST_BUCKET, EXPECTED_TEST_OBJECT), - new ObjectAclListTest().expected()); - - } - - // Test listObjectAccessControls - public void testListObjectaclWithOptionsResponseIs2xx() throws Exception { - - ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, - LIST_OBJECT_ACL_REQUEST_WITHOPTIONS, LIST_OBJECT_ACL_RESPONSE).getObjectAccessControlsApi(); - - assertEquals(api.listObjectAccessControls(EXPECTED_TEST_BUCKET, EXPECTED_TEST_OBJECT, Long.valueOf(100)), - new ObjectAclListTest().expected()); - - } - - public void testListObjectaclResponseIs4xx() throws Exception { - - HttpResponse listResponse = HttpResponse.builder().statusCode(404).build(); - - ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, - LIST_OBJECT_ACL_REQUEST, listResponse).getObjectAccessControlsApi(); - - assertNull(api.listObjectAccessControls(EXPECTED_TEST_BUCKET, EXPECTED_TEST_OBJECT)); - } - - // Test insertObjectAccessControls - public void testInsertObjectaclWithNoOptionsResponseIs2xx() throws Exception { - HttpRequest insertRequest = HttpRequest - .builder() - .method("POST") - .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", - MediaType.APPLICATION_JSON)).build(); - - ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, - insertRequest, CREATE_OBJECT_ACL_RESPONSE).getObjectAccessControlsApi(); - - ObjectAccessControlsTemplate template = ObjectAccessControlsTemplate.create(EXPECTED_TEST_USER_ENTITY, OWNER); - - assertEquals(api.createObjectAccessControls(EXPECTED_TEST_BUCKET, EXPECTED_TEST_OBJECT, template), - new ObjectAclInsertTest().expected()); - - } - - public void testInsertObjectaclWithOptionsResponseIs2xx() throws Exception { - HttpRequest insertRequest = HttpRequest - .builder() - .method("POST") - .endpoint("https://www.googleapis.com/storage/v1/b/jcloudstestbucket/o/foo.txt/acl";) - .addHeader("Accept", "application/json") - .addHeader("Authorization", "Bearer " + TOKEN) - .addQueryParam("generation", "100") - .payload(payloadFromResourceWithContentType("/object_acl_insert_request_payload.json", - MediaType.APPLICATION_JSON)).build(); - - ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, - insertRequest, CREATE_OBJECT_ACL_RESPONSE).getObjectAccessControlsApi(); - - ObjectAccessControlsTemplate template = ObjectAccessControlsTemplate - .create("user-00b4903a97adfde729f0650133a7379693099d8d85d6b1b18255ca70bf89e31d", OWNER); - - assertEquals( - api.createObjectAccessControls(EXPECTED_TEST_BUCKET, EXPECTED_TEST_OBJECT, template, Long.valueOf(100)), - new ObjectAclInsertTest().expected()); - - } - - // Test updateObjectAccessControls - public void testUpdateObjectaclWithNoOptionsResponseIs2xx() throws Exception { - HttpRequest update = HttpRequest - .builder() - .method("PUT") - .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", - MediaType.APPLICATION_JSON)).build(); - - HttpResponse updateResponse = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/object_acl_update_initial.json")).build(); - - ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, - update, updateResponse).getObjectAccessControlsApi(); - - ObjectAccessControlsTemplate template = ObjectAccessControlsTemplate.create("allUsers", OWNER); - - assertEquals(api.updateObjectAccessControls(EXPECTED_TEST_BUCKET, EXPECTED_TEST_OBJECT, "allUsers", template), - new ObjectAclUpdateTest().expected()); - } - - public void testUpdateObjectaclWithOptionsResponseIs2xx() throws Exception { - HttpRequest update = HttpRequest - .builder() - .method("PUT") - .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) - .payload(payloadFromResourceWithContentType("/object_acl_request_payload.json", - MediaType.APPLICATION_JSON)).build(); - - HttpResponse updateResponse = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/object_acl_update_initial.json")).build(); - - ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, - update, updateResponse).getObjectAccessControlsApi(); - - ObjectAccessControlsTemplate template = ObjectAccessControlsTemplate.create("allUsers", OWNER); - - assertEquals( - api.updateObjectAccessControls(EXPECTED_TEST_BUCKET, EXPECTED_TEST_OBJECT, "allUsers", template, - Long.valueOf(100)), new ObjectAclUpdateTest().expected()); - } - - // Test updateObjectAccessControls - public void testPatchObjectaclWithNoOptionsResponseIs2xx() throws Exception { - HttpRequest patchRequest = HttpRequest - .builder() - .method("PATCH") - .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", - MediaType.APPLICATION_JSON)).build(); - - HttpResponse patchResponse = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/object_acl_update_initial.json")).build(); - - ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, - patchRequest, patchResponse).getObjectAccessControlsApi(); - - ObjectAccessControlsTemplate template = ObjectAccessControlsTemplate.create("allUsers", OWNER); - - assertEquals(api.patchObjectAccessControls(EXPECTED_TEST_BUCKET, EXPECTED_TEST_OBJECT, "allUsers", template), - new ObjectAclUpdateTest().expected()); - } - - public void testPatchObjectaclWithOptionsResponseIs2xx() throws Exception { - HttpRequest patchRequest = HttpRequest - .builder() - .method("PATCH") - .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) - .payload(payloadFromResourceWithContentType("/object_acl_request_payload.json", - MediaType.APPLICATION_JSON)).build(); - - HttpResponse patchResponse = HttpResponse.builder().statusCode(200) - .payload(staticPayloadFromResource("/object_acl_update_initial.json")).build(); - - ObjectAccessControlsApi api = requestsSendResponses(requestForScopes(STORAGE_FULLCONTROL_SCOPE), TOKEN_RESPONSE, - patchRequest, patchResponse).getObjectAccessControlsApi(); - - ObjectAccessControlsTemplate template = ObjectAccessControlsTemplate.create("allUsers", OWNER); - assertEquals( - api.patchObjectAccessControls(EXPECTED_TEST_BUCKET, EXPECTED_TEST_OBJECT, "allUsers", template, - Long.valueOf(100)), new ObjectAclUpdateTest().expected()); - } - -}
