---

Ajay Kannan · Ajay Kannan · commit f766ebcb2943 · 2015-10-23T10:26:16.000-07:00
yaml --- r: 2309 b: refs/heads/update-datastore c: a30b948 h: refs/heads/master i: 2307: ed591f9
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
 refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
-refs/heads/update-datastore: de1ce7fe771306435c5cc9c63376fbbdad538ee7
+refs/heads/update-datastore: a30b948a2acfbece1aa6fd9924265564d0d910b0
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
 refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2
diff --git a/branches/update-datastore/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/branches/update-datastore/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -553,6 +553,33 @@ public void testGetArrayNoDeferredResults() {
   }
 
   public void testGetArrayDeferredResults() throws DatastoreRpcException {
+    Set<Key> requestedKeys = new HashSet<Key>();
+    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>();
+    while (iter.hasNext()) {
+      keysOfFoundEntities.add(iter.next().key());
+    }
+    assertEquals(requestedKeys, keysOfFoundEntities);
+  }
+
+  public void testFetchArrayDeferredResults() throws DatastoreRpcException {
+    List<Entity> foundEntities =
+        createMockDatastoreForDeferredLookup().fetch(KEY1, KEY2, KEY3, KEY4, KEY5);
+    assertEquals(foundEntities.get(0).key(), KEY1);
+    assertEquals(foundEntities.get(1).key(), KEY2);
+    assertEquals(foundEntities.get(2).key(), KEY3);
+    assertEquals(foundEntities.get(3).key(), KEY4);
+    assertEquals(foundEntities.get(4).key(), KEY5);
+    assertEquals(foundEntities.size(), 5);
+  }
+
+  private Datastore createMockDatastoreForDeferredLookup() throws DatastoreRpcException {
     List<DatastoreV1.Key> keysPb = new ArrayList<>();
     keysPb.add(KEY1.toPb());
     keysPb.add(KEY2.toPb());
@@ -575,15 +602,15 @@ public void testGetArrayDeferredResults() throws DatastoreRpcException {
         DatastoreV1.LookupResponse.newBuilder()
             .addFound(EntityResult.newBuilder().setEntity(ENTITY1.toPb()))
             .addFound(EntityResult.newBuilder().setEntity(entity4.toPb()))
-            .addDeferred(KEY2.toPb())
-            .addDeferred(KEY3.toPb())
-            .addDeferred(KEY5.toPb())
+            .addDeferred(keysPb.get(2))
+            .addDeferred(keysPb.get(3))
+            .addDeferred(keysPb.get(5))
             .build());
     lookupResponses.add(
         DatastoreV1.LookupResponse.newBuilder()
             .addFound(EntityResult.newBuilder().setEntity(ENTITY3.toPb()))
             .addFound(EntityResult.newBuilder().setEntity(entity4.toPb()))
-            .addDeferred(KEY5.toPb())
+            .addDeferred(keysPb.get(5))
             .build());
     lookupResponses.add(
         DatastoreV1.LookupResponse.newBuilder()
@@ -602,13 +629,7 @@ public void testGetArrayDeferredResults() throws DatastoreRpcException {
             .retryParams(RetryParams.getDefaultInstance())
             .serviceRpcFactory(rpcFactoryMock)
             .build();
-    Datastore datastore = DatastoreFactory.instance().get(options);
-    Iterator<Entity> iter = datastore.get(KEY1, KEY2, KEY3, KEY4, KEY5);
-    Set<Entity> foundEntities = new HashSet<>();
-    while (iter.hasNext()) {
-      foundEntities.add(iter.next());
-    }
-    assertEquals(foundEntities.size(), 5);
+    return DatastoreFactory.instance().get(options);
   }
 
   @Test
