Skip to content

Commit 5204aa7

Browse files
committed
---
yaml --- r: 6407 b: refs/heads/tswast-patch-1 c: af7a08b h: refs/heads/master i: 6405: 3dc33bb 6403: 0c830d0 6399: 3fe0ccd
1 parent 72cfe61 commit 5204aa7

2 files changed

Lines changed: 5 additions & 13 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 603d50c0bddbc5c816ced52211cdfb6ae0e55a64
60+
refs/heads/tswast-patch-1: af7a08b4e03506fd830fa8d0fcbed8b7e279e8e1
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,8 @@ public void testGetBucketSelectedFields() {
108108

109109
@Test
110110
public void testGetBucketAllSelectedFields() {
111-
BucketInfo remoteBucket = storage.get(BUCKET, Storage.BucketGetOption.fields(BucketField.ACL,
112-
BucketField.CORS, BucketField.DEFAULT_OBJECT_ACL, BucketField.ETAG, BucketField.ID,
113-
BucketField.LOCATION, BucketField.METAGENERATION, BucketField.NAME, BucketField.OWNER,
114-
BucketField.SELF_LINK, BucketField.STORAGE_CLASS, BucketField.TIME_CREATED,
115-
BucketField.VERSIONING, BucketField.WEBSITE));
111+
BucketInfo remoteBucket = storage.get(BUCKET,
112+
Storage.BucketGetOption.fields(BucketField.values()));
116113
assertEquals(BUCKET, remoteBucket.name());
117114
assertNotNull(remoteBucket.createTime());
118115
assertNotNull(remoteBucket.selfLink());
@@ -230,13 +227,8 @@ public void testGetBlobAllSelectedFields() {
230227
.metadata(ImmutableMap.of("k", "v"))
231228
.build();
232229
assertNotNull(storage.create(blob));
233-
BlobInfo remoteBlob = storage.get(blob.blobId(), Storage.BlobGetOption.fields(
234-
BlobField.ACL, BlobField.BUCKET, BlobField.CACHE_CONTROL, BlobField.COMPONENT_COUNT,
235-
BlobField.CONTENT_DISPOSITION, BlobField.CONTENT_ENCODING, BlobField.CONTENT_LANGUAGE,
236-
BlobField.CONTENT_TYPE, BlobField.CRC32C, BlobField.ETAG, BlobField.GENERATION,
237-
BlobField.ID, BlobField.KIND, BlobField.MD5HASH, BlobField.MEDIA_LINK, BlobField.METADATA,
238-
BlobField.METAGENERATION, BlobField.NAME, BlobField.OWNER, BlobField.SELF_LINK,
239-
BlobField.SIZE, BlobField.STORAGE_CLASS, BlobField.TIME_DELETED, BlobField.UPDATED));
230+
BlobInfo remoteBlob = storage.get(blob.blobId(),
231+
Storage.BlobGetOption.fields(BlobField.values()));
240232
assertEquals(blob.blobId(), remoteBlob.blobId());
241233
assertEquals(ImmutableMap.of("k", "v"), remoteBlob.metadata());
242234
assertNotNull(remoteBlob.id());

0 commit comments

Comments
 (0)