---

aozarov · aozarov · commit 1f6e4daec209 · 2015-05-14T17:33:08.000-07:00
yaml --- r: 6003 b: refs/heads/tswast-patch-1 c: 5ce009f h: refs/heads/master i: 6001: cc41b84 5999: 3694323
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 9eafeb436bccdf2142bb253b4f40b6f744d88c34
+refs/heads/tswast-patch-1: 5ce009facdac9595aad7be72394c3dd628f34c9e
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/src/test/java/com/google/gcloud/storage/BatchRequestTest.java b/branches/tswast-patch-1/src/test/java/com/google/gcloud/storage/BatchRequestTest.java
@@ -16,33 +16,54 @@
 
 package com.google.gcloud.storage;
 
-import com.google.gcloud.storage.BatchRequest.Builder;
+import static com.google.gcloud.storage.StorageService.PredefinedAcl.PUBLIC_READ;
+import static junit.framework.TestCase.assertFalse;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.Iterables;
 import com.google.gcloud.storage.StorageService.BlobSourceOption;
+import com.google.gcloud.storage.StorageService.BlobTargetOption;
 
 import org.junit.Test;
 
+import java.util.Iterator;
+import java.util.Map.Entry;
+
 public class BatchRequestTest {
 
   @Test
   public void testRequest() throws Exception {
-    Builder builder = BatchRequest.builder();
-    builder.delete("b1", "o1")
-    BatchRequest.builder().delete("b1", "o1",
-        BlobSourceOption.generationMatch(), BlobSourceOption.metagenerationMatch());
-  }
+    BatchRequest request = BatchRequest.builder()
+        .delete("b1", "o1")
+        .delete("b1", "o2", BlobSourceOption.generationMatch(1),
+            BlobSourceOption.metagenerationMatch(2))
+        .update(Blob.of("b2", "o1"), BlobTargetOption.predefinedAcl(PUBLIC_READ))
+        .update(Blob.of("b2", "o2"))
+        .get("b3", "o1")
+        .get("b3", "o2", BlobSourceOption.generationMatch(1))
+        .get("b3", "o3")
+        .build();
 
-  @Test
-  public void testToUpdate() throws Exception {
-
-  }
+    Iterator<Entry<Blob, Iterable<BlobSourceOption>>> deletes = request
+        .toDelete().entrySet().iterator();
+    Entry<Blob, Iterable<BlobSourceOption>> delete = deletes.next();
+    assertEquals(Blob.of("b1", "o1"), delete.getKey());
+    assertTrue(Iterables.isEmpty(delete.getValue()));
+    delete = deletes.next();
+    assertEquals(Blob.of("b1", "o2"), delete.getKey());
+    assertEquals(2, Iterables.size(delete.getValue()));
+    assertFalse(deletes.hasNext());
 
-  @Test
-  public void testToGet() throws Exception {
-
-  }
-
-  @Test
-  public void testBuilder() throws Exception {
+    Iterator<Entry<Blob, Iterable<BlobSourceOption>>> updates = request
+        .toDelete().entrySet().iterator();
+    Entry<Blob, Iterable<BlobSourceOption>> update = updates.next();
+    assertEquals(Blob.of("b1", "o1"), update.getKey());
+    assertTrue(Iterables.isEmpty(update.getValue()));
+    update = updates.next();
+    assertEquals(Blob.of("b1", "o2"), update.getKey());
+    assertEquals(2, Iterables.size(update.getValue()));
+    assertFalse(updates.hasNext());
 
   }
 }
