Merge pull request #44 from aozarov/master

fix build
googleapis · May 7, 2015 · 078dd09 · 078dd09
2 parents d4368c5 + 425ae6f
commit 078dd09
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/com/google/gcloud/storage/StorageService.java b/src/main/java/com/google/gcloud/storage/StorageService.java
@@ -425,4 +425,6 @@ public static Builder builder() {
    * @throws StorageServiceException upon failure
    */
   BlobWriteChannel writer(Blob blob, BlobTargetOption... options);
+
+
 }
diff --git a/src/test/java/com/google/gcloud/datastore/DatastoreServiceTest.java b/src/test/java/com/google/gcloud/datastore/DatastoreServiceTest.java
@@ -35,6 +35,7 @@
 import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
 import com.google.gcloud.spi.DatastoreRpc;
 import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException.Reason;
+import com.google.gcloud.spi.DatastoreRpcFactory;
 
 import org.easymock.EasyMock;
 import org.junit.AfterClass;
@@ -637,18 +638,21 @@ public void testRetires() throws Exception {
         DatastoreV1.LookupRequest.newBuilder().addKey(KEY1.toPb()).build();
     DatastoreV1.LookupResponse responsePb = DatastoreV1.LookupResponse.newBuilder()
         .addFound(EntityResult.newBuilder().setEntity(ENTITY1.toPb())).build();
-    DatastoreRpc mock = EasyMock.createStrictMock(DatastoreRpc.class);
-    EasyMock.expect(mock.lookup(requestPb))
+    DatastoreRpcFactory rpcFactoryMock = EasyMock.createStrictMock(DatastoreRpcFactory.class);
+    DatastoreRpc rpcMock = EasyMock.createStrictMock(DatastoreRpc.class);
+    EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(DatastoreServiceOptions.class)))
+        .andReturn(rpcMock);
+    EasyMock.expect(rpcMock.lookup(requestPb))
         .andThrow(new DatastoreRpc.DatastoreRpcException(Reason.UNAVAILABLE))
         .andReturn(responsePb);
-    EasyMock.replay(mock);
+    EasyMock.replay(rpcFactoryMock, rpcMock);
     DatastoreServiceOptions options = this.options.toBuilder()
         .retryParams(RetryParams.getDefaultInstance())
-        .datastoreRpc(mock)
+        .serviceRpcFactory(rpcFactoryMock)
         .build();
     DatastoreService datastore = DatastoreServiceFactory.instance().get(options);
     Entity entity = datastore.get(KEY1);
     assertEquals(ENTITY1, entity);
-    EasyMock.verify(mock);
+    EasyMock.verify(rpcFactoryMock, rpcMock);
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -425,4 +425,6 @@ public static Builder builder() { @@
        * @throws StorageServiceException upon failure
        */
       BlobWriteChannel writer(Blob blob, BlobTargetOption... options);
     }