Fix EXPECT_EQ and FreeNanoPb message

Author: schmidt-sebastian

Firestore/core/src/model/object_value.h

@@ -120,7 +120,7 @@ inline bool operator==(const MutableObjectValue& lhs,
 
 inline std::ostream& operator<<(std::ostream& out,
                                 const MutableObjectValue& object_value) {
-  return out << CanonicalId(*object_value.value_);
+  return out << "ObjectValue(" << *object_value.value_ << ")";
 }
 
 }  // namespace model

Firestore/core/src/model/value_util.cc

@@ -305,8 +305,8 @@ bool ObjectEquals(const firebase::firestore::google_firestore_v1_Value& left,
   return true;
 }
 
-bool operator==(const google_firestore_v1_Value& lhs,
-                const google_firestore_v1_Value& rhs) {
+bool Equals(const google_firestore_v1_Value& lhs,
+            const google_firestore_v1_Value& rhs) {
   TypeOrder left_type = GetTypeOrder(lhs);
   TypeOrder right_type = GetTypeOrder(rhs);
   if (left_type != right_type) {

Firestore/core/src/model/value_util.h

@@ -54,6 +54,9 @@ TypeOrder GetTypeOrder(const google_firestore_v1_Value& value);
 util::ComparisonResult Compare(const google_firestore_v1_Value& left,
                                const google_firestore_v1_Value& right);
 
+bool Equals(const google_firestore_v1_Value& left,
+            const google_firestore_v1_Value& right);
+
 /**
  * Generate the canonical ID for the provided field value (as used in Target
  * serialization).
@@ -63,15 +66,23 @@ std::string CanonicalId(const google_firestore_v1_Value& value);
 /** Creates a copy of the contents of the Value proto. */
 google_firestore_v1_Value DeepClone(google_firestore_v1_Value source);
 
-bool operator==(const google_firestore_v1_Value& lhs,
-                const google_firestore_v1_Value& rhs);
+}  // namespace model
+
+inline bool operator==(const google_firestore_v1_Value& lhs,
+                       const google_firestore_v1_Value& rhs) {
+  return model::Equals(lhs, rhs);
+}
 
 inline bool operator!=(const google_firestore_v1_Value& lhs,
                        const google_firestore_v1_Value& rhs) {
-  return !(lhs == rhs);
+  return !model::Equals(lhs, rhs);
+}
+
+inline std::ostream& operator<<(std::ostream& out,
+                                const google_firestore_v1_Value& value) {
+  return out << model::CanonicalId(value);
 }
 
-}  // namespace model
 }  // namespace firestore
 }  // namespace firebase
 

Firestore/core/src/nanopb/fields_array.h

@@ -164,11 +164,6 @@ inline const pb_field_t* FieldsArray<google_protobuf_Empty>() {
   return google_protobuf_Empty_fields;
 }
 
-template <typename T>
-void FreeFieldsArray(T* message) {
-  FreeNanopbMessage(FieldsArray<T>(), message);
-}
-
 }  // namespace nanopb
 }  // namespace firestore
 }  // namespace firebase

Firestore/core/src/nanopb/message.h

@@ -227,6 +227,13 @@ std::string MakeStdString(const Message<T>& message) {
   return writer.Release();
 }
 
+
+/** Free the dynamically-allocated memory for the fields array of type T. */
+template <typename T>
+void FreeFieldsArray(T* message) {
+  FreeNanopbMessage(FieldsArray<T>(), message);
+}
+
 }  // namespace nanopb
 }  // namespace firestore
 }  // namespace firebase

Firestore/core/test/unit/model/value_util_test.cc

@@ -103,9 +103,11 @@ class ValueUtilTest : public ::testing::Test {
                       bool expected_equals) {
     for (const auto& val1 : left) {
       for (const auto& val2 : right) {
-        EXPECT_EQ(expected_equals, val1 == val2)
-            << "Equality check failed for '" << CanonicalId(val1) << "' and '"
-            << CanonicalId(val2) << "' (expected " << expected_equals << ")";
+        if (expected_equals) {
+          EXPECT_EQ(val1, val2);
+        } else {
+          EXPECT_NE(val1, val2);
+        }
       }
     }
   }
@@ -138,16 +140,12 @@ class ValueUtilTest : public ::testing::Test {
 
     [&] {
       nanopb::Message<google_firestore_v1_Value> clone2{DeepClone(value)};
-      EXPECT_TRUE(value == *clone2)
-          << "Equality failed for '" << CanonicalId(value) << "' and '"
-          << CanonicalId(*clone2) << "'";
+      EXPECT_EQ(value, *clone2);
       clone1 = nanopb::Message<google_firestore_v1_Value>{DeepClone(*clone2)};
     }();
 
     // `clone2` is destroyed at this point, but `clone1` should be still valid.
-    EXPECT_TRUE(value == *clone1)
-        << "Equality failed for '" << CanonicalId(value) << "' and '"
-        << CanonicalId(*clone1) << "'";
+    EXPECT_EQ(value, *clone1);
   }
 
  private: