From ae4b0c6877c02aa6aea9b4dadc3c541a55f180a8 Mon Sep 17 00:00:00 2001 From: aozarov Date: Thu, 7 May 2015 11:31:27 -0700 Subject: [PATCH] fix build --- .../com/google/gcloud/storage/StorageService.java | 2 ++ .../gcloud/datastore/DatastoreServiceTest.java | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/google/gcloud/storage/StorageService.java b/src/main/java/com/google/gcloud/storage/StorageService.java index 71026fda6078..f52e4d667d01 100644 --- 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 index c9ff5d1632ab..f79441945489 100644 --- 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); } }