SERVER-34399: Fix resume_token_test

2 files changed, 5 insertions, 8 deletions

diff --git a/src/mongo/db/pipeline/resume_token.cpp b/src/mongo/db/pipeline/resume_token.cpp
index c9050f8c63b..10f7360d99f 100644
--- a/src/mongo/db/pipeline/resume_token.cpp
+++ b/src/mongo/db/pipeline/resume_token.cpp
@@ -97,10 +97,10 @@ ResumeTokenData ResumeToken::getData() const {
     }
 
     BSONBinData keyStringBinData = _keyStringData.getBinData();
-    auto internalBson = KeyString::toBson(static_cast<const char*>(keyStringBinData.data),
-                                          keyStringBinData.length,
-                                          Ordering::make(BSONObj()),
-                                          typeBits);
+    auto internalBson = KeyString::toBsonSafe(static_cast<const char*>(keyStringBinData.data),
+                                              keyStringBinData.length,
+                                              Ordering::make(BSONObj()),
+                                              typeBits);
 
     BSONObjIterator i(internalBson);
     ResumeTokenData result;
diff --git a/src/mongo/db/pipeline/resume_token_test.cpp b/src/mongo/db/pipeline/resume_token_test.cpp
index d7256e897ab..2ac880c29c6 100644
--- a/src/mongo/db/pipeline/resume_token_test.cpp
+++ b/src/mongo/db/pipeline/resume_token_test.cpp
@@ -304,7 +304,7 @@ TEST(ResumeToken, FailsToDecodeInvalidKeyStringBinData) {
     Timestamp ts(1010, 4);
     ResumeTokenData tokenData;
     tokenData.clusterTime = ts;
-    auto goodTokenDocBinData = ResumeToken(tokenData).toDocument(Format::kBinData);
+    auto goodTokenDocBinData = ResumeToken(tokenData).toDocument();
     auto goodData = goodTokenDocBinData["_data"].getBinData();
     const unsigned char zeroes[] = {0, 0, 0, 0, 0};
     const unsigned char nonsense[] = {165, 85, 77, 86, 255};
@@ -314,9 +314,6 @@ TEST(ResumeToken, FailsToDecodeInvalidKeyStringBinData) {
         ResumeToken::parse(Document{{"_data"_sd, BSONBinData(zeroes, 0, BinDataGeneral)}});
     ASSERT_THROWS_CODE(emptyToken.getData(), AssertionException, 40649);
 
-    auto incorrectType = ResumeToken::parse(Document{{"_data"_sd, "string"_sd}});
-    ASSERT_THROWS_CODE(incorrectType.getData(), AssertionException, ErrorCodes::FailedToParse);
-
     // Data of correct type with a bunch of zeros.
     auto zeroesToken = ResumeToken::parse(
         Document{{"_data"_sd, BSONBinData(zeroes, sizeof(zeroes), BinDataGeneral)}});