test(storage): fix mock finalization mapping in ITGapicBidiUnbufferedWritableByteChannelTest

Author: nidhiii-27

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

@@ -50,7 +50,6 @@
 import java.net.URI;
 import java.time.Duration;
 import java.util.Map;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -62,7 +61,6 @@ final class FakeHttpServer implements AutoCloseable {
   private final Runnable shutdown;
   private final HttpStorageOptions httpStorageOptions;
 
-
   private FakeHttpServer(
       URI endpoint, Channel channel, Runnable shutdown, HttpStorageOptions httpStorageOptions) {
     this.endpoint = endpoint;

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

@@ -732,8 +732,18 @@ public void incremental_success() throws Exception {
     BidiWriteObjectResponse resp1 =
         BidiWriteObjectResponse.newBuilder().setPersistedSize(_256KiB).build();
 
+    BidiWriteObjectRequest req2 =
+        BidiWriteObjectRequest.newBuilder().setWriteOffset(_256KiB).setFinishWrite(true).build();
+    BidiWriteObjectResponse resp2 =
+        BidiWriteObjectResponse.newBuilder()
+            .setResource(Object.newBuilder().setName("obj").setSize(_256KiB).build())
+            .build();
+
     ImmutableMap<List<BidiWriteObjectRequest>, BidiWriteObjectResponse> map =
-        ImmutableMap.of(ImmutableList.of(req1), resp1);
+        ImmutableMap.of(
+            ImmutableList.of(req1), resp1,
+            ImmutableList.of(req2), resp2,
+            ImmutableList.of(req1, req2), resp2);
     BidiWriteService service1 = new BidiWriteService(map);
 
     try (FakeServer fakeServer = FakeServer.of(service1);
@@ -782,8 +792,18 @@ public void incremental_partialSuccess() throws Exception {
     BidiWriteObjectResponse resp1 =
         BidiWriteObjectResponse.newBuilder().setPersistedSize(_256KiB).build();
 
+    BidiWriteObjectRequest req2 =
+        BidiWriteObjectRequest.newBuilder().setWriteOffset(_256KiB).setFinishWrite(true).build();
+    BidiWriteObjectResponse resp2 =
+        BidiWriteObjectResponse.newBuilder()
+            .setResource(Object.newBuilder().setName("obj").setSize(_256KiB).build())
+            .build();
+
     ImmutableMap<List<BidiWriteObjectRequest>, BidiWriteObjectResponse> map =
-        ImmutableMap.of(ImmutableList.of(req1), resp1);
+        ImmutableMap.of(
+            ImmutableList.of(req1), resp1,
+            ImmutableList.of(req2), resp2,
+            ImmutableList.of(req1, req2), resp2);
     BidiWriteService service1 = new BidiWriteService(map);
 
     try (FakeServer fakeServer = FakeServer.of(service1);

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

@@ -693,8 +693,10 @@ public BlobInfo compose(ComposeRequest composeRequest) {
           () -> assertThat(se2).hasMessageThat().contains("Checksum mismatch"),
           () -> {
             assertThat(se2).hasCauseThat().isInstanceOf(ParallelCompositeUploadException.class);
-            ParallelCompositeUploadException pcue = (ParallelCompositeUploadException) se2.getCause();
-            // since we fail client side with a checksum validation, we expect the object to have been
+            ParallelCompositeUploadException pcue =
+                (ParallelCompositeUploadException) se2.getCause();
+            // since we fail client side with a checksum validation, we expect the object to have
+            // been
             // created
             assertThat(pcue.getCreatedObjects().get()).containsExactly(p1, expectedId);
           },

java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/Registry.java

@@ -74,15 +74,17 @@ public final class Registry extends RunListener {
               new ThreadFactoryBuilder().setDaemon(true).setNameFormat("test-run-%d").build()));
 
   private final TestRunScopedInstance<TestBench> testBench =
-      TestRunScopedInstance.of("fixture/TEST_BENCH", () -> {
-        int httpPort = findFreePort();
-        int grpcPort = findFreePort();
-        return TestBench.newBuilder()
-            .setBaseUri("http://localhost:" + httpPort)
-            .setGRPCBaseUri("http://localhost:" + grpcPort)
-            .setContainerName("fork-" + httpPort)
-            .build();
-      });
+      TestRunScopedInstance.of(
+          "fixture/TEST_BENCH",
+          () -> {
+            int httpPort = findFreePort();
+            int grpcPort = findFreePort();
+            return TestBench.newBuilder()
+                .setBaseUri("http://localhost:" + httpPort)
+                .setGRPCBaseUri("http://localhost:" + grpcPort)
+                .setContainerName("fork-" + httpPort)
+                .build();
+          });
 
   private final TestRunScopedInstance<Generator> generator =
       TestRunScopedInstance.of("fixture/GENERATOR", Generator::new);

java-storage/google-cloud-storage/src/test/java/com/google/cloud/storage/it/runner/registry/TestBench.java

@@ -42,9 +42,7 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -383,13 +381,21 @@ public boolean shouldRetry(Throwable previousThrowable, List<?> previousResponse
   }
 
   private void dumpServerLogs(Path outFile, Path errFile) throws IOException {
-    LOGGER.warn("TestBench container failed or timeout occurred. Server stdout: {}, stderr: {}",
-        outFile.toAbsolutePath(), errFile.toAbsolutePath());
+    LOGGER.warn(
+        "TestBench container failed or timeout occurred. Server stdout: {}, stderr: {}",
+        outFile.toAbsolutePath(),
+        errFile.toAbsolutePath());
     try {
       Path targetLogsDir = java.nio.file.Paths.get("target/testbench-logs");
       java.nio.file.Files.createDirectories(targetLogsDir);
-      java.nio.file.Files.copy(outFile, targetLogsDir.resolve(outFile.getFileName()), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
-      java.nio.file.Files.copy(errFile, targetLogsDir.resolve(errFile.getFileName()), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+      java.nio.file.Files.copy(
+          outFile,
+          targetLogsDir.resolve(outFile.getFileName()),
+          java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+      java.nio.file.Files.copy(
+          errFile,
+          targetLogsDir.resolve(errFile.getFileName()),
+          java.nio.file.StandardCopyOption.REPLACE_EXISTING);
       LOGGER.warn("Copied Testbench logs to target directory: {}", targetLogsDir.toAbsolutePath());
     } catch (Exception e) {
       // ignore failures to copy