---

mziccard · mziccard · commit 4c04cef44304 · 2015-10-20T19:54:58.000+02:00
yaml --- r: 1073 b: refs/heads/master c: 1c5030a h: refs/heads/master i: 1071: 36124c8 v: v3
diff --git a/[refs] b/[refs]
@@ -1,4 +1,4 @@
 ---
-refs/heads/master: f24b2bf3808a74aff13c5cb8223b5d3b649f7646
+refs/heads/master: 1c5030aba170f9c421381a59bfa6b97757943ea4
 refs/heads/travis: 0fa997e2fc9c6b61b2d91e6d163655aae67d44b6
 refs/heads/gh-pages: 5a10432ecc75f29812e33a8236c900379509fe99
diff --git a/trunk/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java b/trunk/gcloud-java-storage/src/test/java/com/google/gcloud/storage/RemoteGcsHelperTest.java
@@ -72,6 +72,8 @@ public class RemoteGcsHelperTest {
   private static final List<BlobInfo> BLOB_LIST = ImmutableList.of(
       BlobInfo.builder(BUCKET_NAME, "n1").build(),
       BlobInfo.builder(BUCKET_NAME, "n2").build());
+  private static final StorageException RETRYABLE_EXCEPTION = new StorageException(409, "", true);
+  private static final StorageException FATAL_EXCEPTION = new StorageException(500, "", false);
   private static final ListResult<BlobInfo> BLOB_LIST_RESULT = new ListResult<BlobInfo>() {
 
     @Override
@@ -116,14 +118,32 @@ public void testForceDelete() throws InterruptedException, ExecutionException {
 
   @Test
   public void testForceDeleteTimeout() throws InterruptedException, ExecutionException {
+    Storage storageMock = EasyMock.createMock(Storage.class);
+    EasyMock.expect(storageMock.list(BUCKET_NAME)).andReturn(BLOB_LIST_RESULT).anyTimes();
+    for (BlobInfo info : BLOB_LIST) {
+      EasyMock.expect(storageMock.delete(BUCKET_NAME, info.name())).andReturn(true).anyTimes();
+    }
+    EasyMock.expect(storageMock.delete(BUCKET_NAME)).andThrow(RETRYABLE_EXCEPTION).anyTimes();
+    EasyMock.replay(storageMock);
+    assertTrue(!RemoteGcsHelper.forceDelete(storageMock, BUCKET_NAME, 50, TimeUnit.MICROSECONDS));
+    EasyMock.verify(storageMock);
+  }
+
+  @Test
+  public void testForceDeleteFail() throws InterruptedException, ExecutionException {
     Storage storageMock = EasyMock.createMock(Storage.class);
     EasyMock.expect(storageMock.list(BUCKET_NAME)).andReturn(BLOB_LIST_RESULT);
     for (BlobInfo info : BLOB_LIST) {
       EasyMock.expect(storageMock.delete(BUCKET_NAME, info.name())).andReturn(true);
     }
-    EasyMock.expect(storageMock.delete(BUCKET_NAME)).andReturn(false);
+    EasyMock.expect(storageMock.delete(BUCKET_NAME)).andThrow(FATAL_EXCEPTION);
     EasyMock.replay(storageMock);
-    assertTrue(!RemoteGcsHelper.forceDelete(storageMock, BUCKET_NAME, 50, TimeUnit.MICROSECONDS));
+    thrown.expect(ExecutionException.class);
+    try {
+      RemoteGcsHelper.forceDelete(storageMock, BUCKET_NAME, 5, TimeUnit.SECONDS);
+    } finally {
+      EasyMock.verify(storageMock);
+    }
   }
 
   @Test
