Skip to content

Commit 7ede22d

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 1651 b: refs/heads/master c: 75dbbf8 h: refs/heads/master i: 1649: 7acc5da 1647: efa89f7
1 parent fbf8307 commit 7ede22d

7 files changed

Lines changed: 120 additions & 17 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 6870eb7a5f21d78d5f067a0f43cf6140c3211e60
2+
refs/heads/master: 75dbbf8263003e5df370c74bd2a96942b36d35ff
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: d1b373c30c176edc08692348167bec3a244bb823
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3

‎trunk/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ public static class Builder extends ProjectInfo.Builder {
4242
private final ResourceManager resourceManager;
4343
private final ProjectInfo.BuilderImpl infoBuilder;
4444

45-
Builder(ResourceManager resourceManager) {
46-
this.resourceManager = resourceManager;
47-
this.infoBuilder = new ProjectInfo.BuilderImpl();
48-
}
49-
5045
Builder(Project project) {
5146
this.resourceManager = project.resourceManager;
5247
this.infoBuilder = new ProjectInfo.BuilderImpl(project);

‎trunk/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.google.common.collect.ImmutableMap;
2929

3030
import org.junit.After;
31+
import org.junit.Before;
3132
import org.junit.Test;
3233

3334
import java.util.Map;
@@ -53,6 +54,11 @@ public class ProjectTest {
5354
private Project expectedProject;
5455
private Project project;
5556

57+
@Before
58+
public void setUp() {
59+
resourceManager = createStrictMock(ResourceManager.class);
60+
}
61+
5662
@After
5763
public void tearDown() throws Exception {
5864
verify(resourceManager);
@@ -61,7 +67,6 @@ public void tearDown() throws Exception {
6167
private void initializeExpectedProject(int optionsCalls) {
6268
expect(serviceMockReturnsOptions.options()).andReturn(mockOptions).times(optionsCalls);
6369
replay(serviceMockReturnsOptions);
64-
resourceManager = createStrictMock(ResourceManager.class);
6570
expectedProject =
6671
new Project(serviceMockReturnsOptions, new ProjectInfo.BuilderImpl(PROJECT_INFO));
6772
}
@@ -77,6 +82,28 @@ public void testToBuilder() {
7782
compareProjects(expectedProject, expectedProject.toBuilder().build());
7883
}
7984

85+
@Test
86+
public void testBuilder() {
87+
initializeExpectedProject(4);
88+
expect(resourceManager.options()).andReturn(mockOptions).times(4);
89+
replay(resourceManager);
90+
Project.Builder builder = new Project.Builder(new Project(resourceManager, new ProjectInfo.BuilderImpl()));
91+
Project project = builder.name(NAME)
92+
.projectId(PROJECT_ID)
93+
.labels(LABELS)
94+
.projectNumber(PROJECT_NUMBER)
95+
.createTimeMillis(CREATE_TIME_MILLIS)
96+
.state(STATE)
97+
.build();
98+
assertEquals(PROJECT_ID, project.projectId());
99+
assertEquals(NAME, project.name());
100+
assertEquals(LABELS, project.labels());
101+
assertEquals(PROJECT_NUMBER, project.projectNumber());
102+
assertEquals(CREATE_TIME_MILLIS, project.createTimeMillis());
103+
assertEquals(STATE, project.state());
104+
assertEquals(resourceManager.options(), project.resourceManager().options());
105+
}
106+
80107
@Test
81108
public void testGet() {
82109
initializeExpectedProject(1);

‎trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,6 @@ public static class Builder extends BlobInfo.Builder {
162162
private final Storage storage;
163163
private final BlobInfo.BuilderImpl infoBuilder;
164164

165-
Builder(Storage storage) {
166-
this.storage = storage;
167-
this.infoBuilder = new BlobInfo.BuilderImpl();
168-
}
169-
170165
Builder(Blob blob) {
171166
this.storage = blob.storage();
172167
this.infoBuilder = new BlobInfo.BuilderImpl(blob);

‎trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,6 @@ public static class Builder extends BucketInfo.Builder {
126126
private final Storage storage;
127127
private final BucketInfo.BuilderImpl infoBuilder;
128128

129-
Builder(Storage storage) {
130-
this.storage = storage;
131-
this.infoBuilder = new BucketInfo.BuilderImpl();
132-
}
133-
134129
Builder(Bucket bucket) {
135130
this.storage = bucket.storage;
136131
this.infoBuilder = new BucketInfo.BuilderImpl(bucket);

‎trunk/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BlobTest.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,4 +312,53 @@ public void testToBuilder() {
312312
Blob simpleBlob = new Blob(storage, new BlobInfo.BuilderImpl(BLOB_INFO));
313313
assertEquals(simpleBlob, simpleBlob.toBuilder().build());
314314
}
315+
316+
@Test
317+
public void testBuilder() {
318+
initializeExpectedBlob(4);
319+
expect(storage.options()).andReturn(mockOptions).times(2);
320+
replay(storage);
321+
Blob.Builder builder = new Blob.Builder(new Blob(storage, new BlobInfo.BuilderImpl(BLOB_INFO)));
322+
Blob blob = builder.acl(ACL)
323+
.componentCount(COMPONENT_COUNT)
324+
.contentType(CONTENT_TYPE)
325+
.cacheControl(CACHE_CONTROL)
326+
.contentDisposition(CONTENT_DISPOSITION)
327+
.contentEncoding(CONTENT_ENCODING)
328+
.contentLanguage(CONTENT_LANGUAGE)
329+
.crc32c(CRC32)
330+
.deleteTime(DELETE_TIME)
331+
.etag(ETAG)
332+
.id(ID)
333+
.md5(MD5)
334+
.mediaLink(MEDIA_LINK)
335+
.metadata(METADATA)
336+
.metageneration(META_GENERATION)
337+
.owner(OWNER)
338+
.selfLink(SELF_LINK)
339+
.size(SIZE)
340+
.updateTime(UPDATE_TIME)
341+
.build();
342+
assertEquals("b", blob.bucket());
343+
assertEquals("n", blob.name());
344+
assertEquals(ACL, blob.acl());
345+
assertEquals(COMPONENT_COUNT, blob.componentCount());
346+
assertEquals(CONTENT_TYPE, blob.contentType());
347+
assertEquals(CACHE_CONTROL, blob.cacheControl());
348+
assertEquals(CONTENT_DISPOSITION, blob.contentDisposition());
349+
assertEquals(CONTENT_ENCODING, blob.contentEncoding());
350+
assertEquals(CONTENT_LANGUAGE, blob.contentLanguage());
351+
assertEquals(CRC32, blob.crc32c());
352+
assertEquals(DELETE_TIME, blob.deleteTime());
353+
assertEquals(ETAG, blob.etag());
354+
assertEquals(ID, blob.id());
355+
assertEquals(MD5, blob.md5());
356+
assertEquals(MEDIA_LINK, blob.mediaLink());
357+
assertEquals(METADATA, blob.metadata());
358+
assertEquals(META_GENERATION, blob.metageneration());
359+
assertEquals(OWNER, blob.owner());
360+
assertEquals(SELF_LINK, blob.selfLink());
361+
assertEquals(SIZE, blob.size());
362+
assertEquals(UPDATE_TIME, blob.updateTime());
363+
}
315364
}

‎trunk/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketTest.java‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,4 +340,46 @@ public void testToBuilder() {
340340
Bucket simpleBlob = new Bucket(storage, new BucketInfo.BuilderImpl(BUCKET_INFO));
341341
assertEquals(simpleBlob, simpleBlob.toBuilder().build());
342342
}
343+
344+
@Test
345+
public void testBuilder() {
346+
initializeExpectedBucket(4);
347+
expect(storage.options()).andReturn(mockOptions).times(4);
348+
replay(storage);
349+
Bucket.Builder builder =
350+
new Bucket.Builder(new Bucket(storage, new BucketInfo.BuilderImpl(BUCKET_INFO)));
351+
Bucket bucket = builder.acl(ACL)
352+
.etag(ETAG)
353+
.id(ID)
354+
.metageneration(META_GENERATION)
355+
.owner(OWNER)
356+
.selfLink(SELF_LINK)
357+
.cors(CORS)
358+
.createTime(CREATE_TIME)
359+
.defaultAcl(DEFAULT_ACL)
360+
.deleteRules(DELETE_RULES)
361+
.indexPage(INDEX_PAGE)
362+
.notFoundPage(NOT_FOUND_PAGE)
363+
.location(LOCATION)
364+
.storageClass(STORAGE_CLASS)
365+
.versioningEnabled(VERSIONING_ENABLED)
366+
.build();
367+
assertEquals("b", bucket.name());
368+
assertEquals(ACL, bucket.acl());
369+
assertEquals(ETAG, bucket.etag());
370+
assertEquals(ID, bucket.id());
371+
assertEquals(META_GENERATION, bucket.metageneration());
372+
assertEquals(OWNER, bucket.owner());
373+
assertEquals(SELF_LINK, bucket.selfLink());
374+
assertEquals(CREATE_TIME, bucket.createTime());
375+
assertEquals(CORS, bucket.cors());
376+
assertEquals(DEFAULT_ACL, bucket.defaultAcl());
377+
assertEquals(DELETE_RULES, bucket.deleteRules());
378+
assertEquals(INDEX_PAGE, bucket.indexPage());
379+
assertEquals(NOT_FOUND_PAGE, bucket.notFoundPage());
380+
assertEquals(LOCATION, bucket.location());
381+
assertEquals(STORAGE_CLASS, bucket.storageClass());
382+
assertEquals(VERSIONING_ENABLED, bucket.versioningEnabled());
383+
assertEquals(storage.options(), bucket.storage().options());
384+
}
343385
}

0 commit comments

Comments
 (0)