chore: merge main into generate-libraries-main

Author: cloud-java-bot

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableMaterializedViewIT.java

@@ -27,7 +27,6 @@
 import com.google.cloud.bigtable.admin.v2.models.CreateInstanceRequest;
 import com.google.cloud.bigtable.admin.v2.models.CreateMaterializedViewRequest;
 import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest;
-import com.google.cloud.bigtable.admin.v2.models.Instance;
 import com.google.cloud.bigtable.admin.v2.models.MaterializedView;
 import com.google.cloud.bigtable.admin.v2.models.StorageType;
 import com.google.cloud.bigtable.admin.v2.models.Table;
@@ -39,7 +38,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.logging.Logger;
-import org.junit.AfterClass;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -55,10 +54,10 @@ public class BigtableMaterializedViewIT {
   private static final Logger LOGGER = Logger.getLogger(BigtableMaterializedViewIT.class.getName());
   private static final int[] BACKOFF_DURATION = {2, 4, 8, 16, 32, 64, 128, 256, 512, 1024};
 
-  private static BigtableInstanceAdminClient client;
-  private static BigtableTableAdminClient tableAdminClient;
-  private static Table testTable;
-  private static String instanceId = "";
+  private BigtableInstanceAdminClient client;
+  private BigtableTableAdminClient tableAdminClient;
+  private Table testTable;
+  private String instanceId = "";
 
   // TODO: Update this test once emulator supports InstanceAdmin operation
   // https://github.com/googleapis/google-cloud-go/issues/1069
@@ -68,33 +67,30 @@ public static void validatePlatform() throws IOException {
         .withMessage("BigtableInstanceAdminClient doesn't support on Emulator")
         .that(testEnvRule.env())
         .isNotInstanceOf(EmulatorEnv.class);
-
-    createInstance();
   }
 
-  public static void createInstance() throws IOException {
+  @Before
+  public void setUp() throws InterruptedException, IOException {
     client = testEnvRule.env().getInstanceAdminClient();
 
-    Instance instance =
-        client.createInstance(
-            CreateInstanceRequest.of(new PrefixGenerator().newPrefix())
-                .addCluster("my-cluster", "us-east1-c", 3, StorageType.SSD));
-    instanceId = instance.getId();
+    instanceId = new PrefixGenerator().newPrefix();
+    client.createInstance(
+        CreateInstanceRequest.of(instanceId)
+            .setDisplayName("BigtableMaterializedViewIT")
+            .addCluster(
+                instanceId + "-c1", testEnvRule.env().getPrimaryZone(), 1, StorageType.SSD));
     tableAdminClient = testEnvRule.env().getTableAdminClientForInstance(instanceId);
+
+    testTable = createTestTable(tableAdminClient);
   }
 
-  @AfterClass
-  public static void deleteInstance() {
+  @After
+  public void deleteInstance() {
     if (!instanceId.isEmpty()) {
       client.deleteInstance(instanceId);
     }
   }
 
-  @Before
-  public void setUp() throws InterruptedException {
-    testTable = createTestTable(tableAdminClient);
-  }
-
   @Test
   public void createMaterializedViewAndGetMaterializedViewTest() {
     String materializedViewId = prefixGenerator.newPrefix();
@@ -209,8 +205,7 @@ private String getQuery() {
         + "` GROUP BY _key";
   }
 
-  private static Table createTestTable(BigtableTableAdminClient tableAdmin)
-      throws InterruptedException {
+  private Table createTestTable(BigtableTableAdminClient tableAdmin) throws InterruptedException {
     String tableId = PrefixGenerator.newPrefix("BigtableMaterializedViewIT#createTestTable");
     Table testTable = tableAdmin.createTable(CreateTableRequest.of(tableId).addFamily("cf1"));