Skip to content

Commit 5bb6c11

Browse files
committed
---
yaml --- r: 1829 b: refs/heads/pubsub-alpha c: af7a08b h: refs/heads/master i: 1827: eb98930
1 parent 68a61e3 commit 5bb6c11

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
@@ -3,7 +3,7 @@ refs/heads/master: 689bbb466df4b2d5d2483d6edb8ac5c7c7f7c6fa
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
6-
refs/heads/pubsub-alpha: 603d50c0bddbc5c816ced52211cdfb6ae0e55a64
6+
refs/heads/pubsub-alpha: af7a08b4e03506fd830fa8d0fcbed8b7e279e8e1
77
refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
88
refs/heads/update-datastore: 482954f2c5055231e5b3122ea91d2ba00ce8187c
99
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

branches/pubsub-alpha/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)