1 files changed, 26 insertions, 6 deletions
diff --git a/Firestore/core/test/firebase/firestore/util/status_test_util.h b/Firestore/core/test/firebase/firestore/util/status_test_util.h
index 745f3aa..fcf9135 100644
--- a/Firestore/core/test/firebase/firestore/util/status_test_util.h
+++ b/Firestore/core/test/firebase/firestore/util/status_test_util.h
@@ -20,16 +20,36 @@
 #include "Firestore/core/src/firebase/firestore/util/status.h"
 #include "gtest/gtest.h"
 
-// Macros for testing the results of functions that return tensorflow::Status.
-#define EXPECT_OK(statement) \
-  EXPECT_EQ(::firebase::firestore::util::Status::OK(), (statement))
-#define ASSERT_OK(statement) \
-  ASSERT_EQ(::firebase::firestore::util::Status::OK(), (statement))
+namespace firebase {
+namespace firestore {
+namespace util {
+
+inline testing::AssertionResult Equal(Status expected, Status actual) {
+  if (expected != actual) {
+    return testing::AssertionFailure()
+           << "Should have seen status " << expected.ToString() << " but got "
+           << actual.ToString();
+  }
+
+  return testing::AssertionSuccess();
+}
+
+}  // namespace util
+}  // namespace firestore
+}  // namespace firebase
+
+// Macros for testing the results of functions that return util::Status.
+#define EXPECT_OK(statement)                      \
+  EXPECT_TRUE(::firebase::firestore::util::Equal( \
+      ::firebase::firestore::util::Status::OK(), (statement)));
+#define ASSERT_OK(statement)                      \
+  ASSERT_TRUE(::firebase::firestore::util::Equal( \
+      ::firebase::firestore::util::Status::OK(), (statement)));
 
 // There are no EXPECT_NOT_OK/ASSERT_NOT_OK macros since they would not
 // provide much value (when they fail, they would just print the OK status
 // which conveys no more information than EXPECT_FALSE(status.ok());
 // If you want to check for particular errors, a better alternative is:
-// EXPECT_EQ(..expected tensorflow::error::Code..., status.code());
+// EXPECT_EQ(..expected FirestoreErrorCode..., status.code());
 
 #endif  // FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_UTIL_STATUS_TEST_UTIL_H_