Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 5 insertions, 6 deletions

diff --git a/src/mongo/db/update/document_diff_calculator_test.cpp b/src/mongo/db/update/document_diff_calculator_test.cpp
index 5c83ac027c8..55a05051021 100644
--- a/src/mongo/db/update/document_diff_calculator_test.cpp
+++ b/src/mongo/db/update/document_diff_calculator_test.cpp
@@ -32,7 +32,6 @@
 #include <functional>
 
 #include "mongo/bson/bson_depth.h"
-#include "mongo/bson/bson_validate.h"
 #include "mongo/bson/json.h"
 #include "mongo/db/update/document_diff_calculator.h"
 #include "mongo/unittest/unittest.h"
@@ -296,7 +295,7 @@ TEST(DocumentDiffCalculatorTest, DeeplyNestObjectGenerateDiff) {
     preBob.append("largeField", largeValue);
     buildDeepObj(&preBob, "subObj", 0, maxDepth, functionToApply);
     auto preObj = preBob.done();
-    ASSERT(validateBSON(preObj).isOK());
+    ASSERT(preObj.valid());
 
     BSONObjBuilder postBob;
     postBob.append("largeField", largeValue);
@@ -313,7 +312,7 @@ TEST(DocumentDiffCalculatorTest, DeeplyNestObjectGenerateDiff) {
     // Deleting the deepest field should give the post object.
     diffOutput = doc_diff::computeDiff(preObj, postBob2.done(), 0, nullptr);
     ASSERT(diffOutput);
-    ASSERT_OK(validateBSON(diffOutput->diff));
+    ASSERT(diffOutput->diff.valid());
 
     BSONObjBuilder expectedOutputBuilder;
     buildDeepObj(&expectedOutputBuilder,
@@ -342,17 +341,17 @@ TEST(DocumentDiffCalculatorTest, DeepestObjectSubDiff) {
     value = 1;
     buildDeepObj(&bob1, "subObj", 0, BSONDepth::getMaxDepthForUserStorage(), functionToApply);
     auto preObj = bob1.done();
-    ASSERT_OK(validateBSON(preObj));
+    ASSERT(preObj.valid());
 
     BSONObjBuilder postBob;
     value = 2;
     buildDeepObj(&postBob, "subObj", 0, BSONDepth::getMaxDepthForUserStorage(), functionToApply);
     auto postObj = postBob.done();
-    ASSERT_OK(validateBSON(postObj));
+    ASSERT(postObj.valid());
 
     auto diffOutput = doc_diff::computeDiff(preObj, postObj, 0, nullptr);
     ASSERT(diffOutput);
-    ASSERT_OK(validateBSON(diffOutput->diff));
+    ASSERT(diffOutput->diff.valid());
 
     BSONObjBuilder expectedOutputBuilder;
     buildDeepObj(&expectedOutputBuilder,