Skip to content

J
json
Unverified Commit ddff459f by Niels Lohmann
Options

✅ add test for BSON binary subtype

parent 421a0843
Showing with 108 additions and 78 deletions
test/src/unit-bson.cpp
...@@ -106,7 +106,7 @@ TEST_CASE("BSON") ...@@ -106,7 +106,7 @@ TEST_CASE("BSON")
SECTION("string length must be at least 1") SECTION("string length must be at least 1")
{ {
// from https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11175 // from https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11175
std::vector<uint8_t> v = std::vector<std::uint8_t> v =
{ {
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x02, 0x02,
...@@ -123,7 +123,7 @@ TEST_CASE("BSON") ...@@ -123,7 +123,7 @@ TEST_CASE("BSON")
SECTION("empty object") SECTION("empty object")
{ {
json j = json::object(); json j = json::object();
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x05, 0x00, 0x00, 0x00, // size (little endian) 0x05, 0x00, 0x00, 0x00, // size (little endian)
// no entries // no entries
...@@ -145,7 +145,7 @@ TEST_CASE("BSON") ...@@ -145,7 +145,7 @@ TEST_CASE("BSON")
{ "entry", true } { "entry", true }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x0D, 0x00, 0x00, 0x00, // size (little endian) 0x0D, 0x00, 0x00, 0x00, // size (little endian)
0x08, // entry: boolean 0x08, // entry: boolean
...@@ -169,7 +169,7 @@ TEST_CASE("BSON") ...@@ -169,7 +169,7 @@ TEST_CASE("BSON")
{ "entry", false } { "entry", false }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x0D, 0x00, 0x00, 0x00, // size (little endian) 0x0D, 0x00, 0x00, 0x00, // size (little endian)
0x08, // entry: boolean 0x08, // entry: boolean
...@@ -193,7 +193,7 @@ TEST_CASE("BSON") ...@@ -193,7 +193,7 @@ TEST_CASE("BSON")
{ "entry", 4.2 } { "entry", 4.2 }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x14, 0x00, 0x00, 0x00, // size (little endian) 0x14, 0x00, 0x00, 0x00, // size (little endian)
0x01, /// entry: double 0x01, /// entry: double
...@@ -217,7 +217,7 @@ TEST_CASE("BSON") ...@@ -217,7 +217,7 @@ TEST_CASE("BSON")
{ "entry", "bsonstr" } { "entry", "bsonstr" }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x18, 0x00, 0x00, 0x00, // size (little endian) 0x18, 0x00, 0x00, 0x00, // size (little endian)
0x02, /// entry: string (UTF-8) 0x02, /// entry: string (UTF-8)
...@@ -241,7 +241,7 @@ TEST_CASE("BSON") ...@@ -241,7 +241,7 @@ TEST_CASE("BSON")
{ "entry", nullptr } { "entry", nullptr }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x0C, 0x00, 0x00, 0x00, // size (little endian) 0x0C, 0x00, 0x00, 0x00, // size (little endian)
0x0A, /// entry: null 0x0A, /// entry: null
...@@ -264,7 +264,7 @@ TEST_CASE("BSON") ...@@ -264,7 +264,7 @@ TEST_CASE("BSON")
{ "entry", std::int32_t{0x12345678} } { "entry", std::int32_t{0x12345678} }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x10, 0x00, 0x00, 0x00, // size (little endian) 0x10, 0x00, 0x00, 0x00, // size (little endian)
0x10, /// entry: int32 0x10, /// entry: int32
...@@ -288,7 +288,7 @@ TEST_CASE("BSON") ...@@ -288,7 +288,7 @@ TEST_CASE("BSON")
{ "entry", std::int64_t{0x1234567804030201} } { "entry", std::int64_t{0x1234567804030201} }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x14, 0x00, 0x00, 0x00, // size (little endian) 0x14, 0x00, 0x00, 0x00, // size (little endian)
0x12, /// entry: int64 0x12, /// entry: int64
...@@ -312,7 +312,7 @@ TEST_CASE("BSON") ...@@ -312,7 +312,7 @@ TEST_CASE("BSON")
{ "entry", std::int32_t{-1} } { "entry", std::int32_t{-1} }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x10, 0x00, 0x00, 0x00, // size (little endian) 0x10, 0x00, 0x00, 0x00, // size (little endian)
0x10, /// entry: int32 0x10, /// entry: int32
...@@ -336,7 +336,7 @@ TEST_CASE("BSON") ...@@ -336,7 +336,7 @@ TEST_CASE("BSON")
{ "entry", std::int64_t{-1} } { "entry", std::int64_t{-1} }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x10, 0x00, 0x00, 0x00, // size (little endian) 0x10, 0x00, 0x00, 0x00, // size (little endian)
0x10, /// entry: int32 0x10, /// entry: int32
...@@ -361,7 +361,7 @@ TEST_CASE("BSON") ...@@ -361,7 +361,7 @@ TEST_CASE("BSON")
{ "entry", std::uint64_t{0x1234567804030201} } { "entry", std::uint64_t{0x1234567804030201} }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x14, 0x00, 0x00, 0x00, // size (little endian) 0x14, 0x00, 0x00, 0x00, // size (little endian)
0x12, /// entry: int64 0x12, /// entry: int64
...@@ -385,7 +385,7 @@ TEST_CASE("BSON") ...@@ -385,7 +385,7 @@ TEST_CASE("BSON")
{ "entry", std::uint64_t{0x42} } { "entry", std::uint64_t{0x42} }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x10, 0x00, 0x00, 0x00, // size (little endian) 0x10, 0x00, 0x00, 0x00, // size (little endian)
0x10, /// entry: int32 0x10, /// entry: int32
...@@ -409,7 +409,7 @@ TEST_CASE("BSON") ...@@ -409,7 +409,7 @@ TEST_CASE("BSON")
{ "entry", json::object() } { "entry", json::object() }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x11, 0x00, 0x00, 0x00, // size (little endian) 0x11, 0x00, 0x00, 0x00, // size (little endian)
0x03, /// entry: embedded document 0x03, /// entry: embedded document
...@@ -437,7 +437,7 @@ TEST_CASE("BSON") ...@@ -437,7 +437,7 @@ TEST_CASE("BSON")
{ "entry", json::array() } { "entry", json::array() }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x11, 0x00, 0x00, 0x00, // size (little endian) 0x11, 0x00, 0x00, 0x00, // size (little endian)
0x04, /// entry: embedded document 0x04, /// entry: embedded document
...@@ -465,7 +465,7 @@ TEST_CASE("BSON") ...@@ -465,7 +465,7 @@ TEST_CASE("BSON")
{ "entry", json::array({1, 2, 3, 4, 5, 6, 7, 8}) } { "entry", json::array({1, 2, 3, 4, 5, 6, 7, 8}) }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x49, 0x00, 0x00, 0x00, // size (little endian) 0x49, 0x00, 0x00, 0x00, // size (little endian)
0x04, /// entry: embedded document 0x04, /// entry: embedded document
...@@ -496,13 +496,13 @@ TEST_CASE("BSON") ...@@ -496,13 +496,13 @@ TEST_CASE("BSON")
SECTION("non-empty object with binary member") SECTION("non-empty object with binary member")
{ {
const size_t N = 10; const size_t N = 10;
const auto s = std::vector<uint8_t>(N, 'x'); const auto s = std::vector<std::uint8_t>(N, 'x');
json j = json j =
{ {
{ "entry", json::binary_array(s) } { "entry", json::binary_array(s) }
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
0x1B, 0x00, 0x00, 0x00, // size (little endian) 0x1B, 0x00, 0x00, 0x00, // size (little endian)
0x05, // entry: binary 0x05, // entry: binary
...@@ -523,6 +523,36 @@ TEST_CASE("BSON") ...@@ -523,6 +523,36 @@ TEST_CASE("BSON")
CHECK(json::from_bson(result, true, false) == j); CHECK(json::from_bson(result, true, false) == j);
} }
SECTION("non-empty object with binary member with subtype")
{
// an MD5 hash
const std::vector<std::uint8_t> md5hash = {0xd7, 0x7e, 0x27, 0x54, 0xbe, 0x12, 0x37, 0xfe, 0xd6, 0x0c, 0x33, 0x98, 0x30, 0x3b, 0x8d, 0xc4};
json j =
{
{ "entry", json::binary_array(md5hash, 5) }
};
std::vector<std::uint8_t> expected =
{
0x21, 0x00, 0x00, 0x00, // size (little endian)
0x05, // entry: binary
'e', 'n', 't', 'r', 'y', '\x00',
0x10, 0x00, 0x00, 0x00, // size of binary (little endian)
0x05, // MD5 binary subtype
0xd7, 0x7e, 0x27, 0x54, 0xbe, 0x12, 0x37, 0xfe, 0xd6, 0x0c, 0x33, 0x98, 0x30, 0x3b, 0x8d, 0xc4,
0x00 // end marker
};
const auto result = json::to_bson(j);
CHECK(result == expected);
// roundtrip
CHECK(json::from_bson(result) == j);
CHECK(json::from_bson(result, true, false) == j);
}
SECTION("Some more complex document") SECTION("Some more complex document")
{ {
// directly encoding uint64 is not supported in bson (only for timestamp values) // directly encoding uint64 is not supported in bson (only for timestamp values)
...@@ -534,7 +564,7 @@ TEST_CASE("BSON") ...@@ -534,7 +564,7 @@ TEST_CASE("BSON")
{"object", {{ "string", "value" }}} {"object", {{ "string", "value" }}}
}; };
std::vector<uint8_t> expected = std::vector<std::uint8_t> expected =
{ {
/*size */ 0x4f, 0x00, 0x00, 0x00, /*size */ 0x4f, 0x00, 0x00, 0x00,
/*entry*/ 0x01, 'd', 'o', 'u', 'b', 'l', 'e', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x45, 0x40, /*entry*/ 0x01, 'd', 'o', 'u', 'b', 'l', 'e', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x45, 0x40,
...@@ -592,7 +622,7 @@ TEST_CASE("BSON input/output_adapters") ...@@ -592,7 +622,7 @@ TEST_CASE("BSON input/output_adapters")
{"object", {{ "string", "value" }}} {"object", {{ "string", "value" }}}
}; };
std::vector<uint8_t> bson_representation = std::vector<std::uint8_t> bson_representation =
{ {
/*size */ 0x4f, 0x00, 0x00, 0x00, /*size */ 0x4f, 0x00, 0x00, 0x00,
/*entry*/ 0x01, 'd', 'o', 'u', 'b', 'l', 'e', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x45, 0x40, /*entry*/ 0x01, 'd', 'o', 'u', 'b', 'l', 'e', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x45, 0x40,
...@@ -677,7 +707,7 @@ class SaxCountdown ...@@ -677,7 +707,7 @@ class SaxCountdown
return events_left-- > 0; return events_left-- > 0;
} }
bool binary(std::vector<uint8_t>&) bool binary(std::vector<std::uint8_t>&)
{ {
return events_left-- > 0; return events_left-- > 0;
} }
...@@ -721,7 +751,7 @@ TEST_CASE("Incomplete BSON Input") ...@@ -721,7 +751,7 @@ TEST_CASE("Incomplete BSON Input")
{ {
SECTION("Incomplete BSON Input 1") SECTION("Incomplete BSON Input 1")
{ {
std::vector<uint8_t> incomplete_bson = std::vector<std::uint8_t> incomplete_bson =
{ {
0x0D, 0x00, 0x00, 0x00, // size (little endian) 0x0D, 0x00, 0x00, 0x00, // size (little endian)
0x08, // entry: boolean 0x08, // entry: boolean
...@@ -741,7 +771,7 @@ TEST_CASE("Incomplete BSON Input") ...@@ -741,7 +771,7 @@ TEST_CASE("Incomplete BSON Input")
SECTION("Incomplete BSON Input 2") SECTION("Incomplete BSON Input 2")
{ {
std::vector<uint8_t> incomplete_bson = std::vector<std::uint8_t> incomplete_bson =
{ {
0x0D, 0x00, 0x00, 0x00, // size (little endian) 0x0D, 0x00, 0x00, 0x00, // size (little endian)
0x08, // entry: boolean, unexpected EOF 0x08, // entry: boolean, unexpected EOF
...@@ -759,7 +789,7 @@ TEST_CASE("Incomplete BSON Input") ...@@ -759,7 +789,7 @@ TEST_CASE("Incomplete BSON Input")
SECTION("Incomplete BSON Input 3") SECTION("Incomplete BSON Input 3")
{ {
std::vector<uint8_t> incomplete_bson = std::vector<std::uint8_t> incomplete_bson =
{ {
0x41, 0x00, 0x00, 0x00, // size (little endian) 0x41, 0x00, 0x00, 0x00, // size (little endian)
0x04, /// entry: embedded document 0x04, /// entry: embedded document
...@@ -783,7 +813,7 @@ TEST_CASE("Incomplete BSON Input") ...@@ -783,7 +813,7 @@ TEST_CASE("Incomplete BSON Input")
SECTION("Incomplete BSON Input 4") SECTION("Incomplete BSON Input 4")
{ {
std::vector<uint8_t> incomplete_bson = std::vector<std::uint8_t> incomplete_bson =
{ {
0x0D, 0x00, // size (incomplete), unexpected EOF 0x0D, 0x00, // size (incomplete), unexpected EOF
}; };
...@@ -823,7 +853,7 @@ TEST_CASE("Incomplete BSON Input") ...@@ -823,7 +853,7 @@ TEST_CASE("Incomplete BSON Input")
TEST_CASE("Unsupported BSON input") TEST_CASE("Unsupported BSON input")
{ {
std::vector<uint8_t> bson = std::vector<std::uint8_t> bson =
{ {
0x0C, 0x00, 0x00, 0x00, // size (little endian) 0x0C, 0x00, 0x00, 0x00, // size (little endian)
0xFF, // entry type: Min key (not supported yet) 0xFF, // entry type: Min key (not supported yet)
...@@ -876,19 +906,19 @@ TEST_CASE("BSON numerical data") ...@@ -876,19 +906,19 @@ TEST_CASE("BSON numerical data")
CHECK(j.at("entry").is_number_integer()); CHECK(j.at("entry").is_number_integer());
std::uint64_t iu = *reinterpret_cast<std::uint64_t*>(&i); std::uint64_t iu = *reinterpret_cast<std::uint64_t*>(&i);
std::vector<uint8_t> expected_bson = std::vector<std::uint8_t> expected_bson =
{ {
0x14u, 0x00u, 0x00u, 0x00u, // size (little endian) 0x14u, 0x00u, 0x00u, 0x00u, // size (little endian)
0x12u, /// entry: int64 0x12u, /// entry: int64
'e', 'n', 't', 'r', 'y', '\x00', 'e', 'n', 't', 'r', 'y', '\x00',
static_cast<uint8_t>((iu >> (8u * 0u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 0u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 1u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 1u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 2u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 2u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 3u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 3u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 4u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 4u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 5u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 5u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 6u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 6u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 7u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 7u)) & 0xffu),
0x00u // end marker 0x00u // end marker
}; };
...@@ -948,15 +978,15 @@ TEST_CASE("BSON numerical data") ...@@ -948,15 +978,15 @@ TEST_CASE("BSON numerical data")
CHECK(j.at("entry").is_number_integer()); CHECK(j.at("entry").is_number_integer());
std::uint32_t iu = *reinterpret_cast<std::uint32_t*>(&i); std::uint32_t iu = *reinterpret_cast<std::uint32_t*>(&i);
std::vector<uint8_t> expected_bson = std::vector<std::uint8_t> expected_bson =
{ {
0x10u, 0x00u, 0x00u, 0x00u, // size (little endian) 0x10u, 0x00u, 0x00u, 0x00u, // size (little endian)
0x10u, /// entry: int32 0x10u, /// entry: int32
'e', 'n', 't', 'r', 'y', '\x00', 'e', 'n', 't', 'r', 'y', '\x00',
static_cast<uint8_t>((iu >> (8u * 0u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 0u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 1u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 1u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 2u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 2u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 3u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 3u)) & 0xffu),
0x00u // end marker 0x00u // end marker
}; };
...@@ -1001,19 +1031,19 @@ TEST_CASE("BSON numerical data") ...@@ -1001,19 +1031,19 @@ TEST_CASE("BSON numerical data")
CHECK(j.at("entry").is_number_integer()); CHECK(j.at("entry").is_number_integer());
std::uint64_t iu = *reinterpret_cast<std::uint64_t*>(&i); std::uint64_t iu = *reinterpret_cast<std::uint64_t*>(&i);
std::vector<uint8_t> expected_bson = std::vector<std::uint8_t> expected_bson =
{ {
0x14u, 0x00u, 0x00u, 0x00u, // size (little endian) 0x14u, 0x00u, 0x00u, 0x00u, // size (little endian)
0x12u, /// entry: int64 0x12u, /// entry: int64
'e', 'n', 't', 'r', 'y', '\x00', 'e', 'n', 't', 'r', 'y', '\x00',
static_cast<uint8_t>((iu >> (8u * 0u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 0u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 1u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 1u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 2u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 2u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 3u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 3u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 4u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 4u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 5u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 5u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 6u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 6u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 7u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 7u)) & 0xffu),
0x00u // end marker 0x00u // end marker
}; };
...@@ -1062,15 +1092,15 @@ TEST_CASE("BSON numerical data") ...@@ -1062,15 +1092,15 @@ TEST_CASE("BSON numerical data")
}; };
auto iu = i; auto iu = i;
std::vector<uint8_t> expected_bson = std::vector<std::uint8_t> expected_bson =
{ {
0x10u, 0x00u, 0x00u, 0x00u, // size (little endian) 0x10u, 0x00u, 0x00u, 0x00u, // size (little endian)
0x10u, /// entry: int32 0x10u, /// entry: int32
'e', 'n', 't', 'r', 'y', '\x00', 'e', 'n', 't', 'r', 'y', '\x00',
static_cast<uint8_t>((iu >> (8u * 0u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 0u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 1u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 1u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 2u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 2u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 3u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 3u)) & 0xffu),
0x00u // end marker 0x00u // end marker
}; };
...@@ -1117,19 +1147,19 @@ TEST_CASE("BSON numerical data") ...@@ -1117,19 +1147,19 @@ TEST_CASE("BSON numerical data")
}; };
auto iu = i; auto iu = i;
std::vector<uint8_t> expected_bson = std::vector<std::uint8_t> expected_bson =
{ {
0x14u, 0x00u, 0x00u, 0x00u, // size (little endian) 0x14u, 0x00u, 0x00u, 0x00u, // size (little endian)
0x12u, /// entry: int64 0x12u, /// entry: int64
'e', 'n', 't', 'r', 'y', '\x00', 'e', 'n', 't', 'r', 'y', '\x00',
static_cast<uint8_t>((iu >> (8u * 0u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 0u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 1u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 1u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 2u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 2u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 3u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 3u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 4u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 4u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 5u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 5u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 6u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 6u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 7u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 7u)) & 0xffu),
0x00u // end marker 0x00u // end marker
}; };
...@@ -1167,19 +1197,19 @@ TEST_CASE("BSON numerical data") ...@@ -1167,19 +1197,19 @@ TEST_CASE("BSON numerical data")
}; };
auto iu = i; auto iu = i;
std::vector<uint8_t> expected_bson = std::vector<std::uint8_t> expected_bson =
{ {
0x14u, 0x00u, 0x00u, 0x00u, // size (little endian) 0x14u, 0x00u, 0x00u, 0x00u, // size (little endian)
0x12u, /// entry: int64 0x12u, /// entry: int64
'e', 'n', 't', 'r', 'y', '\x00', 'e', 'n', 't', 'r', 'y', '\x00',
static_cast<uint8_t>((iu >> (8u * 0u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 0u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 1u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 1u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 2u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 2u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 3u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 3u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 4u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 4u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 5u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 5u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 6u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 6u)) & 0xffu),
static_cast<uint8_t>((iu >> (8u * 7u)) & 0xffu), static_cast<std::uint8_t>((iu >> (8u * 7u)) & 0xffu),
0x00u // end marker 0x00u // end marker
}; };
...@@ -1208,14 +1238,14 @@ TEST_CASE("BSON roundtrips" * doctest::skip()) ...@@ -1208,14 +1238,14 @@ TEST_CASE("BSON roundtrips" * doctest::skip())
CAPTURE(filename) CAPTURE(filename)
{ {
INFO_WITH_TEMP(filename + ": std::vector<uint8_t>"); INFO_WITH_TEMP(filename + ": std::vector<std::uint8_t>");
// parse JSON file // parse JSON file
std::ifstream f_json(filename); std::ifstream f_json(filename);
json j1 = json::parse(f_json); json j1 = json::parse(f_json);
// parse BSON file // parse BSON file
std::ifstream f_bson(filename + ".bson", std::ios::binary); std::ifstream f_bson(filename + ".bson", std::ios::binary);
std::vector<uint8_t> packed( std::vector<std::uint8_t> packed(
(std::istreambuf_iterator<char>(f_bson)), (std::istreambuf_iterator<char>(f_bson)),
std::istreambuf_iterator<char>()); std::istreambuf_iterator<char>());
json j2; json j2;
...@@ -1248,7 +1278,7 @@ TEST_CASE("BSON roundtrips" * doctest::skip()) ...@@ -1248,7 +1278,7 @@ TEST_CASE("BSON roundtrips" * doctest::skip())
// parse BSON file // parse BSON file
std::ifstream f_bson(filename + ".bson", std::ios::binary); std::ifstream f_bson(filename + ".bson", std::ios::binary);
std::vector<uint8_t> packed( std::vector<std::uint8_t> packed(
(std::istreambuf_iterator<char>(f_bson)), (std::istreambuf_iterator<char>(f_bson)),
std::istreambuf_iterator<char>()); std::istreambuf_iterator<char>());
json j2; json j2;
...@@ -1266,13 +1296,13 @@ TEST_CASE("BSON roundtrips" * doctest::skip()) ...@@ -1266,13 +1296,13 @@ TEST_CASE("BSON roundtrips" * doctest::skip())
// parse BSON file // parse BSON file
std::ifstream f_bson(filename + ".bson", std::ios::binary); std::ifstream f_bson(filename + ".bson", std::ios::binary);
std::vector<uint8_t> packed( std::vector<std::uint8_t> packed(
(std::istreambuf_iterator<char>(f_bson)), (std::istreambuf_iterator<char>(f_bson)),
std::istreambuf_iterator<char>()); std::istreambuf_iterator<char>());
{ {
INFO_WITH_TEMP(filename + ": output adapters: std::vector<uint8_t>"); INFO_WITH_TEMP(filename + ": output adapters: std::vector<std::uint8_t>");
std::vector<uint8_t> vec; std::vector<std::uint8_t> vec;
json::to_bson(j1, vec); json::to_bson(j1, vec);
if (vec != packed) if (vec != packed)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment