---

Ajay Kannan · Ajay Kannan · commit fc8855ad66df · 2015-09-29T17:59:31.000-07:00
yaml --- r: 891 b: refs/heads/master c: e776320 h: refs/heads/master i: 889: e8550f5 887: bb8aae6 v: v3
diff --git a/[refs] b/[refs]
@@ -1,4 +1,4 @@
 ---
-refs/heads/master: 8928c498a3c90586990c13e5496e406c064cd35a
+refs/heads/master: e776320245ef694d89fbbf59195487a141aebf4d
 refs/heads/travis: 0fa997e2fc9c6b61b2d91e6d163655aae67d44b6
 refs/heads/gh-pages: 5a10432ecc75f29812e33a8236c900379509fe99
diff --git a/trunk/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/trunk/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -640,7 +640,7 @@ public void testKeyFactory() {
   }
 
   @Test
-  public void testRetries() throws Exception {
+  public void testRetryableException() throws Exception {
     DatastoreV1.LookupRequest requestPb =
         DatastoreV1.LookupRequest.newBuilder().addKey(KEY1.toPb()).build();
     DatastoreV1.LookupResponse responsePb = DatastoreV1.LookupResponse.newBuilder()
@@ -664,7 +664,31 @@ public void testRetries() throws Exception {
   }
 
   @Test
-  public void testRuntimeExceptionHandling() throws Exception {
+  public void testNonRetryableException() throws Exception {
+    DatastoreV1.LookupRequest requestPb =
+        DatastoreV1.LookupRequest.newBuilder().addKey(KEY1.toPb()).build();
+    DatastoreRpcFactory rpcFactoryMock = EasyMock.createStrictMock(DatastoreRpcFactory.class);
+    DatastoreRpc rpcMock = EasyMock.createStrictMock(DatastoreRpc.class);
+    EasyMock.expect(rpcFactoryMock.create(EasyMock.anyObject(DatastoreOptions.class)))
+        .andReturn(rpcMock);
+    EasyMock.expect(rpcMock.lookup(requestPb))
+        .andThrow(new DatastoreRpc.DatastoreRpcException(Reason.PERMISSION_DENIED))
+        .times(1);
+    EasyMock.replay(rpcFactoryMock, rpcMock);
+    RetryParams retryParams = RetryParams.builder().retryMinAttempts(2).build();
+    DatastoreOptions options = this.options.toBuilder()
+        .retryParams(retryParams)
+        .serviceRpcFactory(rpcFactoryMock)
+        .build();
+    Datastore datastore = DatastoreFactory.instance().get(options);
+    thrown.expect(DatastoreException.class);
+    thrown.expectMessage(Reason.PERMISSION_DENIED.description());
+    datastore.get(KEY1);
+    EasyMock.verify(rpcFactoryMock, rpcMock);
+  }
+
+  @Test
+  public void testRuntimeException() throws Exception {
     DatastoreV1.LookupRequest requestPb =
         DatastoreV1.LookupRequest.newBuilder().addKey(KEY1.toPb()).build();
     DatastoreRpcFactory rpcFactoryMock = EasyMock.createStrictMock(DatastoreRpcFactory.class);
