Skip to content
This repository was archived by the owner on Mar 23, 2026. It is now read-only.

Commit 41dc0c5

Browse files
committed
chore: Add try-finally to ensure dataset is deleted
1 parent 9025291 commit 41dc0c5

1 file changed

Lines changed: 55 additions & 48 deletions

File tree

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java

Lines changed: 55 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,33 +1352,37 @@ void testUpdateDataset() {
13521352
.setDescription("Some Description")
13531353
.setLabels(Collections.singletonMap("a", "b"))
13541354
.build());
1355-
assertThat(dataset).isNotNull();
1356-
assertThat(dataset.getDatasetId().getProject()).isEqualTo(bigquery.getOptions().getProjectId());
1357-
assertThat(dataset.getDatasetId().getDataset()).isEqualTo(datasetName);
1358-
assertThat(dataset.getDescription()).isEqualTo("Some Description");
1359-
assertThat(dataset.getLabels()).containsExactly("a", "b");
1360-
assertThat(dataset.getStorageBillingModel()).isNull();
1361-
assertThat(dataset.getMaxTimeTravelHours()).isNull();
1362-
1363-
Map<String, String> updateLabels = new HashMap<>();
1364-
updateLabels.put("x", "y");
1365-
updateLabels.put("a", null);
1366-
Dataset updatedDataset =
1367-
bigquery.update(
1368-
dataset.toBuilder()
1369-
.setDescription("Updated Description")
1370-
.setLabels(updateLabels)
1371-
.setStorageBillingModel("LOGICAL")
1372-
.setMaxTimeTravelHours(MAX_TIME_TRAVEL_HOURS)
1373-
.build());
1374-
assertThat(updatedDataset.getDescription()).isEqualTo("Updated Description");
1375-
assertThat(updatedDataset.getLabels()).containsExactly("x", "y");
1376-
assertThat(updatedDataset.getStorageBillingModel()).isEqualTo("LOGICAL");
1377-
assertThat(updatedDataset.getMaxTimeTravelHours()).isEqualTo(MAX_TIME_TRAVEL_HOURS);
1378-
1379-
updatedDataset = bigquery.update(updatedDataset.toBuilder().setLabels(null).build());
1380-
assertThat(updatedDataset.getLabels()).isEmpty();
1381-
dataset.delete();
1355+
try {
1356+
assertThat(dataset).isNotNull();
1357+
assertThat(dataset.getDatasetId().getProject())
1358+
.isEqualTo(bigquery.getOptions().getProjectId());
1359+
assertThat(dataset.getDatasetId().getDataset()).isEqualTo(datasetName);
1360+
assertThat(dataset.getDescription()).isEqualTo("Some Description");
1361+
assertThat(dataset.getLabels()).containsExactly("a", "b");
1362+
assertThat(dataset.getStorageBillingModel()).isNull();
1363+
assertThat(dataset.getMaxTimeTravelHours()).isNull();
1364+
1365+
Map<String, String> updateLabels = new HashMap<>();
1366+
updateLabels.put("x", "y");
1367+
updateLabels.put("a", null);
1368+
Dataset updatedDataset =
1369+
bigquery.update(
1370+
dataset.toBuilder()
1371+
.setDescription("Updated Description")
1372+
.setLabels(updateLabels)
1373+
.setStorageBillingModel("LOGICAL")
1374+
.setMaxTimeTravelHours(MAX_TIME_TRAVEL_HOURS)
1375+
.build());
1376+
assertThat(updatedDataset.getDescription()).isEqualTo("Updated Description");
1377+
assertThat(updatedDataset.getLabels()).containsExactly("x", "y");
1378+
assertThat(updatedDataset.getStorageBillingModel()).isEqualTo("LOGICAL");
1379+
assertThat(updatedDataset.getMaxTimeTravelHours()).isEqualTo(MAX_TIME_TRAVEL_HOURS);
1380+
1381+
updatedDataset = bigquery.update(updatedDataset.toBuilder().setLabels(null).build());
1382+
assertThat(updatedDataset.getLabels()).isEmpty();
1383+
} finally {
1384+
dataset.delete();
1385+
}
13821386
}
13831387

13841388
@Test
@@ -1387,27 +1391,30 @@ void testUpdateDatasetWithSelectedFields() {
13871391
Dataset dataset =
13881392
bigquery.create(
13891393
DatasetInfo.newBuilder(datasetName).setDescription("Some Description").build());
1390-
assertNotNull(dataset);
1391-
assertEquals(bigquery.getOptions().getProjectId(), dataset.getDatasetId().getProject());
1392-
assertEquals(datasetName, dataset.getDatasetId().getDataset());
1393-
assertEquals("Some Description", dataset.getDescription());
1394-
Dataset updatedDataset =
1395-
bigquery.update(
1396-
dataset.toBuilder().setDescription("Updated Description").build(),
1397-
DatasetOption.fields(DatasetField.DESCRIPTION));
1398-
assertEquals("Updated Description", updatedDataset.getDescription());
1399-
assertNull(updatedDataset.getCreationTime());
1400-
assertNull(updatedDataset.getDefaultTableLifetime());
1401-
assertNull(updatedDataset.getAcl());
1402-
assertNull(updatedDataset.getEtag());
1403-
assertNull(updatedDataset.getFriendlyName());
1404-
assertNull(updatedDataset.getGeneratedId());
1405-
assertNull(updatedDataset.getLastModified());
1406-
assertNull(updatedDataset.getLocation());
1407-
assertNull(updatedDataset.getSelfLink());
1408-
assertNull(updatedDataset.getStorageBillingModel());
1409-
assertNull(updatedDataset.getMaxTimeTravelHours());
1410-
dataset.delete();
1394+
try {
1395+
assertNotNull(dataset);
1396+
assertEquals(bigquery.getOptions().getProjectId(), dataset.getDatasetId().getProject());
1397+
assertEquals(datasetName, dataset.getDatasetId().getDataset());
1398+
assertEquals("Some Description", dataset.getDescription());
1399+
Dataset updatedDataset =
1400+
bigquery.update(
1401+
dataset.toBuilder().setDescription("Updated Description").build(),
1402+
DatasetOption.fields(DatasetField.DESCRIPTION));
1403+
assertEquals("Updated Description", updatedDataset.getDescription());
1404+
assertNull(updatedDataset.getCreationTime());
1405+
assertNull(updatedDataset.getDefaultTableLifetime());
1406+
assertNull(updatedDataset.getAcl());
1407+
assertNull(updatedDataset.getEtag());
1408+
assertNull(updatedDataset.getFriendlyName());
1409+
assertNull(updatedDataset.getGeneratedId());
1410+
assertNull(updatedDataset.getLastModified());
1411+
assertNull(updatedDataset.getLocation());
1412+
assertNull(updatedDataset.getSelfLink());
1413+
assertNull(updatedDataset.getStorageBillingModel());
1414+
assertNull(updatedDataset.getMaxTimeTravelHours());
1415+
} finally {
1416+
dataset.delete();
1417+
}
14111418
}
14121419

14131420
@Test

0 commit comments

Comments
 (0)