SERVER-24508 BSONObj::ComparatorInterface

BSONObj instances should now be compared via the comparator
interface's evaluate() method. This preferred over using
BSONObj::woCompare() directly. If the comparison doesn't
require any database semantics (e.g. there is no collation),
there is a global instance of the SimpleBSONObjComparator
which should be used for BSONObj comparisons. If the
comparison requires special semantics, then callers must
instantiate their own comparator object.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/mongo/bson/bson_field_test.cpp b/src/mongo/bson/bson_field_test.cpp
index b6fbb0fd565..0a0b2d9aec2 100644
--- a/src/mongo/bson/bson_field_test.cpp
+++ b/src/mongo/bson/bson_field_test.cpp
@@ -36,31 +36,31 @@ using mongo::BSONObj;
 TEST(Assignment, Simple) {
     BSONField<int> x("x");
     BSONObj o = BSON(x << 5);
-    ASSERT_EQUALS(BSON("x" << 5), o);
+    ASSERT_BSONOBJ_EQ(BSON("x" << 5), o);
 }
 
 TEST(Make, Simple) {
     BSONField<int> x("x");
     BSONObj o = BSON(x.make(5));
-    ASSERT_EQUALS(BSON("x" << 5), o);
+    ASSERT_BSONOBJ_EQ(BSON("x" << 5), o);
 }
 
 TEST(Query, GreaterThan) {
     BSONField<int> x("x");
     BSONObj o = BSON(x(5));
-    ASSERT_EQUALS(BSON("x" << 5), o);
+    ASSERT_BSONOBJ_EQ(BSON("x" << 5), o);
 
     o = BSON(x.gt(5));
-    ASSERT_EQUALS(BSON("x" << BSON("$gt" << 5)), o);
+    ASSERT_BSONOBJ_EQ(BSON("x" << BSON("$gt" << 5)), o);
 }
 
 TEST(Query, NotEqual) {
     BSONField<int> x("x");
     BSONObj o = BSON(x(10));
-    ASSERT_EQUALS(BSON("x" << 10), o);
+    ASSERT_BSONOBJ_EQ(BSON("x" << 10), o);
 
     o = BSON(x.ne(5));
-    ASSERT_EQUALS(BSON("x" << BSON("$ne" << 5)), o);
+    ASSERT_BSONOBJ_EQ(BSON("x" << BSON("$ne" << 5)), o);
 }
 
 }  // unnamed namespace