---

mziccard · mziccard · commit ba182e45b3f7 · 2015-10-16T15:19:55.000+02:00
yaml --- r: 6327 b: refs/heads/tswast-patch-1 c: ab56573 h: refs/heads/master i: 6325: d285381 6323: 3ee9231 6319: de1ece8
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: 33400dac0c853e281f5dbb9bac2a6aeecd6f5f0d
+refs/heads/tswast-patch-1: ab56573274b17060376043d5768e179a80f5cd15
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/test/java/com/google/gcloud/storage/ITStorageTest.java b/branches/tswast-patch-1/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.gcloud.RestorableState;
 import com.google.gcloud.storage.testing.RemoteGcsHelper;
 
 import java.io.ByteArrayInputStream;
@@ -35,7 +36,6 @@
 import java.net.URLConnection;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -399,6 +399,35 @@ public void testReadAndWriteChannels() throws UnsupportedEncodingException, IOEx
     assertTrue(storage.delete(bucket, blobName));
   }
 
+  @Test
+  public void testReadAndWriteSaveChannels() throws UnsupportedEncodingException, IOException {
+    String blobName = "test-read-and-write-save-channels-blob";
+    BlobInfo blob = BlobInfo.builder(bucket, blobName).build();
+    byte[] stringBytes;
+    BlobWriteChannel writer = storage.writer(blob);
+    stringBytes = BLOB_STRING_CONTENT.getBytes(UTF_8);
+    writer.write(ByteBuffer.wrap(BLOB_BYTE_CONTENT));
+    RestorableState<BlobWriteChannel> writerState = writer.save();
+    BlobWriteChannel secondWriter = writerState.restore();
+    secondWriter.write(ByteBuffer.wrap(stringBytes));
+    secondWriter.close();
+    ByteBuffer readBytes;
+    ByteBuffer readStringBytes;
+    BlobReadChannel reader = storage.reader(blob.blobId());
+    reader.chunkSize(BLOB_BYTE_CONTENT.length);
+    readBytes = ByteBuffer.allocate(BLOB_BYTE_CONTENT.length);
+    reader.read(readBytes);
+    RestorableState<BlobReadChannel> readerState = reader.save();
+    BlobReadChannel secondReader = readerState.restore();
+    readStringBytes = ByteBuffer.allocate(stringBytes.length);
+    secondReader.read(readStringBytes);
+    reader.close();
+    secondReader.close();
+    assertArrayEquals(BLOB_BYTE_CONTENT, readBytes.array());
+    assertEquals(BLOB_STRING_CONTENT, new String(readStringBytes.array(), UTF_8));
+    assertTrue(storage.delete(bucket, blobName));
+  }
+
   @Test
   public void testReadChannelFail() throws UnsupportedEncodingException, IOException {
     String blobName = "test-read-channel-blob-fail";
