fix(bigquery-jdbc): ensure test uses unique dataset & cleans up (#13587)

logachev · web-flow · commit a6bb362a704d · 2026-06-30T14:03:48.000-07:00
diff --git a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBase.java b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBase.java
@@ -194,6 +194,10 @@ public class ITBase extends BigQueryJdbcBaseTest {
           + DDL_ALL_BQ_TYPES
           + DML_ALL_BQ_TYPES;
 
+  public static String getUniqueDatasetName(String prefix) {
+    return prefix + System.currentTimeMillis() + "_" + (100 + new java.util.Random().nextInt(900));
+  }
+
   public static synchronized String getSharedDataset() {
     if (sharedDataset == null) {
       sharedDataset =
diff --git a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java
@@ -1743,30 +1743,34 @@ public void testValidDestinationTableSavesQueriesWithStandardSQL() throws SQLExc
   public void testDestinationTableAndDestinationDatasetThatDoesNotExistsCreates()
       throws SQLException {
     // setup
+    String largeResultDataset = ITBase.getUniqueDatasetName("FakeDataset");
     String connection_uri =
-        ITBigQueryJDBCTest.connection_uri
-            + "QueryDialect=BIG_QUERY;"
-            + "AllowLargeResults=1;"
-            + "LargeResultTable=FakeTable;"
-            + "LargeResultDataset=FakeDataset;";
+        String.format(
+            ITBigQueryJDBCTest.connection_uri
+                + "QueryDialect=BIG_QUERY;"
+                + "AllowLargeResults=1;"
+                + "LargeResultTable=FakeTable;"
+                + "LargeResultDataset=%s;",
+            largeResultDataset);
     String selectLegacyQuery =
         "SELECT * FROM [bigquery-public-data.deepmind_alphafold.metadata] LIMIT 200;";
     Driver driver = BigQueryDriver.getRegisteredDriver();
-    Connection connection = driver.connect(connection_uri, new Properties());
-    Statement statement = connection.createStatement();
-
-    // act
-    ResultSet resultSet = statement.executeQuery(selectLegacyQuery);
+    try (Connection connection = driver.connect(connection_uri, new Properties())) {
+      Statement statement = connection.createStatement();
 
-    // assertion
-    assertNotNull(resultSet);
-    String separateQuery = "SELECT * FROM FakeDataset.FakeTable;";
-    boolean result = bigQueryStatement.execute(separateQuery);
-    assertTrue(result);
+      // act
+      ResultSet resultSet = statement.executeQuery(selectLegacyQuery);
 
-    // clean up
-    bigQueryStatement.execute("DROP SCHEMA FakeDataset CASCADE;");
-    connection.close();
+      // assertion
+      assertNotNull(resultSet);
+      String separateQuery = String.format("SELECT * FROM %s.FakeTable;", largeResultDataset);
+      boolean result = bigQueryStatement.execute(separateQuery);
+      assertTrue(result);
+    } finally {
+      // clean up
+      bigQueryStatement.execute(
+          String.format("DROP SCHEMA IF EXISTS %s CASCADE;", largeResultDataset));
+    }
   }
 
   @Test
