From 10f1714c7a213095b41d8458ba4e54495f401db1 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Mon, 8 Jan 2024 14:22:43 -0500 Subject: [PATCH] Firestore: Remove obsolete special case from tests when verifying "missing index" error message in non-default DB --- .../google/cloud/firestore/it/ITQueryAggregationsTest.java | 6 +----- .../com/google/cloud/firestore/it/ITQueryCountTest.java | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITQueryAggregationsTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITQueryAggregationsTest.java index 7659d4656..8bb30a032 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITQueryAggregationsTest.java +++ b/google-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 index fce1d87d6..5df13ff6a 100644 --- 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() {