add tests for bucket and blob

src/main/java/com/google/gcloud/storage/Bucket.java

@@ -103,6 +103,23 @@ public Type type() {
       return type;
     }
 
+    @Override
+    public int hashCode() {
+      return Objects.hash(type);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj) {
+        return true;
+      }
+      if (obj == null || getClass() != obj.getClass()) {
+        return false;
+      }
+      final DeleteRule other = (DeleteRule) obj;
+      return Objects.equals(toPb(), other.toPb());
+    }
+
     Rule toPb() {
       Rule rule = new Rule();
       rule.setAction(new Rule.Action().setType(SUPPORTED_ACTION));
@@ -114,7 +131,7 @@ Rule toPb() {
 
     abstract void populateCondition(Rule.Condition condition);
 
-    private static DeleteRule fromPb(Rule rule) {
+    static DeleteRule fromPb(Rule rule) {
       if (rule.getAction() != null && SUPPORTED_ACTION.endsWith(rule.getAction().getType())) {
         Rule.Condition condition = rule.getCondition();
         Integer age = condition.getAge();
@@ -346,6 +363,23 @@ public static Location of(String value) {
       return option == null ? new Location(value) : option.location;
     }
 
+    @Override
+    public int hashCode() {
+      return Objects.hash(value);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj) {
+        return true;
+      }
+      if (obj == null || getClass() != obj.getClass()) {
+        return false;
+      }
+      final Location other = (Location) obj;
+      return Objects.equals(this.value, other.value);
+    }
+
     @Override
     public String toString() {
       return value();
@@ -412,7 +446,7 @@ public Builder notFoundPage(String notFoundPage) {
       return this;
     }
 
-    public Builder deleteRules(Iterable<DeleteRule> rules) {
+    public Builder deleteRules(Iterable<? extends DeleteRule> rules) {
       this.deleteRules = ImmutableList.copyOf(rules);
       return this;
     }
@@ -490,7 +524,7 @@ public String name() {
     return name;
   }
 
-  public Entity Owner() {
+  public Entity owner() {
     return owner;
   }
 
@@ -510,7 +544,7 @@ public String notFoundPage() {
     return notFoundPage;
   }
 
-  public List<DeleteRule> deleteRules() {
+  public List<? extends DeleteRule> deleteRules() {
     return deleteRules;
   }
 
@@ -652,6 +686,7 @@ public Rule apply(DeleteRule deleteRule) {
           return deleteRule.toPb();
         }
       }));
+      bucketPb.setLifecycle(lifecycle);
     }
     return bucketPb;
   }

src/main/java/com/google/gcloud/storage/Cors.java

@@ -130,17 +130,17 @@ public Builder maxAgeSeconds(Integer maxAgeSeconds) {
     }
 
     public Builder methods(Iterable<Method> methods) {
-      this.methods = ImmutableList.copyOf(methods);
+      this.methods = methods != null ? ImmutableList.copyOf(methods) : null;
       return this;
     }
 
     public Builder origins(Iterable<Origin> origins) {
-      this.origins = ImmutableList.copyOf(origins);
+      this.origins = origins != null ? ImmutableList.copyOf(origins) : null;
       return this;
     }
 
     public Builder responseHeaders(Iterable<String> headers) {
-      this.responseHeaders = ImmutableList.copyOf(headers);
+      this.responseHeaders = headers != null ? ImmutableList.copyOf(headers) : null;
       return this;
     }
 
@@ -205,25 +205,33 @@ Bucket.Cors toPb() {
     Bucket.Cors pb = new Bucket.Cors();
     pb.setMaxAgeSeconds(maxAgeSeconds);
     pb.setResponseHeader(responseHeaders);
-    pb.setMethod(newArrayList(transform(methods(), Functions.toStringFunction())));
-    pb.setOrigin(newArrayList(transform(origins(), Functions.toStringFunction())));
+    if (methods != null) {
+      pb.setMethod(newArrayList(transform(methods, Functions.toStringFunction())));
+    }
+    if (origins != null) {
+      pb.setOrigin(newArrayList(transform(origins, Functions.toStringFunction())));
+    }
     return pb;
   }
 
   static Cors fromPb(Bucket.Cors cors) {
     Builder builder = builder().maxAgeSeconds(cors.getMaxAgeSeconds());
-    builder.methods(transform(cors.getMethod(), new Function<String, Method>() {
-      @Override
-      public Method apply(String name) {
-        return Method.valueOf(name.toUpperCase());
-      }
-    }));
-    builder.origins(transform(cors.getOrigin(), new Function<String, Origin>() {
-      @Override
-      public Origin apply(String value) {
-        return Origin.of(value);
-      }
-    }));
+    if (cors.getMethod() != null) {
+      builder.methods(transform(cors.getMethod(), new Function<String, Method>() {
+        @Override
+        public Method apply(String name) {
+          return Method.valueOf(name.toUpperCase());
+        }
+      }));
+    }
+    if (cors.getOrigin() != null) {
+      builder.origins(transform(cors.getOrigin(), new Function<String, Origin>() {
+        @Override
+        public Origin apply(String value) {
+          return Origin.of(value);
+        }
+      }));
+    }
     builder.responseHeaders(cors.getResponseHeader());
     return builder.build();
   }

src/test/java/com/google/gcloud/storage/BlobTest.java

@@ -0,0 +1,155 @@
+/*
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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 com.google.gcloud.storage;
+
+import static com.google.gcloud.storage.Acl.Project.ProjectRole.VIEWERS;
+import static com.google.gcloud.storage.Acl.Role.READER;
+import static com.google.gcloud.storage.Acl.Role.WRITER;
+import static org.junit.Assert.assertEquals;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.gcloud.storage.Acl.Project;
+import com.google.gcloud.storage.Acl.User;
+
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Map;
+
+public class BlobTest {
+
+  private static final List<Acl> ACL = ImmutableList.of(
+      new Acl(User.ofAllAuthenticatedUsers(), READER),
+      new Acl(new Project(VIEWERS, "p1"), WRITER));
+  private static final Integer COMPONENT_COUNT = 2;
+  private static final String CONTENT_TYPE = "text/html";
+  private static final String CACHE_CONTROL = "cache";
+  private static final String CONTENT_DISPOSITION = "content-disposition";
+  private static final String CONTENT_ENCODING = "UTF-8";
+  private static final String CONTENT_LANGUAGE = "En";
+  private static final String CRC32 = "0xFF00";
+  private static final Long DELETE_TIME = System.currentTimeMillis();
+  private static final String ETAG = "0xFF00";
+  private static final Long GENERATION = 1L;
+  private static final String ID = "B/N:1";
+  private static final String MD5 = "0xFF00";
+  private static final String MEDIA_LINK = "http://media/b/n";
+  private static final Map<String, String> METADATA = ImmutableMap.of("n1", "v1", "n2", "v2");
+  private static final Long META_GENERATION = 10L;
+  private static final User OWNER = new User("user@gmail.com");
+  private static final String SELF_LINK = "http://storage/b/n";
+  private static final Long SIZE = 1024L;
+  private static final Long UPDATE_TIME = DELETE_TIME - 1L;
+  private static final Blob BLOB = Blob.builder("b", "n")
+      .acl(ACL)
+      .componentCount(COMPONENT_COUNT)
+      .contentType(CONTENT_TYPE)
+      .cacheControl(CACHE_CONTROL)
+      .contentDisposition(CONTENT_DISPOSITION)
+      .contentEncoding(CONTENT_ENCODING)
+      .contentLanguage(CONTENT_LANGUAGE)
+      .crc32c(CRC32)
+      .deleteTime(DELETE_TIME)
+      .etag(ETAG)
+      .generation(GENERATION)
+      .id(ID)
+      .md5(MD5)
+      .mediaLink(MEDIA_LINK)
+      .metadata(METADATA)
+      .metageneration(META_GENERATION)
+      .owner(OWNER)
+      .selfLink(SELF_LINK)
+      .size(SIZE)
+      .updateTime(UPDATE_TIME)
+      .build();
+
+  @Test
+  public void testToBuilder() {
+    compareBlobs(BLOB, BLOB.toBuilder().build());
+    Blob blob = BLOB.toBuilder().name("n2").bucket("b2").size(200L).build();
+    assertEquals("n2", blob.name());
+    assertEquals("b2", blob.bucket());
+    assertEquals(Long.valueOf(200), blob.size());
+    blob = blob.toBuilder().name("n").bucket("b").size(SIZE).build();
+    compareBlobs(BLOB, blob);
+  }
+
+  @Test
+  public void testOf() {
+    Blob blob = Blob.of("b", "n");
+    assertEquals("b", blob.bucket());
+    assertEquals("n", blob.name());
+  }
+
+  @Test
+  public void testBuilder() {
+    assertEquals("b", BLOB.bucket());
+    assertEquals("n", BLOB.name());
+    assertEquals(ACL, BLOB.acl());
+    assertEquals(COMPONENT_COUNT, BLOB.componentCount());
+    assertEquals(CONTENT_TYPE, BLOB.contentType());
+    assertEquals(CACHE_CONTROL, BLOB.cacheControl() );
+    assertEquals(CONTENT_DISPOSITION, BLOB.contentDisposition());
+    assertEquals(CONTENT_ENCODING, BLOB.contentEncoding());
+    assertEquals(CONTENT_LANGUAGE, BLOB.contentLanguage());
+    assertEquals(CRC32, BLOB.crc32c());
+    assertEquals(DELETE_TIME, BLOB.deleteTime());
+    assertEquals(ETAG, BLOB.etag());
+    assertEquals(GENERATION, BLOB.generation());
+    assertEquals(ID, BLOB.id());
+    assertEquals(MD5, BLOB.md5());
+    assertEquals(MEDIA_LINK, BLOB.mediaLink());
+    assertEquals(METADATA, BLOB.metadata());
+    assertEquals(META_GENERATION, BLOB.metageneration());
+    assertEquals(OWNER, BLOB.owner());
+    assertEquals(SELF_LINK, BLOB.selfLink());
+    assertEquals(SIZE, BLOB.size());
+    assertEquals(UPDATE_TIME, BLOB.updateTime());
+  }
+
+  private void compareBlobs(Blob expected, Blob value) {
+    assertEquals(expected, value);
+    assertEquals(expected.bucket(), value.bucket());
+    assertEquals(expected.name(), value.name());
+    assertEquals(expected.acl(), value.acl());
+    assertEquals(expected.componentCount(), value.componentCount());
+    assertEquals(expected.contentType(), value.contentType());
+    assertEquals(expected.cacheControl(), value.cacheControl() );
+    assertEquals(expected.contentDisposition(), value.contentDisposition());
+    assertEquals(expected.contentEncoding(), value.contentEncoding());
+    assertEquals(expected.contentLanguage(), value.contentLanguage());
+    assertEquals(expected.crc32c(), value.crc32c());
+    assertEquals(expected.deleteTime(), value.deleteTime());
+    assertEquals(expected.etag(), value.etag());
+    assertEquals(expected.generation(), value.generation());
+    assertEquals(expected.id(), value.id());
+    assertEquals(expected.md5(), value.md5());
+    assertEquals(expected.mediaLink(), value.mediaLink());
+    assertEquals(expected.metadata(), value.metadata());
+    assertEquals(expected.metageneration(), value.metageneration());
+    assertEquals(expected.owner(), value.owner());
+    assertEquals(expected.selfLink(), value.selfLink());
+    assertEquals(expected.size(), value.size());
+    assertEquals(expected.updateTime(), value.updateTime());
+  }
+
+  @Test
+  public void testToPbAndFromPb() {
+    compareBlobs(BLOB, Blob.fromPb(BLOB.toPb()));
+  }
+}