rename helper method in DatastoreTests and other minor style fixes

Ajay Kannan · Ajay Kannan · commit d4530f604125 · 2015-10-23T10:46:21.000-07:00
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/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());
