Firestore: Remove obsolete special case from tests when verifying "mi…

…ssing index" error message in non-default DB
googleapis · Jan 8, 2024 · 10f1714 · 10f1714
1 parent 3060e86
commit 10f1714
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/...-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITQueryAggregationsTest.java b/...-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITQueryAggregationsTest.java
@@ -1101,10 +1101,6 @@ public void aggregateQueryShouldFailWithMessageWithConsoleLinkIfMissingIndex() {
 
     Throwable throwable = executionException.getCause();
     assertThat(throwable).hasMessageThat().ignoringCase().contains("index");
-    // TODO(b/316359394) Remove this check for the default databases once cl/582465034 is rolled out
-    //  to production.
-    if (collection.getFirestore().getOptions().getDatabaseId().equals("(default)")) {
-      assertThat(throwable).hasMessageThat().contains("https://console.firebase.google.com");
-    }
+    assertThat(throwable).hasMessageThat().contains("https://console.firebase.google.com");
   }
 }
diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITQueryCountTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITQueryCountTest.java
@@ -386,11 +386,7 @@ public void countQueryShouldFailWithMessageWithConsoleLinkIfMissingIndex() {
 
     Throwable throwable = executionException.getCause();
     assertThat(throwable).hasMessageThat().ignoringCase().contains("index");
-    // TODO(b/316359394) Remove this check for the default databases once cl/582465034 is rolled out
-    //  to production.
-    if (collection.getFirestore().getOptions().getDatabaseId().equals("(default)")) {
-      assertThat(throwable).hasMessageThat().contains("https://console.firebase.google.com");
-    }
+    assertThat(throwable).hasMessageThat().contains("https://console.firebase.google.com");
   }
 
   private CollectionReference createEmptyCollection() {