SERVER-53680 Use IDL for KeysCollectionDocument

1 files changed, 22 insertions, 16 deletions

diff --git a/src/mongo/db/keys_collection_document_test.cpp b/src/mongo/db/keys_collection_document_test.cpp
index dfa6124a212..6be5e268507 100644
--- a/src/mongo/db/keys_collection_document_test.cpp
+++ b/src/mongo/db/keys_collection_document_test.cpp
@@ -30,7 +30,8 @@
 #include "mongo/platform/basic.h"
 
 #include "mongo/db/jsobj.h"
-#include "mongo/db/keys_collection_document.h"
+#include "mongo/db/keys_collection_document_gen.h"
+#include "mongo/db/time_proof_service.h"
 #include "mongo/unittest/unittest.h"
 
 namespace mongo {
@@ -52,10 +53,7 @@ TEST(KeysCollectionDocument, Roundtrip) {
     KeysCollectionDocument keysCollectionDoc(keyId, purpose, key, expiresAt);
 
     auto serializedObj = keysCollectionDoc.toBSON();
-
-    auto parseStatus = KeysCollectionDocument::fromBSON(serializedObj);
-    ASSERT_OK(parseStatus.getStatus());
-    const auto& parsedKey = parseStatus.getValue();
+    auto parsedKey = KeysCollectionDocument::parse(IDLParserErrorContext("keyDoc"), serializedObj);
 
     ASSERT_EQ(keyId, parsedKey.getKeyId());
     ASSERT_EQ(purpose, parsedKey.getPurpose());
@@ -78,8 +76,10 @@ TEST(KeysCollectionDocument, MissingKeyIdShouldFailToParse) {
     expiresAt.asTimestamp().append(builder.bb(), "expiresAt");
 
     auto serializedObj = builder.done();
-    auto status = KeysCollectionDocument::fromBSON(serializedObj).getStatus();
-    ASSERT_EQ(ErrorCodes::NoSuchKey, status);
+    ASSERT_THROWS_CODE(
+        KeysCollectionDocument::parse(IDLParserErrorContext("keyDoc"), serializedObj),
+        AssertionException,
+        40414);
 }
 
 TEST(KeysCollectionDocument, MissingPurposeShouldFailToParse) {
@@ -92,13 +92,15 @@ TEST(KeysCollectionDocument, MissingPurposeShouldFailToParse) {
     const auto expiresAt = LogicalTime(Timestamp(100, 200));
 
     BSONObjBuilder builder;
-    builder.append("keyId", keyId);
+    builder.append("_id", keyId);
     builder.append("key", BSONBinData(key.data(), key.size(), BinDataGeneral));
     expiresAt.asTimestamp().append(builder.bb(), "expiresAt");
 
     auto serializedObj = builder.done();
-    auto status = KeysCollectionDocument::fromBSON(serializedObj).getStatus();
-    ASSERT_EQ(ErrorCodes::NoSuchKey, status);
+    ASSERT_THROWS_CODE(
+        KeysCollectionDocument::parse(IDLParserErrorContext("keyDoc"), serializedObj),
+        AssertionException,
+        40414);
 }
 
 TEST(KeysCollectionDocument, MissingKeyShouldFailToParse) {
@@ -109,13 +111,15 @@ TEST(KeysCollectionDocument, MissingKeyShouldFailToParse) {
     const auto expiresAt = LogicalTime(Timestamp(100, 200));
 
     BSONObjBuilder builder;
-    builder.append("keyId", keyId);
+    builder.append("_id", keyId);
     builder.append("purpose", purpose);
     expiresAt.asTimestamp().append(builder.bb(), "expiresAt");
 
     auto serializedObj = builder.done();
-    auto status = KeysCollectionDocument::fromBSON(serializedObj).getStatus();
-    ASSERT_EQ(ErrorCodes::NoSuchKey, status);
+    ASSERT_THROWS_CODE(
+        KeysCollectionDocument::parse(IDLParserErrorContext("keyDoc"), serializedObj),
+        AssertionException,
+        40414);
 }
 
 TEST(KeysCollectionDocument, MissingExpiresAtShouldFailToParse) {
@@ -128,13 +132,15 @@ TEST(KeysCollectionDocument, MissingExpiresAtShouldFailToParse) {
     TimeProofService::Key key(keyHash);
 
     BSONObjBuilder builder;
-    builder.append("keyId", keyId);
+    builder.append("_id", keyId);
     builder.append("purpose", purpose);
     builder.append("key", BSONBinData(key.data(), key.size(), BinDataGeneral));
 
     auto serializedObj = builder.done();
-    auto status = KeysCollectionDocument::fromBSON(serializedObj).getStatus();
-    ASSERT_EQ(ErrorCodes::NoSuchKey, status);
+    ASSERT_THROWS_CODE(
+        KeysCollectionDocument::parse(IDLParserErrorContext("keyDoc"), serializedObj),
+        AssertionException,
+        40414);
 }
 
 }  // namespace