From 1e26496daa3decd39b03fb3a907b0c74fdbee173 Mon Sep 17 00:00:00 2001
From: Olav Loite <koloite@gmail.com>
Date: Sun, 19 Jan 2020 19:04:10 +0100
Subject: [PATCH] fix: process review comments

---
 .../com/google/cloud/spanner/SpannerExceptionFactory.java    | 5 ++++-
 .../com/google/cloud/spanner/DatabaseClientImplTest.java     | 5 ++++-
 .../java/com/google/cloud/spanner/it/ITDatabaseTest.java     | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java
index 22b5f065e05..22703381507 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java
@@ -38,7 +38,10 @@
  */
 public final class SpannerExceptionFactory {
   static final String DATABASE_NOT_FOUND_MSG =
-      "Database not found: projects/.*/instances/.*/databases/.*\nresource_type: \"type.googleapis.com/google.spanner.admin.database.v1.Database\"\nresource_name: \"projects/.*/instances/.*/databases/.*\"\ndescription: \"Database does not exist.\"\n";
+      "Database not found: projects/.*/instances/.*/databases/.*\n"
+          + "resource_type: \"type.googleapis.com/google.spanner.admin.database.v1.Database\"\n"
+          + "resource_name: \"projects/.*/instances/.*/databases/.*\"\n"
+          + "description: \"Database does not exist.\"\n";
   private static final Pattern DATABASE_NOT_FOUND_MSG_PATTERN =
       Pattern.compile(".*" + DATABASE_NOT_FOUND_MSG + ".*");
 
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
index 92f09509624..c80f4585407 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
@@ -52,7 +52,10 @@
 @RunWith(JUnit4.class)
 public class DatabaseClientImplTest {
   private static final String DATABASE_NOT_FOUND_FORMAT =
-      SpannerExceptionFactory.DATABASE_NOT_FOUND_MSG.replaceAll("\\.\\*", "%s");
+      "Database not found: projects/%s/instances/%s/databases/%s\n"
+          + "resource_type: \"type.googleapis.com/google.spanner.admin.database.v1.Database\"\n"
+          + "resource_name: \"projects/%s/instances/%s/databases/%s\"\n"
+          + "description: \"Database does not exist.\"\n";
   private static final String TEST_PROJECT = "my-project";
   private static final String TEST_INSTANCE = "my-instance";
   private static final String TEST_DATABASE = "my-database";
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java
index 667e200227b..ef50365edcd 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITDatabaseTest.java
@@ -86,6 +86,7 @@ public void databaseDeletedTest() throws Exception {
       } catch (DatabaseNotFoundException e) {
         // This is what we expect.
         notFoundException = e;
+        break;
       }
     }
     assertThat(notFoundException).isNotNull();