New upstream version 6.0.20upstream

1 files changed, 2 insertions, 1 deletions

diff --git a/src/mongo/dbtests/jsontests.cpp b/src/mongo/dbtests/jsontests.cpp
index e175afbf22d..c4410a8c45e 100644
--- a/src/mongo/dbtests/jsontests.cpp
+++ b/src/mongo/dbtests/jsontests.cpp
@@ -625,7 +625,7 @@ void assertEquals(const std::string& json,
 }
 
 void checkEquivalence(const std::string& json, const BSONObj& bson) {
-    ASSERT(fromjson(json).valid());
+    ASSERT_OK(mongo::validateBSON(fromjson(json)));
     assertEquals(json, bson, fromjson(json), "mode: json-to-bson");
     assertEquals(json, bson, fromjson(tojson(bson)), "mode: <default>");
     assertEquals(json, bson, fromjson(tojson(bson, LegacyStrict)), "mode: strict");
@@ -836,6 +836,7 @@ TEST(FromJsonTest, BinDataTypes) {
         {0x05, MD5Type},
         {0x06, Encrypt},
         {0x07, Column},
+        {0x08, Sensitive},
         {0x80, bdtCustom},
     };
     for (const auto& ts : specs) {