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/db/query/query_request_test.cpp b/src/mongo/db/query/query_request_test.cpp
index 6fa047efdca..f5fcc6b5245 100644
--- a/src/mongo/db/query/query_request_test.cpp
+++ b/src/mongo/db/query/query_request_test.cpp
@@ -231,7 +231,7 @@ TEST(QueryRequestTest, AllowTailableWithNaturalSort) {
     auto result = QueryRequest::makeFromFindCommand(nss, cmdObj, isExplain);
     ASSERT_OK(result.getStatus());
     ASSERT_TRUE(result.getValue()->isTailable());
-    ASSERT_EQ(result.getValue()->getSort(), BSON("$natural" << 1));
+    ASSERT_BSONOBJ_EQ(result.getValue()->getSort(), BSON("$natural" << 1));
 }
 
 TEST(QueryRequestTest, IsIsolatedReturnsTrueWithIsolated) {
@@ -398,9 +398,9 @@ TEST(QueryRequestTest, ParseFromCommandHintAsString) {
         assertGet(QueryRequest::makeFromFindCommand(nss, cmdObj, isExplain)));
 
     BSONObj hintObj = qr->getHint();
-    ASSERT_EQUALS(BSON("$hint"
-                       << "foo_1"),
-                  hintObj);
+    ASSERT_BSONOBJ_EQ(BSON("$hint"
+                           << "foo_1"),
+                      hintObj);
 }
 
 TEST(QueryRequestTest, ParseFromCommandValidSortProj) {
@@ -824,7 +824,7 @@ TEST(QueryRequestTest, ParseFromCommandSkipIsZero) {
     bool isExplain = false;
     unique_ptr<QueryRequest> qr(
         assertGet(QueryRequest::makeFromFindCommand(nss, cmdObj, isExplain)));
-    ASSERT_EQ(BSON("a" << 3), qr->getFilter());
+    ASSERT_BSONOBJ_EQ(BSON("a" << 3), qr->getFilter());
     ASSERT_FALSE(qr->getSkip());
 }
 
@@ -848,7 +848,7 @@ TEST(QueryRequestTest, ParseFromCommandLimitIsZero) {
     bool isExplain = false;
     unique_ptr<QueryRequest> qr(
         assertGet(QueryRequest::makeFromFindCommand(nss, cmdObj, isExplain)));
-    ASSERT_EQ(BSON("a" << 3), qr->getFilter());
+    ASSERT_BSONOBJ_EQ(BSON("a" << 3), qr->getFilter());
     ASSERT_FALSE(qr->getLimit());
 }