From 74c1d168662fc59e6e5fcc84124e1db4b1236933 Mon Sep 17 00:00:00 2001 From: cherylEnkidu Date: Thu, 13 Nov 2025 11:36:35 -0500 Subject: [PATCH 1/2] test cmake environment --- Firestore/core/test/unit/model/field_path_test.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Firestore/core/test/unit/model/field_path_test.cc b/Firestore/core/test/unit/model/field_path_test.cc index 6e3807784af..be0d3ee8bc9 100644 --- a/Firestore/core/test/unit/model/field_path_test.cc +++ b/Firestore/core/test/unit/model/field_path_test.cc @@ -180,6 +180,7 @@ TEST(FieldPath, IsPrefixOf) { TEST(FieldPath, AccessFailures) { const FieldPath path; +#if ABSL_HAVE_EXCEPTIONS ASSERT_ANY_THROW(path.first_segment()); ASSERT_ANY_THROW(path.last_segment()); ASSERT_ANY_THROW(path[0]); @@ -187,6 +188,9 @@ TEST(FieldPath, AccessFailures) { ASSERT_ANY_THROW(path.PopFirst()); ASSERT_ANY_THROW(path.PopFirst(2)); ASSERT_ANY_THROW(path.PopLast()); +#else + ASSERT_DEATH(path.first_segment(), "FIRESTORE INTERNAL ASSERTION FAILED") +#endif } TEST(FieldPath, Parsing) { From ff2597a78c1445d020d416a950fdfd587001f1af Mon Sep 17 00:00:00 2001 From: cherylEnkidu Date: Tue, 18 Nov 2025 16:25:32 -0500 Subject: [PATCH 2/2] use assert death --- .../core/test/unit/model/field_path_test.cc | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Firestore/core/test/unit/model/field_path_test.cc b/Firestore/core/test/unit/model/field_path_test.cc index be0d3ee8bc9..af52ddcfdf5 100644 --- a/Firestore/core/test/unit/model/field_path_test.cc +++ b/Firestore/core/test/unit/model/field_path_test.cc @@ -22,6 +22,7 @@ #include "Firestore/core/src/util/statusor.h" #include "Firestore/core/test/unit/testutil/status_testing.h" +#include "gtest/gtest-death-test.h" #include "gtest/gtest.h" namespace firebase { @@ -180,17 +181,13 @@ TEST(FieldPath, IsPrefixOf) { TEST(FieldPath, AccessFailures) { const FieldPath path; -#if ABSL_HAVE_EXCEPTIONS - ASSERT_ANY_THROW(path.first_segment()); - ASSERT_ANY_THROW(path.last_segment()); - ASSERT_ANY_THROW(path[0]); - ASSERT_ANY_THROW(path[1]); - ASSERT_ANY_THROW(path.PopFirst()); - ASSERT_ANY_THROW(path.PopFirst(2)); - ASSERT_ANY_THROW(path.PopLast()); -#else - ASSERT_DEATH(path.first_segment(), "FIRESTORE INTERNAL ASSERTION FAILED") -#endif + ASSERT_DEATH(path.first_segment(), "FIRESTORE INTERNAL ASSERTION FAILED"); + ASSERT_DEATH(path.last_segment(), "FIRESTORE INTERNAL ASSERTION FAILED"); + ASSERT_DEATH(path[0], "FIRESTORE INTERNAL ASSERTION FAILED"); + ASSERT_DEATH(path[1], "FIRESTORE INTERNAL ASSERTION FAILED"); + ASSERT_DEATH(path.PopFirst(), "FIRESTORE INTERNAL ASSERTION FAILED"); + ASSERT_DEATH(path.PopFirst(2), "FIRESTORE INTERNAL ASSERTION FAILED"); + ASSERT_DEATH(path.PopLast(), "FIRESTORE INTERNAL ASSERTION FAILED"); } TEST(FieldPath, Parsing) {