From 5f81ad65669406a66b9ccb65b0a064276a716090 Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Wed, 10 Jul 2019 10:12:53 -0400 Subject: [PATCH 1/2] Add additional assertions to DatabaseClientImplTest. --- .../java/com/google/cloud/spanner/DatabaseClientImplTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java index 0a90e5bdcd5f..2f798599b176 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java @@ -189,6 +189,8 @@ public void testPartitionedDmlDoesNotTimeout() throws Exception { DatabaseClient client = spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]")); + assertThat(spanner.getOptions().getPartitionedDmlTimeout(), is(equalTo(Duration.ofHours(2L)))); + // PDML should not timeout with these settings. long updateCount = client.executePartitionedUpdate(UPDATE_STATEMENT); assertThat(updateCount, is(equalTo(UPDATE_COUNT))); @@ -228,6 +230,8 @@ public void testPartitionedDmlWithTimeout() throws Exception { DatabaseClient client = spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]")); + assertThat(spanner.getOptions().getPartitionedDmlTimeout(), is(equalTo(Duration.ofMillis(1L)))); + // PDML should timeout with these settings. try { client.executePartitionedUpdate(UPDATE_STATEMENT); From 2fd23784d57ce5bffc7ace3219eaa4cf776ada8d Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Wed, 10 Jul 2019 10:27:34 -0400 Subject: [PATCH 2/2] code format --- .../com/google/cloud/spanner/DatabaseClientImplTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java index 2f798599b176..22865dc427d2 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java @@ -189,7 +189,8 @@ public void testPartitionedDmlDoesNotTimeout() throws Exception { DatabaseClient client = spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]")); - assertThat(spanner.getOptions().getPartitionedDmlTimeout(), is(equalTo(Duration.ofHours(2L)))); + assertThat( + spanner.getOptions().getPartitionedDmlTimeout(), is(equalTo(Duration.ofHours(2L)))); // PDML should not timeout with these settings. long updateCount = client.executePartitionedUpdate(UPDATE_STATEMENT); @@ -230,7 +231,8 @@ public void testPartitionedDmlWithTimeout() throws Exception { DatabaseClient client = spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]")); - assertThat(spanner.getOptions().getPartitionedDmlTimeout(), is(equalTo(Duration.ofMillis(1L)))); + assertThat( + spanner.getOptions().getPartitionedDmlTimeout(), is(equalTo(Duration.ofMillis(1L)))); // PDML should timeout with these settings. try {