chore: fix failing tests

Author: BenWhitehead

google-cloud-storage/src/test/java/com/google/cloud/storage/ITJsonResumableSessionPutTaskTest.java

@@ -33,10 +33,12 @@
 import com.google.api.gax.retrying.ResultRetryAlgorithm;
 import com.google.api.services.storage.model.StorageObject;
 import com.google.cloud.storage.FakeHttpServer.HttpRequestHandler;
+import com.google.cloud.storage.it.ChecksummedTestContent;
 import com.google.cloud.storage.it.runner.StorageITRunner;
 import com.google.cloud.storage.it.runner.annotations.Backend;
 import com.google.cloud.storage.it.runner.annotations.ParallelFriendly;
 import com.google.cloud.storage.it.runner.annotations.SingleBackend;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.grpc.netty.shaded.io.netty.buffer.ByteBuf;
 import io.grpc.netty.shaded.io.netty.buffer.Unpooled;
@@ -791,13 +793,23 @@ public void jsonParseFailure() throws Exception {
   }
 
   @Test
-  public void jsonDeserializationOnlyAttemptedWhenContentPresent() throws Exception {
+  public void whenContentNotPresentFallBackToHeaders() throws Exception {
 
+    ChecksummedTestContent testContent = ChecksummedTestContent.of(new byte[] {'A'});
     HttpRequestHandler handler =
         req -> {
           DefaultFullHttpResponse resp = new DefaultFullHttpResponse(req.protocolVersion(), OK);
           resp.headers().set(CONTENT_TYPE, "text/html; charset=UTF-8");
-          resp.headers().set("x-goog-stored-content-length", "0");
+          resp.headers().set("x-goog-generation", "3");
+          resp.headers().set("x-goog-metageneration", "7");
+          resp.headers().set("x-goog-stored-content-length", "1");
+          resp.headers().set("x-goog-stored-content-encoding", "identity");
+          resp.headers()
+              .set(
+                  "x-goog-hash",
+                  ImmutableList.of(
+                      "crc32c=" + testContent.getCrc32cBase64(),
+                      "md5=" + testContent.getMd5Base64()));
           return resp;
         };
 
@@ -810,13 +822,15 @@ public void jsonDeserializationOnlyAttemptedWhenContentPresent() throws Exceptio
           new JsonResumableSessionPutTask(
               httpClientContext,
               jsonResumableWrite(uploadUrl),
-              RewindableContent.empty(),
-              HttpContentRange.of(0));
+              RewindableContent.of(ByteBuffer.wrap(testContent.getBytes())),
+              HttpContentRange.of(1));
 
       ResumableOperationResult<@Nullable StorageObject> operationResult = task.call();
       StorageObject call = operationResult.getObject();
-      assertThat(call).isNull();
-      assertThat(operationResult.getPersistedSize()).isEqualTo(0L);
+      assertThat(call).isNotNull();
+      assertThat(call.getCrc32c()).isEqualTo(testContent.getCrc32cBase64());
+      assertThat(call.getSize()).isEqualTo(BigInteger.ONE);
+      assertThat(operationResult.getPersistedSize()).isEqualTo(1L);
     }
   }
 

google-cloud-storage/src/test/java/com/google/cloud/storage/ITJsonResumableSessionQueryTaskTest.java

@@ -28,10 +28,12 @@
 import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.storage.model.StorageObject;
 import com.google.cloud.storage.FakeHttpServer.HttpRequestHandler;
+import com.google.cloud.storage.it.ChecksummedTestContent;
 import com.google.cloud.storage.it.runner.StorageITRunner;
 import com.google.cloud.storage.it.runner.annotations.Backend;
 import com.google.cloud.storage.it.runner.annotations.ParallelFriendly;
 import com.google.cloud.storage.it.runner.annotations.SingleBackend;
+import com.google.common.collect.ImmutableList;
 import io.grpc.netty.shaded.io.netty.buffer.ByteBuf;
 import io.grpc.netty.shaded.io.netty.buffer.Unpooled;
 import io.grpc.netty.shaded.io.netty.handler.codec.http.DefaultFullHttpResponse;
@@ -97,12 +99,23 @@ public void successfulSession() throws Exception {
   }
 
   @Test
-  public void successfulSession_noObject() throws Exception {
+  public void successfulSession_whenContentNotPresentFallBackToHeaders() throws Exception {
+    ChecksummedTestContent testContent = ChecksummedTestContent.of(new byte[] {'A'});
     HttpRequestHandler handler =
         req -> {
-          DefaultFullHttpResponse response = new DefaultFullHttpResponse(req.protocolVersion(), OK);
-          response.headers().set("X-Goog-Stored-Content-Length", 0);
-          return response;
+          DefaultFullHttpResponse resp = new DefaultFullHttpResponse(req.protocolVersion(), OK);
+          resp.headers().set(CONTENT_TYPE, "text/html; charset=UTF-8");
+          resp.headers().set("x-goog-generation", "3");
+          resp.headers().set("x-goog-metageneration", "7");
+          resp.headers().set("x-goog-stored-content-length", "1");
+          resp.headers().set("x-goog-stored-content-encoding", "identity");
+          resp.headers()
+              .set(
+                  "x-goog-hash",
+                  ImmutableList.of(
+                      "crc32c=" + testContent.getCrc32cBase64(),
+                      "md5=" + testContent.getMd5Base64()));
+          return resp;
         };
 
     try (FakeHttpServer fakeHttpServer = FakeHttpServer.of(handler)) {
@@ -115,8 +128,10 @@ public void successfulSession_noObject() throws Exception {
 
       ResumableOperationResult<@Nullable StorageObject> result = task.call();
       StorageObject object = result.getObject();
-      assertThat(object).isNull();
-      assertThat(result.getPersistedSize()).isEqualTo(0L);
+      assertThat(object).isNotNull();
+      assertThat(object.getCrc32c()).isEqualTo(testContent.getCrc32cBase64());
+      assertThat(object.getSize()).isEqualTo(BigInteger.ONE);
+      assertThat(result.getPersistedSize()).isEqualTo(1L);
     }
   }