diff options
Diffstat (limited to 'src/mongo/dbtests/jsontests.cpp')
| -rw-r--r-- | src/mongo/dbtests/jsontests.cpp | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/mongo/dbtests/jsontests.cpp b/src/mongo/dbtests/jsontests.cpp index c4410a8c45e..cb16219f51d 100644 --- a/src/mongo/dbtests/jsontests.cpp +++ b/src/mongo/dbtests/jsontests.cpp @@ -42,7 +42,6 @@ #include <limits> #include <sstream> -#include "mongo/bson/util/bsoncolumnbuilder.h" #include "mongo/db/jsobj.h" #include "mongo/db/json.h" #include "mongo/dbtests/dbtests.h" @@ -625,7 +624,7 @@ void assertEquals(const std::string& json, } void checkEquivalence(const std::string& json, const BSONObj& bson) { - ASSERT_OK(mongo::validateBSON(fromjson(json))); + ASSERT(fromjson(json).valid()); 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,27 +835,12 @@ TEST(FromJsonTest, BinDataTypes) { {0x05, MD5Type}, {0x06, Encrypt}, {0x07, Column}, - {0x08, Sensitive}, {0x80, bdtCustom}, }; for (const auto& ts : specs) { - if (ts.bdt == Column) { - BSONColumnBuilder cb(""); - cb.append(BSON("a" - << "abc") - .getField("a")); - BSONBinData columnData = cb.finalize(); - checkEquivalence(fmt::sprintf(R"({ "a" : { "$binary" : "%s", "$type" : "%02x" } })", - base64::encode(columnData.data, columnData.length), - ts.code), - BSONObjBuilder() - .appendBinData("a", columnData.length, ts.bdt, columnData.data) - .obj()); - } else { - checkEquivalence( - fmt::sprintf(R"({ "a" : { "$binary" : "YWJj", "$type" : "%02x" } })", ts.code), - BSONObjBuilder().appendBinData("a", 3, ts.bdt, "abc").obj()); - } + checkEquivalence( + fmt::sprintf(R"({ "a" : { "$binary" : "YWJj", "$type" : "%02x" } })", ts.code), + BSONObjBuilder().appendBinData("a", 3, ts.bdt, "abc").obj()); } } |