From ba165924adf32975bb9cd3ba46c0b3f1e072d529 Mon Sep 17 00:00:00 2001
From: BenWhitehead <BenWhitehead@users.noreply.github.com>
Date: Mon, 14 Apr 2025 15:33:26 -0400
Subject: [PATCH] test: update integration tests for rapid buckets to try and
 run

---
 .../cloud/storage/ITAppendableUploadTest.java  | 18 ++++++++++++------
 .../cloud/storage/ITObjectReadSessionTest.java | 11 +++++------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/ITAppendableUploadTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/ITAppendableUploadTest.java
index d8c9580afe..dc12c32c7a 100644
--- a/google-cloud-storage/src/test/java/com/google/cloud/storage/ITAppendableUploadTest.java
+++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/ITAppendableUploadTest.java
@@ -20,13 +20,13 @@
 
 import com.google.cloud.storage.Storage.BlobField;
 import com.google.cloud.storage.Storage.BlobGetOption;
+import com.google.cloud.storage.TransportCompatibility.Transport;
 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.BucketFixture;
 import com.google.cloud.storage.it.runner.annotations.BucketType;
+import com.google.cloud.storage.it.runner.annotations.CrossRun;
 import com.google.cloud.storage.it.runner.annotations.Inject;
-import com.google.cloud.storage.it.runner.annotations.SingleBackend;
-import com.google.cloud.storage.it.runner.annotations.StorageFixture;
 import com.google.cloud.storage.it.runner.registry.Generator;
 import com.google.common.io.ByteStreams;
 import java.io.IOException;
@@ -43,14 +43,14 @@
 import org.junit.runner.RunWith;
 
 @RunWith(StorageITRunner.class)
-@SingleBackend(Backend.PROD)
+@CrossRun(
+    backends = {Backend.PROD, Backend.TEST_BENCH},
+    transports = Transport.GRPC)
 public final class ITAppendableUploadTest {
 
   @Inject public Generator generator;
 
-  @Inject
-  @StorageFixture(TransportCompatibility.Transport.GRPC)
-  public Storage storage;
+  @Inject public Storage storage;
 
   @Inject
   @BucketFixture(BucketType.RAPID)
@@ -95,6 +95,8 @@ public void appendableBlobUploadWithoutFinalizing() throws IOException {
   }
 
   @Test
+  // Pending work in testbench, manually verified internally on 2025-03-25
+  @CrossRun.Ignore(backends = {Backend.TEST_BENCH})
   public void appendableBlobUploadTakeover() throws Exception {
     BlobAppendableUploadConfig uploadConfig =
         BlobAppendableUploadConfig.of().withFlushPolicy(FlushPolicy.maxFlushSize(5));
@@ -139,6 +141,8 @@ public void testUploadFileUsingAppendable() throws Exception {
   }
 
   @Test
+  // Pending work in testbench, manually verified internally on 2025-03-25
+  @CrossRun.Ignore(backends = {Backend.TEST_BENCH})
   public void finalizeAfterCloseWorks() throws Exception {
     BlobAppendableUploadConfig uploadConfig =
         BlobAppendableUploadConfig.of().withFlushPolicy(FlushPolicy.maxFlushSize(1024));
@@ -154,6 +158,8 @@ public void finalizeAfterCloseWorks() throws Exception {
   }
 
   @Test
+  // Pending work in testbench, manually verified internally on 2025-03-25
+  @CrossRun.Ignore(backends = {Backend.TEST_BENCH})
   public void takeoverJustToFinalizeWorks() throws Exception {
     BlobAppendableUploadConfig uploadConfig =
         BlobAppendableUploadConfig.of().withFlushPolicy(FlushPolicy.maxFlushSize(5));
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/ITObjectReadSessionTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/ITObjectReadSessionTest.java
index 5eefb4e505..52f4ad383a 100644
--- a/google-cloud-storage/src/test/java/com/google/cloud/storage/ITObjectReadSessionTest.java
+++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/ITObjectReadSessionTest.java
@@ -35,9 +35,8 @@
 import com.google.cloud.storage.it.runner.annotations.Backend;
 import com.google.cloud.storage.it.runner.annotations.BucketFixture;
 import com.google.cloud.storage.it.runner.annotations.BucketType;
+import com.google.cloud.storage.it.runner.annotations.CrossRun;
 import com.google.cloud.storage.it.runner.annotations.Inject;
-import com.google.cloud.storage.it.runner.annotations.SingleBackend;
-import com.google.cloud.storage.it.runner.annotations.StorageFixture;
 import com.google.cloud.storage.it.runner.registry.Generator;
 import com.google.common.base.Stopwatch;
 import com.google.common.hash.Hasher;
@@ -62,14 +61,14 @@
 import org.junit.runner.RunWith;
 
 @RunWith(StorageITRunner.class)
-@SingleBackend(Backend.PROD)
+@CrossRun(
+    backends = {Backend.PROD, Backend.TEST_BENCH},
+    transports = Transport.GRPC)
 public final class ITObjectReadSessionTest {
 
   private static final int _512KiB = 512 * 1024;
 
-  @Inject
-  @StorageFixture(Transport.GRPC)
-  public Storage storage;
+  @Inject public Storage storage;
 
   @Inject
   @BucketFixture(BucketType.RAPID)