---

mziccard · mziccard · commit 226d3336809d · 2015-10-22T15:06:15.000+02:00
yaml --- r: 2317 b: refs/heads/update-datastore c: 99178a3 h: refs/heads/master i: 2315: 6195ab6
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
 refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
-refs/heads/update-datastore: 3b917417d6ca9b0cee5a162955755d8a35d1aaa0
+refs/heads/update-datastore: 99178a3d0758a2ad7e1577c7e3adc99b8ef542bb
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
 refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2
diff --git a/branches/update-datastore/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/branches/update-datastore/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java
@@ -25,6 +25,7 @@
 import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.RestorableState;
 import com.google.gcloud.storage.testing.RemoteGcsHelper;
 
@@ -174,6 +175,23 @@ public void testUpdateBlob() {
     assertTrue(storage.delete(bucket, blobName));
   }
 
+  @Test
+  public void testUpdateBlobReplaceMetadata() {
+    String blobName = "test-update-blob-replace-metadata";
+    BlobInfo blob = BlobInfo.builder(bucket, blobName)
+        .contentType(CONTENT_TYPE)
+        .metadata(ImmutableMap.of("k1", "a"))
+        .build();
+    assertNotNull(storage.create(blob));
+    BlobInfo updatedBlob = storage.update(blob.toBuilder().metadata(null).build());
+    assertNotNull(updatedBlob);
+    assertNull(updatedBlob.metadata());
+    updatedBlob = storage.update(blob.toBuilder().metadata(ImmutableMap.of("k2", "b")).build());
+    assertEquals(blob.blobId(), updatedBlob.blobId());
+    assertEquals(ImmutableMap.of("k2", "b"), updatedBlob.metadata());
+    assertTrue(storage.delete(bucket, blobName));
+  }
+
   @Test
   public void testUpdateBlobFail() {
     String blobName = "test-update-blob-fail";
