---

Ajay Kannan · Ajay Kannan · commit 1fe47be99167 · 2015-10-23T10:46:21.000-07:00
yaml --- r: 6355 b: refs/heads/tswast-patch-1 c: d4530f6 h: refs/heads/master i: 6353: ec7da21 6351: 4b2352a
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: a30b948a2acfbece1aa6fd9924265564d0d910b0
+refs/heads/tswast-patch-1: d4530f604125c52522b729cd6bd1142f5eacd54a
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/branches/tswast-patch-1/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -553,15 +553,14 @@ public void testGetArrayNoDeferredResults() {
   }
 
   public void testGetArrayDeferredResults() throws DatastoreRpcException {
-    Set<Key> requestedKeys = new HashSet<Key>();
+    Set<Key> requestedKeys = new HashSet<>();
     requestedKeys.add(KEY1);
     requestedKeys.add(KEY2);
     requestedKeys.add(KEY3);
     requestedKeys.add(KEY4);
     requestedKeys.add(KEY5);
-    Iterator<Entity> iter =
-        createMockDatastoreForDeferredLookup().get(KEY1, KEY2, KEY3, KEY4, KEY5);
-    Set<Key> keysOfFoundEntities = new HashSet<Key>();
+    Iterator<Entity> iter = createDatastoreForDeferredLookup().get(KEY1, KEY2, KEY3, KEY4, KEY5);
+    Set<Key> keysOfFoundEntities = new HashSet<>();
     while (iter.hasNext()) {
       keysOfFoundEntities.add(iter.next().key());
     }
@@ -570,7 +569,7 @@ public void testGetArrayDeferredResults() throws DatastoreRpcException {
 
   public void testFetchArrayDeferredResults() throws DatastoreRpcException {
     List<Entity> foundEntities =
-        createMockDatastoreForDeferredLookup().fetch(KEY1, KEY2, KEY3, KEY4, KEY5);
+        createDatastoreForDeferredLookup().fetch(KEY1, KEY2, KEY3, KEY4, KEY5);
     assertEquals(foundEntities.get(0).key(), KEY1);
     assertEquals(foundEntities.get(1).key(), KEY2);
     assertEquals(foundEntities.get(2).key(), KEY3);
@@ -579,7 +578,7 @@ public void testFetchArrayDeferredResults() throws DatastoreRpcException {
     assertEquals(foundEntities.size(), 5);
   }
 
-  private Datastore createMockDatastoreForDeferredLookup() throws DatastoreRpcException {
+  private Datastore createDatastoreForDeferredLookup() throws DatastoreRpcException {
     List<DatastoreV1.Key> keysPb = new ArrayList<>();
     keysPb.add(KEY1.toPb());
     keysPb.add(KEY2.toPb());
