Basic tests

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

@@ -61,16 +61,21 @@ protected String value() {
     }
 
     @Override
-    public int hashCode() {
-      return Objects.hash(type, value);
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      Entity entity = (Entity) o;
+      return Objects.equals(type, entity.type) &&
+          Objects.equals(value, entity.value);
     }
 
     @Override
-    public boolean equals(Object obj) {
-      if (obj == null || !getClass().isAssignableFrom(obj.getClass())) {
-        return false;
-      }
-      return Objects.equals(toPb(), ((Entity)obj).toPb());
+    public int hashCode() {
+      return Objects.hash(type, value);
     }
 
     @Override
@@ -95,6 +100,9 @@ static Entity fromPb(String entity) {
       if (entity.startsWith("group-")) {
         return new Group(entity.substring(6));
       }
+      if (entity.startsWith("domain-")) {
+        return new Domain(entity.substring(7));
+      }
       if (entity.startsWith("project-")) {
         int idx = entity.indexOf('-', 8);
         String team = entity.substring(8, idx);
@@ -178,7 +186,7 @@ enum ProjectRole {
       OWNERS, EDITORS, VIEWERS
     }
 
-    Project(ProjectRole pRole, String projectId) {
+    public Project(ProjectRole pRole, String projectId) {
       super(Type.PROJECT, pRole.name().toLowerCase() + "-" + projectId);
       this.pRole = pRole;
       this.projectId = projectId;
@@ -220,6 +228,24 @@ public Role role() {
     return role;
   }
 
+  @Override
+  public int hashCode() {
+    return Objects.hash(entity, role);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null || getClass() != obj.getClass()) {
+      return false;
+    }
+    final Acl other = (Acl) obj;
+    return Objects.equals(this.entity, other.entity)
+        && Objects.equals(this.role, other.role);
+  }
+
   BucketAccessControl toBucketPb() {
     BucketAccessControl bucketPb = new BucketAccessControl();
     bucketPb.setRole(role().toString());

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

@@ -53,6 +53,10 @@ public static class Result<T extends Serializable> implements Serializable {
       this.value = null;
     }
 
+    static <T extends Serializable> Result<T> of(T value) {
+      return new Result<>(value);
+    }
+
     /**
      * Returns the result.
      *

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

@@ -16,7 +16,9 @@
 
 package com.google.gcloud.storage;
 
+
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.Objects;
 
@@ -41,7 +43,7 @@ public String nextPageCursor() {
 
   @Override
   public Iterator<T> iterator() {
-    return results.iterator();
+    return results == null ? Collections.<T>emptyIterator() : results.iterator();
   }
 
   @Override

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

@@ -345,14 +345,14 @@ private <I, O extends Serializable> List<BatchResponse.Result<O>> transformBatch
     for (Tuple<StorageObject, ?> tuple : request) {
       Tuple<I, StorageServiceException> result = results.get(tuple.x());
       if (result.x() != null) {
-        response.add(new BatchResponse.Result<>(transform.apply(result.x())));
+        response.add(BatchResponse.Result.of(transform.apply(result.x())));
       } else {
         StorageServiceException exception = result.y();
         if (nullOnErrorCodesSet.contains(exception.code())) {
           //noinspection unchecked
           response.add(BatchResponse.Result.<O>empty());
         } else {
-          response.add(new BatchResponse.Result<O>(result.y()));
+          response.add(new BatchResponse.Result<O>(exception));
         }
       }
     }

src/test/java/com/google/gcloud/datastore/BaseEntityTest.java

@@ -1 +1 @@
-/* * 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.datastore;import static junit.framework.TestCase.assertFalse;import static org.junit.Assert.assertEquals;import static org.junit.Assert.assertTrue;import com.google.common.collect.ImmutableList;import com.google.common.collect.ImmutableSet;import org.junit.Before;import org.junit.Test;import java.util.Calendar;import java.util.Collections;import java.util.List;import java.util.Set;public class BaseEntityTest {  private static final Blob BLOB = Blob.copyFrom(new byte[]{1, 2});  private static final DateTime DATE_TIME = DateTime.now();  private static final Key KEY = Key.builder("ds1", "k1", "n1").build();  private static final Entity ENTITY = Entity.builder(KEY).set("name", "foo").build();  private static final IncompleteKey INCOMPLETE_KEY = IncompleteKey.builder("ds1", "k1").build();  private static final FullEntity<IncompleteKey> PARTIAL_ENTITY =      Entity.builder(INCOMPLETE_KEY).build();  private Builder builder;  private class Builder extends BaseEntity.Builder {    @Override public BaseEntity build() {      return new BaseEntity(this) {        @Override        protected Builder emptyBuilder() {          return new BaseEntityTest.Builder();        }      };    }  }  @Before  public void setUp() {    builder = new Builder();    builder.set("blob", BLOB).set("boolean", true).set("dateTime", DATE_TIME);    builder.set("double", 1.25).set("key", KEY).set("string", "hello world");    builder.set("long", 125).setNull("null").set("entity", ENTITY);    builder.set("partialEntity", PARTIAL_ENTITY).set("stringValue", StringValue.of("bla"));    builder.set("list1", NullValue.of(), StringValue.of("foo"));    builder.set("list2", ImmutableList.of(LongValue.of(10), DoubleValue.of(2)));    builder.set("list3", Collections.singletonList(BooleanValue.of(true)));  }  @Test  public void testContains() throws Exception {    BaseEntity entity = builder.build();    assertTrue(entity.contains("list1"));    assertFalse(entity.contains("bla"));    entity = builder.clear().build();    assertFalse(entity.contains("list1"));  }  @Test  public void testGetValue() throws Exception {    BaseEntity entity = builder.build();    assertEquals(BlobValue.of(BLOB), entity.getValue("blob"));  }  @Test(expected = DatastoreServiceException.class)  public void testGetValueNotFound() throws Exception {    BaseEntity entity = builder.clear().build();    entity.getValue("blob");  }  @Test  public void testIsNull() throws Exception {    BaseEntity entity = builder.build();    assertTrue(entity.isNull("null"));    assertFalse(entity.isNull("blob"));    entity = builder.setNull("blob").build();    assertTrue(entity.isNull("blob"));  }  @Test(expected = DatastoreServiceException.class)  public void testIsNullNotFound() throws Exception {    BaseEntity entity = builder.clear().build();    entity.isNull("null");  }  @Test  public void testGetString() throws Exception {    BaseEntity entity = builder.build();    assertEquals("hello world", entity.getString("string"));    assertEquals("bla", entity.getString("stringValue"));    entity = builder.set("string", "foo").build();    assertEquals("foo", entity.getString("string"));  }  @Test  public void testGetLong() throws Exception {    BaseEntity entity = builder.build();    assertEquals(125, entity.getLong("long"));    entity = builder.set("long", LongValue.of(10)).build();    assertEquals(10, entity.getLong("long"));  }  @Test  public void testGetDouble() throws Exception {    BaseEntity entity = builder.build();    assertEquals(1.25, entity.getDouble("double"), 0);    entity = builder.set("double", DoubleValue.of(10)).build();    assertEquals(10, entity.getDouble("double"), 0);  }  @Test  public void testGetBoolean() throws Exception {    BaseEntity entity = builder.build();    assertTrue(entity.getBoolean("boolean"));    entity = builder.set("boolean", BooleanValue.of(false)).build();    assertFalse(entity.getBoolean("boolean"));  }  @Test  public void testGetDateTime() throws Exception {    BaseEntity entity = builder.build();    assertEquals(DATE_TIME, entity.getDateTime("dateTime"));    Calendar cal = Calendar.getInstance();    cal.add(Calendar.DATE, -1);    DateTime dateTime = DateTime.copyFrom(cal);    entity = builder.set("dateTime", DateTimeValue.of(dateTime)).build();    assertEquals(dateTime, entity.getDateTime("dateTime"));  }  @Test  public void testGetKey() throws Exception {    BaseEntity entity = builder.build();    assertEquals(KEY, entity.getKey("key"));    Key key = Key.builder(KEY).name("BLA").build();    entity = builder.set("key", key).build();    assertEquals(key, entity.getKey("key"));  }  @Test  public void testGetEntity() throws Exception {    BaseEntity entity = builder.build();    assertEquals(ENTITY, entity.getEntity("entity"));    assertEquals(PARTIAL_ENTITY, entity.getEntity("partialEntity"));    entity = builder.set("entity", EntityValue.of(PARTIAL_ENTITY)).build();    assertEquals(PARTIAL_ENTITY, entity.getEntity("entity"));  }  @Test  public void testGetList() throws Exception {    BaseEntity entity = builder.build();    List<? extends Value<?>> list = entity.getList("list1");    assertEquals(2, list.size());    assertEquals(NullValue.of(), list.get(0));    assertEquals("foo", list.get(1).get());    list = entity.getList("list2");    assertEquals(2, list.size());    assertEquals(Long.valueOf(10), list.get(0).get());    assertEquals(Double.valueOf(2), list.get(1).get());    list = entity.getList("list3");    assertEquals(1, list.size());    assertEquals(Boolean.TRUE, list.get(0).get());    entity = builder.set("list1", ListValue.of(list)).build();    assertEquals(list, entity.getList("list1"));  }  @Test  public void testGetBlob() throws Exception {    BaseEntity entity = builder.build();    assertEquals(BLOB, entity.getBlob("blob"));    Blob blob = Blob.copyFrom(new byte[] {});    entity = builder.set("blob", BlobValue.of(blob)).build();    assertEquals(blob, entity.getBlob("blob"));  }  @Test  public void testNames() throws Exception {    Set<String> names = ImmutableSet.<String>builder()        .add("string", "stringValue", "boolean", "double", "long", "list1", "list2", "list3")        .add("entity", "partialEntity", "null", "dateTime", "blob", "key")        .build();    BaseEntity entity = builder.build();    assertEquals(names, entity.names());  }}
+/* * 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.datastore;import static org.junit.Assert.assertEquals;import static org.junit.Assert.assertFalse;import static org.junit.Assert.assertTrue;import com.google.common.collect.ImmutableList;import com.google.common.collect.ImmutableSet;import org.junit.Before;import org.junit.Test;import java.util.Calendar;import java.util.Collections;import java.util.List;import java.util.Set;public class BaseEntityTest {  private static final Blob BLOB = Blob.copyFrom(new byte[]{1, 2});  private static final DateTime DATE_TIME = DateTime.now();  private static final Key KEY = Key.builder("ds1", "k1", "n1").build();  private static final Entity ENTITY = Entity.builder(KEY).set("name", "foo").build();  private static final IncompleteKey INCOMPLETE_KEY = IncompleteKey.builder("ds1", "k1").build();  private static final FullEntity<IncompleteKey> PARTIAL_ENTITY =      Entity.builder(INCOMPLETE_KEY).build();  private Builder builder;  private class Builder extends BaseEntity.Builder {    @Override public BaseEntity build() {      return new BaseEntity(this) {        @Override        protected Builder emptyBuilder() {          return new BaseEntityTest.Builder();        }      };    }  }  @Before  public void setUp() {    builder = new Builder();    builder.set("blob", BLOB).set("boolean", true).set("dateTime", DATE_TIME);    builder.set("double", 1.25).set("key", KEY).set("string", "hello world");    builder.set("long", 125).setNull("null").set("entity", ENTITY);    builder.set("partialEntity", PARTIAL_ENTITY).set("stringValue", StringValue.of("bla"));    builder.set("list1", NullValue.of(), StringValue.of("foo"));    builder.set("list2", ImmutableList.of(LongValue.of(10), DoubleValue.of(2)));    builder.set("list3", Collections.singletonList(BooleanValue.of(true)));  }  @Test  public void testContains() throws Exception {    BaseEntity entity = builder.build();    assertTrue(entity.contains("list1"));    assertFalse(entity.contains("bla"));    entity = builder.clear().build();    assertFalse(entity.contains("list1"));  }  @Test  public void testGetValue() throws Exception {    BaseEntity entity = builder.build();    assertEquals(BlobValue.of(BLOB), entity.getValue("blob"));  }  @Test(expected = DatastoreServiceException.class)  public void testGetValueNotFound() throws Exception {    BaseEntity entity = builder.clear().build();    entity.getValue("blob");  }  @Test  public void testIsNull() throws Exception {    BaseEntity entity = builder.build();    assertTrue(entity.isNull("null"));    assertFalse(entity.isNull("blob"));    entity = builder.setNull("blob").build();    assertTrue(entity.isNull("blob"));  }  @Test(expected = DatastoreServiceException.class)  public void testIsNullNotFound() throws Exception {    BaseEntity entity = builder.clear().build();    entity.isNull("null");  }  @Test  public void testGetString() throws Exception {    BaseEntity entity = builder.build();    assertEquals("hello world", entity.getString("string"));    assertEquals("bla", entity.getString("stringValue"));    entity = builder.set("string", "foo").build();    assertEquals("foo", entity.getString("string"));  }  @Test  public void testGetLong() throws Exception {    BaseEntity entity = builder.build();    assertEquals(125, entity.getLong("long"));    entity = builder.set("long", LongValue.of(10)).build();    assertEquals(10, entity.getLong("long"));  }  @Test  public void testGetDouble() throws Exception {    BaseEntity entity = builder.build();    assertEquals(1.25, entity.getDouble("double"), 0);    entity = builder.set("double", DoubleValue.of(10)).build();    assertEquals(10, entity.getDouble("double"), 0);  }  @Test  public void testGetBoolean() throws Exception {    BaseEntity entity = builder.build();    assertTrue(entity.getBoolean("boolean"));    entity = builder.set("boolean", BooleanValue.of(false)).build();    assertFalse(entity.getBoolean("boolean"));  }  @Test  public void testGetDateTime() throws Exception {    BaseEntity entity = builder.build();    assertEquals(DATE_TIME, entity.getDateTime("dateTime"));    Calendar cal = Calendar.getInstance();    cal.add(Calendar.DATE, -1);    DateTime dateTime = DateTime.copyFrom(cal);    entity = builder.set("dateTime", DateTimeValue.of(dateTime)).build();    assertEquals(dateTime, entity.getDateTime("dateTime"));  }  @Test  public void testGetKey() throws Exception {    BaseEntity entity = builder.build();    assertEquals(KEY, entity.getKey("key"));    Key key = Key.builder(KEY).name("BLA").build();    entity = builder.set("key", key).build();    assertEquals(key, entity.getKey("key"));  }  @Test  public void testGetEntity() throws Exception {    BaseEntity entity = builder.build();    assertEquals(ENTITY, entity.getEntity("entity"));    assertEquals(PARTIAL_ENTITY, entity.getEntity("partialEntity"));    entity = builder.set("entity", EntityValue.of(PARTIAL_ENTITY)).build();    assertEquals(PARTIAL_ENTITY, entity.getEntity("entity"));  }  @Test  public void testGetList() throws Exception {    BaseEntity entity = builder.build();    List<? extends Value<?>> list = entity.getList("list1");    assertEquals(2, list.size());    assertEquals(NullValue.of(), list.get(0));    assertEquals("foo", list.get(1).get());    list = entity.getList("list2");    assertEquals(2, list.size());    assertEquals(Long.valueOf(10), list.get(0).get());    assertEquals(Double.valueOf(2), list.get(1).get());    list = entity.getList("list3");    assertEquals(1, list.size());    assertEquals(Boolean.TRUE, list.get(0).get());    entity = builder.set("list1", ListValue.of(list)).build();    assertEquals(list, entity.getList("list1"));  }  @Test  public void testGetBlob() throws Exception {    BaseEntity entity = builder.build();    assertEquals(BLOB, entity.getBlob("blob"));    Blob blob = Blob.copyFrom(new byte[] {});    entity = builder.set("blob", BlobValue.of(blob)).build();    assertEquals(blob, entity.getBlob("blob"));  }  @Test  public void testNames() throws Exception {    Set<String> names = ImmutableSet.<String>builder()        .add("string", "stringValue", "boolean", "double", "long", "list1", "list2", "list3")        .add("entity", "partialEntity", "null", "dateTime", "blob", "key")        .build();    BaseEntity entity = builder.build();    assertEquals(names, entity.names());  }}

src/test/java/com/google/gcloud/datastore/BlobValueTest.java

@@ -16,8 +16,8 @@
 
 package com.google.gcloud.datastore;
 
-import static junit.framework.TestCase.assertFalse;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;

src/test/java/com/google/gcloud/datastore/BooleanValueTest.java

@@ -16,8 +16,8 @@
 
 package com.google.gcloud.datastore;
 
-import static junit.framework.TestCase.assertFalse;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;

src/test/java/com/google/gcloud/datastore/DatastoreHelperTest.java

@@ -16,13 +16,20 @@
 
 package com.google.gcloud.datastore;
 
-import static junit.framework.TestCase.assertTrue;
-import static junit.framework.TestCase.fail;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import com.google.common.collect.Iterators;
 import com.google.gcloud.datastore.DatastoreService.TransactionCallable;
+
 import org.easymock.EasyMock;
 import org.junit.Test;