Skip to content

fix build #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aozarov merged 1 commit into from
May 7, 2015
Merged

fix build #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/com/google/gcloud/storage/StorageService.java
View file
Open in desktop
Original file line number Diff 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);


}
14 changes: 9 additions & 5 deletions src/test/java/com/google/gcloud/datastore/DatastoreServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}