mirror of
https://github.com/nlohmann/json.git
synced 2026-02-20 02:16:24 +00:00
Add clang-tools to required tools for ci_static_analysis_clang (#3724)
* 💚 add clang-tools to required tools for ci_static_analysis_clang * 🚨 update Clang-Tidy warning selection * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings * 🚨 fix Clang-Tidy warnings (#3738) * ⏪ revert fix * ⏪ revert fix * 🚨 fix Clang-Tidy warnings (#3739) Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
This commit is contained in:
Niels Lohmann
GitHub
@@ -106,15 +106,15 @@ TEST_CASE("MessagePack")
|
||||
SECTION("discarded")
|
||||
{
|
||||
// discarded values are not serialized
|
||||
json j = json::value_t::discarded;
|
||||
json const j = json::value_t::discarded;
|
||||
const auto result = json::to_msgpack(j);
|
||||
CHECK(result.empty());
|
||||
}
|
||||
|
||||
SECTION("null")
|
||||
{
|
||||
json j = nullptr;
|
||||
std::vector<uint8_t> expected = {0xc0};
|
||||
json const j = nullptr;
|
||||
std::vector<uint8_t> const expected = {0xc0};
|
||||
const auto result = json::to_msgpack(j);
|
||||
CHECK(result == expected);
|
||||
|
||||
@@ -127,8 +127,8 @@ TEST_CASE("MessagePack")
|
||||
{
|
||||
SECTION("true")
|
||||
{
|
||||
json j = true;
|
||||
std::vector<uint8_t> expected = {0xc3};
|
||||
json const j = true;
|
||||
std::vector<uint8_t> const expected = {0xc3};
|
||||
const auto result = json::to_msgpack(j);
|
||||
CHECK(result == expected);
|
||||
|
||||
@@ -139,8 +139,8 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("false")
|
||||
{
|
||||
json j = false;
|
||||
std::vector<uint8_t> expected = {0xc2};
|
||||
json const j = false;
|
||||
std::vector<uint8_t> const expected = {0xc2};
|
||||
const auto result = json::to_msgpack(j);
|
||||
CHECK(result == expected);
|
||||
|
||||
@@ -161,14 +161,16 @@ TEST_CASE("MessagePack")
|
||||
CAPTURE(i)
|
||||
|
||||
// create JSON value with integer number
|
||||
json j = i;
|
||||
json const j = i;
|
||||
|
||||
// check type
|
||||
CHECK(j.is_number_integer());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(static_cast<uint8_t>(i));
|
||||
std::vector<uint8_t> const expected
|
||||
{
|
||||
static_cast<uint8_t>(i)
|
||||
};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -198,8 +200,7 @@ TEST_CASE("MessagePack")
|
||||
CHECK(j.is_number_integer());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(static_cast<uint8_t>(i));
|
||||
std::vector<uint8_t> const expected{static_cast<uint8_t>(i)};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -229,9 +230,11 @@ TEST_CASE("MessagePack")
|
||||
CHECK(j.is_number_integer());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(0xcc);
|
||||
expected.push_back(static_cast<uint8_t>(i));
|
||||
std::vector<uint8_t> const expected
|
||||
{
|
||||
0xcc,
|
||||
static_cast<uint8_t>(i),
|
||||
};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -240,7 +243,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// check individual bytes
|
||||
CHECK(result[0] == 0xcc);
|
||||
auto restored = static_cast<uint8_t>(result[1]);
|
||||
auto const restored = static_cast<uint8_t>(result[1]);
|
||||
CHECK(restored == i);
|
||||
|
||||
// roundtrip
|
||||
@@ -263,10 +266,12 @@ TEST_CASE("MessagePack")
|
||||
CHECK(j.is_number_integer());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(0xcd);
|
||||
expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>(i & 0xff));
|
||||
std::vector<uint8_t> const expected
|
||||
{
|
||||
0xcd,
|
||||
static_cast<uint8_t>((i >> 8) & 0xff),
|
||||
static_cast<uint8_t>(i & 0xff),
|
||||
};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -275,7 +280,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// check individual bytes
|
||||
CHECK(result[0] == 0xcd);
|
||||
auto restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
|
||||
auto const restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
|
||||
CHECK(restored == i);
|
||||
|
||||
// roundtrip
|
||||
@@ -301,12 +306,14 @@ TEST_CASE("MessagePack")
|
||||
CHECK(j.is_number_integer());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(0xce);
|
||||
expected.push_back(static_cast<uint8_t>((i >> 24) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 16) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>(i & 0xff));
|
||||
std::vector<uint8_t> const expected
|
||||
{
|
||||
0xce,
|
||||
static_cast<uint8_t>((i >> 24) & 0xff),
|
||||
static_cast<uint8_t>((i >> 16) & 0xff),
|
||||
static_cast<uint8_t>((i >> 8) & 0xff),
|
||||
static_cast<uint8_t>(i & 0xff),
|
||||
};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -315,10 +322,10 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// check individual bytes
|
||||
CHECK(result[0] == 0xce);
|
||||
uint32_t restored = (static_cast<uint32_t>(result[1]) << 030) +
|
||||
(static_cast<uint32_t>(result[2]) << 020) +
|
||||
(static_cast<uint32_t>(result[3]) << 010) +
|
||||
static_cast<uint32_t>(result[4]);
|
||||
uint32_t const restored = (static_cast<uint32_t>(result[1]) << 030) +
|
||||
(static_cast<uint32_t>(result[2]) << 020) +
|
||||
(static_cast<uint32_t>(result[3]) << 010) +
|
||||
static_cast<uint32_t>(result[4]);
|
||||
CHECK(restored == i);
|
||||
|
||||
// roundtrip
|
||||
@@ -344,16 +351,18 @@ TEST_CASE("MessagePack")
|
||||
CHECK(j.is_number_integer());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(0xcf);
|
||||
expected.push_back(static_cast<uint8_t>((i >> 070) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 060) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 050) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 040) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 030) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 020) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 010) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>(i & 0xff));
|
||||
std::vector<uint8_t> const expected
|
||||
{
|
||||
0xcf,
|
||||
static_cast<uint8_t>((i >> 070) & 0xff),
|
||||
static_cast<uint8_t>((i >> 060) & 0xff),
|
||||
static_cast<uint8_t>((i >> 050) & 0xff),
|
||||
static_cast<uint8_t>((i >> 040) & 0xff),
|
||||
static_cast<uint8_t>((i >> 030) & 0xff),
|
||||
static_cast<uint8_t>((i >> 020) & 0xff),
|
||||
static_cast<uint8_t>((i >> 010) & 0xff),
|
||||
static_cast<uint8_t>(i & 0xff),
|
||||
};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -362,14 +371,14 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// check individual bytes
|
||||
CHECK(result[0] == 0xcf);
|
||||
uint64_t restored = (static_cast<uint64_t>(result[1]) << 070) +
|
||||
(static_cast<uint64_t>(result[2]) << 060) +
|
||||
(static_cast<uint64_t>(result[3]) << 050) +
|
||||
(static_cast<uint64_t>(result[4]) << 040) +
|
||||
(static_cast<uint64_t>(result[5]) << 030) +
|
||||
(static_cast<uint64_t>(result[6]) << 020) +
|
||||
(static_cast<uint64_t>(result[7]) << 010) +
|
||||
static_cast<uint64_t>(result[8]);
|
||||
uint64_t const restored = (static_cast<uint64_t>(result[1]) << 070) +
|
||||
(static_cast<uint64_t>(result[2]) << 060) +
|
||||
(static_cast<uint64_t>(result[3]) << 050) +
|
||||
(static_cast<uint64_t>(result[4]) << 040) +
|
||||
(static_cast<uint64_t>(result[5]) << 030) +
|
||||
(static_cast<uint64_t>(result[6]) << 020) +
|
||||
(static_cast<uint64_t>(result[7]) << 010) +
|
||||
static_cast<uint64_t>(result[8]);
|
||||
CHECK(restored == i);
|
||||
|
||||
// roundtrip
|
||||
@@ -385,15 +394,17 @@ TEST_CASE("MessagePack")
|
||||
CAPTURE(i)
|
||||
|
||||
// create JSON value with integer number
|
||||
json j = i;
|
||||
json const j = i;
|
||||
|
||||
// check type
|
||||
CHECK(j.is_number_integer());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(0xd0);
|
||||
expected.push_back(static_cast<uint8_t>(i));
|
||||
std::vector<uint8_t> const expected
|
||||
{
|
||||
0xd0,
|
||||
static_cast<uint8_t>(i),
|
||||
};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -412,13 +423,13 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("-9263 (int 16)")
|
||||
{
|
||||
json j = -9263;
|
||||
std::vector<uint8_t> expected = {0xd1, 0xdb, 0xd1};
|
||||
json const j = -9263;
|
||||
std::vector<uint8_t> const expected = {0xd1, 0xdb, 0xd1};
|
||||
|
||||
const auto result = json::to_msgpack(j);
|
||||
CHECK(result == expected);
|
||||
|
||||
auto restored = static_cast<int16_t>((result[1] << 8) + result[2]);
|
||||
auto const restored = static_cast<int16_t>((result[1] << 8) + result[2]);
|
||||
CHECK(restored == -9263);
|
||||
|
||||
// roundtrip
|
||||
@@ -433,16 +444,18 @@ TEST_CASE("MessagePack")
|
||||
CAPTURE(i)
|
||||
|
||||
// create JSON value with integer number
|
||||
json j = i;
|
||||
json const j = i;
|
||||
|
||||
// check type
|
||||
CHECK(j.is_number_integer());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(0xd1);
|
||||
expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>(i & 0xff));
|
||||
std::vector<uint8_t> const expected
|
||||
{
|
||||
0xd1,
|
||||
static_cast<uint8_t>((i >> 8) & 0xff),
|
||||
static_cast<uint8_t>(i & 0xff),
|
||||
};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -451,7 +464,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// check individual bytes
|
||||
CHECK(result[0] == 0xd1);
|
||||
auto restored = static_cast<int16_t>((result[1] << 8) + result[2]);
|
||||
auto const restored = static_cast<int16_t>((result[1] << 8) + result[2]);
|
||||
CHECK(restored == i);
|
||||
|
||||
// roundtrip
|
||||
@@ -462,29 +475,33 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("-32769..-2147483648")
|
||||
{
|
||||
std::vector<int32_t> numbers;
|
||||
numbers.push_back(-32769);
|
||||
numbers.push_back(-65536);
|
||||
numbers.push_back(-77777);
|
||||
numbers.push_back(-1048576);
|
||||
numbers.push_back(-2147483648LL);
|
||||
std::vector<int32_t> const numbers
|
||||
{
|
||||
-32769,
|
||||
-65536,
|
||||
-77777,
|
||||
-1048576,
|
||||
-2147483648LL,
|
||||
};
|
||||
for (auto i : numbers)
|
||||
{
|
||||
CAPTURE(i)
|
||||
|
||||
// create JSON value with integer number
|
||||
json j = i;
|
||||
json const j = i;
|
||||
|
||||
// check type
|
||||
CHECK(j.is_number_integer());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(0xd2);
|
||||
expected.push_back(static_cast<uint8_t>((i >> 24) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 16) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>(i & 0xff));
|
||||
std::vector<uint8_t> const expected
|
||||
{
|
||||
0xd2,
|
||||
static_cast<uint8_t>((i >> 24) & 0xff),
|
||||
static_cast<uint8_t>((i >> 16) & 0xff),
|
||||
static_cast<uint8_t>((i >> 8) & 0xff),
|
||||
static_cast<uint8_t>(i & 0xff),
|
||||
};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -493,10 +510,10 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// check individual bytes
|
||||
CHECK(result[0] == 0xd2);
|
||||
uint32_t restored = (static_cast<uint32_t>(result[1]) << 030) +
|
||||
(static_cast<uint32_t>(result[2]) << 020) +
|
||||
(static_cast<uint32_t>(result[3]) << 010) +
|
||||
static_cast<uint32_t>(result[4]);
|
||||
uint32_t const restored = (static_cast<uint32_t>(result[1]) << 030) +
|
||||
(static_cast<uint32_t>(result[2]) << 020) +
|
||||
(static_cast<uint32_t>(result[3]) << 010) +
|
||||
static_cast<uint32_t>(result[4]);
|
||||
CHECK(static_cast<std::int32_t>(restored) == i);
|
||||
|
||||
// roundtrip
|
||||
@@ -507,30 +524,34 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("-9223372036854775808..-2147483649 (int 64)")
|
||||
{
|
||||
std::vector<int64_t> numbers;
|
||||
numbers.push_back(INT64_MIN);
|
||||
numbers.push_back(-2147483649LL);
|
||||
std::vector<int64_t> const numbers
|
||||
{
|
||||
INT64_MIN,
|
||||
-2147483649LL,
|
||||
};
|
||||
for (auto i : numbers)
|
||||
{
|
||||
CAPTURE(i)
|
||||
|
||||
// create JSON value with unsigned integer number
|
||||
json j = i;
|
||||
json const j = i;
|
||||
|
||||
// check type
|
||||
CHECK(j.is_number_integer());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(0xd3);
|
||||
expected.push_back(static_cast<uint8_t>((i >> 070) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 060) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 050) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 040) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 030) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 020) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 010) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>(i & 0xff));
|
||||
std::vector<uint8_t> const expected
|
||||
{
|
||||
0xd3,
|
||||
static_cast<uint8_t>((i >> 070) & 0xff),
|
||||
static_cast<uint8_t>((i >> 060) & 0xff),
|
||||
static_cast<uint8_t>((i >> 050) & 0xff),
|
||||
static_cast<uint8_t>((i >> 040) & 0xff),
|
||||
static_cast<uint8_t>((i >> 030) & 0xff),
|
||||
static_cast<uint8_t>((i >> 020) & 0xff),
|
||||
static_cast<uint8_t>((i >> 010) & 0xff),
|
||||
static_cast<uint8_t>(i & 0xff),
|
||||
};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -539,14 +560,14 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// check individual bytes
|
||||
CHECK(result[0] == 0xd3);
|
||||
int64_t restored = (static_cast<int64_t>(result[1]) << 070) +
|
||||
(static_cast<int64_t>(result[2]) << 060) +
|
||||
(static_cast<int64_t>(result[3]) << 050) +
|
||||
(static_cast<int64_t>(result[4]) << 040) +
|
||||
(static_cast<int64_t>(result[5]) << 030) +
|
||||
(static_cast<int64_t>(result[6]) << 020) +
|
||||
(static_cast<int64_t>(result[7]) << 010) +
|
||||
static_cast<int64_t>(result[8]);
|
||||
int64_t const restored = (static_cast<int64_t>(result[1]) << 070) +
|
||||
(static_cast<int64_t>(result[2]) << 060) +
|
||||
(static_cast<int64_t>(result[3]) << 050) +
|
||||
(static_cast<int64_t>(result[4]) << 040) +
|
||||
(static_cast<int64_t>(result[5]) << 030) +
|
||||
(static_cast<int64_t>(result[6]) << 020) +
|
||||
(static_cast<int64_t>(result[7]) << 010) +
|
||||
static_cast<int64_t>(result[8]);
|
||||
CHECK(restored == i);
|
||||
|
||||
// roundtrip
|
||||
@@ -565,14 +586,13 @@ TEST_CASE("MessagePack")
|
||||
CAPTURE(i)
|
||||
|
||||
// create JSON value with unsigned integer number
|
||||
json j = i;
|
||||
json const j = i;
|
||||
|
||||
// check type
|
||||
CHECK(j.is_number_unsigned());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(static_cast<uint8_t>(i));
|
||||
std::vector<uint8_t> const expected{static_cast<uint8_t>(i)};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -595,15 +615,17 @@ TEST_CASE("MessagePack")
|
||||
CAPTURE(i)
|
||||
|
||||
// create JSON value with unsigned integer number
|
||||
json j = i;
|
||||
json const j = i;
|
||||
|
||||
// check type
|
||||
CHECK(j.is_number_unsigned());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(0xcc);
|
||||
expected.push_back(static_cast<uint8_t>(i));
|
||||
std::vector<uint8_t> const expected
|
||||
{
|
||||
0xcc,
|
||||
static_cast<uint8_t>(i),
|
||||
};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -612,7 +634,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// check individual bytes
|
||||
CHECK(result[0] == 0xcc);
|
||||
auto restored = static_cast<uint8_t>(result[1]);
|
||||
auto const restored = static_cast<uint8_t>(result[1]);
|
||||
CHECK(restored == i);
|
||||
|
||||
// roundtrip
|
||||
@@ -628,16 +650,18 @@ TEST_CASE("MessagePack")
|
||||
CAPTURE(i)
|
||||
|
||||
// create JSON value with unsigned integer number
|
||||
json j = i;
|
||||
json const j = i;
|
||||
|
||||
// check type
|
||||
CHECK(j.is_number_unsigned());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(0xcd);
|
||||
expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>(i & 0xff));
|
||||
std::vector<uint8_t> const expected
|
||||
{
|
||||
0xcd,
|
||||
static_cast<uint8_t>((i >> 8) & 0xff),
|
||||
static_cast<uint8_t>(i & 0xff),
|
||||
};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -646,7 +670,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// check individual bytes
|
||||
CHECK(result[0] == 0xcd);
|
||||
auto restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
|
||||
auto const restored = static_cast<uint16_t>(static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]));
|
||||
CHECK(restored == i);
|
||||
|
||||
// roundtrip
|
||||
@@ -657,7 +681,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("65536..4294967295 (uint 32)")
|
||||
{
|
||||
for (uint32_t i :
|
||||
for (const uint32_t i :
|
||||
{
|
||||
65536u, 77777u, 1048576u, 4294967295u
|
||||
})
|
||||
@@ -665,18 +689,20 @@ TEST_CASE("MessagePack")
|
||||
CAPTURE(i)
|
||||
|
||||
// create JSON value with unsigned integer number
|
||||
json j = i;
|
||||
json const j = i;
|
||||
|
||||
// check type
|
||||
CHECK(j.is_number_unsigned());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(0xce);
|
||||
expected.push_back(static_cast<uint8_t>((i >> 24) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 16) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>(i & 0xff));
|
||||
std::vector<uint8_t> const expected
|
||||
{
|
||||
0xce,
|
||||
static_cast<uint8_t>((i >> 24) & 0xff),
|
||||
static_cast<uint8_t>((i >> 16) & 0xff),
|
||||
static_cast<uint8_t>((i >> 8) & 0xff),
|
||||
static_cast<uint8_t>(i & 0xff),
|
||||
};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -685,10 +711,10 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// check individual bytes
|
||||
CHECK(result[0] == 0xce);
|
||||
uint32_t restored = (static_cast<uint32_t>(result[1]) << 030) +
|
||||
(static_cast<uint32_t>(result[2]) << 020) +
|
||||
(static_cast<uint32_t>(result[3]) << 010) +
|
||||
static_cast<uint32_t>(result[4]);
|
||||
uint32_t const restored = (static_cast<uint32_t>(result[1]) << 030) +
|
||||
(static_cast<uint32_t>(result[2]) << 020) +
|
||||
(static_cast<uint32_t>(result[3]) << 010) +
|
||||
static_cast<uint32_t>(result[4]);
|
||||
CHECK(restored == i);
|
||||
|
||||
// roundtrip
|
||||
@@ -699,7 +725,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("4294967296..18446744073709551615 (uint 64)")
|
||||
{
|
||||
for (uint64_t i :
|
||||
for (const uint64_t i :
|
||||
{
|
||||
4294967296LU, 18446744073709551615LU
|
||||
})
|
||||
@@ -707,22 +733,24 @@ TEST_CASE("MessagePack")
|
||||
CAPTURE(i)
|
||||
|
||||
// create JSON value with unsigned integer number
|
||||
json j = i;
|
||||
json const j = i;
|
||||
|
||||
// check type
|
||||
CHECK(j.is_number_unsigned());
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
expected.push_back(0xcf);
|
||||
expected.push_back(static_cast<uint8_t>((i >> 070) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 060) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 050) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 040) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 030) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 020) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>((i >> 010) & 0xff));
|
||||
expected.push_back(static_cast<uint8_t>(i & 0xff));
|
||||
std::vector<uint8_t> const expected
|
||||
{
|
||||
0xcf,
|
||||
static_cast<uint8_t>((i >> 070) & 0xff),
|
||||
static_cast<uint8_t>((i >> 060) & 0xff),
|
||||
static_cast<uint8_t>((i >> 050) & 0xff),
|
||||
static_cast<uint8_t>((i >> 040) & 0xff),
|
||||
static_cast<uint8_t>((i >> 030) & 0xff),
|
||||
static_cast<uint8_t>((i >> 020) & 0xff),
|
||||
static_cast<uint8_t>((i >> 010) & 0xff),
|
||||
static_cast<uint8_t>(i & 0xff),
|
||||
};
|
||||
|
||||
// compare result + size
|
||||
const auto result = json::to_msgpack(j);
|
||||
@@ -731,14 +759,14 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// check individual bytes
|
||||
CHECK(result[0] == 0xcf);
|
||||
uint64_t restored = (static_cast<uint64_t>(result[1]) << 070) +
|
||||
(static_cast<uint64_t>(result[2]) << 060) +
|
||||
(static_cast<uint64_t>(result[3]) << 050) +
|
||||
(static_cast<uint64_t>(result[4]) << 040) +
|
||||
(static_cast<uint64_t>(result[5]) << 030) +
|
||||
(static_cast<uint64_t>(result[6]) << 020) +
|
||||
(static_cast<uint64_t>(result[7]) << 010) +
|
||||
static_cast<uint64_t>(result[8]);
|
||||
uint64_t const restored = (static_cast<uint64_t>(result[1]) << 070) +
|
||||
(static_cast<uint64_t>(result[2]) << 060) +
|
||||
(static_cast<uint64_t>(result[3]) << 050) +
|
||||
(static_cast<uint64_t>(result[4]) << 040) +
|
||||
(static_cast<uint64_t>(result[5]) << 030) +
|
||||
(static_cast<uint64_t>(result[6]) << 020) +
|
||||
(static_cast<uint64_t>(result[7]) << 010) +
|
||||
static_cast<uint64_t>(result[8]);
|
||||
CHECK(restored == i);
|
||||
|
||||
// roundtrip
|
||||
@@ -752,9 +780,9 @@ TEST_CASE("MessagePack")
|
||||
{
|
||||
SECTION("3.1415925")
|
||||
{
|
||||
double v = 3.1415925;
|
||||
json j = v;
|
||||
std::vector<uint8_t> expected =
|
||||
double const v = 3.1415925;
|
||||
json const j = v;
|
||||
std::vector<uint8_t> const expected =
|
||||
{
|
||||
0xcb, 0x40, 0x09, 0x21, 0xfb, 0x3f, 0xa6, 0xde, 0xfc
|
||||
};
|
||||
@@ -769,9 +797,9 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("1.0")
|
||||
{
|
||||
double v = 1.0;
|
||||
json j = v;
|
||||
std::vector<uint8_t> expected =
|
||||
double const v = 1.0;
|
||||
json const j = v;
|
||||
std::vector<uint8_t> const expected =
|
||||
{
|
||||
0xca, 0x3f, 0x80, 0x00, 0x00
|
||||
};
|
||||
@@ -786,9 +814,9 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("128.128")
|
||||
{
|
||||
double v = 128.1280059814453125;
|
||||
json j = v;
|
||||
std::vector<uint8_t> expected =
|
||||
double const v = 128.1280059814453125;
|
||||
json const j = v;
|
||||
std::vector<uint8_t> const expected =
|
||||
{
|
||||
0xca, 0x43, 0x00, 0x20, 0xc5
|
||||
};
|
||||
@@ -822,7 +850,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// create JSON value with string containing of N * 'x'
|
||||
const auto s = std::string(N, 'x');
|
||||
json j = s;
|
||||
json const j = s;
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
@@ -859,7 +887,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// create JSON value with string containing of N * 'x'
|
||||
const auto s = std::string(N, 'x');
|
||||
json j = s;
|
||||
json const j = s;
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<uint8_t> expected;
|
||||
@@ -894,7 +922,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// create JSON value with string containing of N * 'x'
|
||||
const auto s = std::string(N, 'x');
|
||||
json j = s;
|
||||
json const j = s;
|
||||
|
||||
// create expected byte vector (hack: create string first)
|
||||
std::vector<uint8_t> expected(N, 'x');
|
||||
@@ -927,7 +955,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// create JSON value with string containing of N * 'x'
|
||||
const auto s = std::string(N, 'x');
|
||||
json j = s;
|
||||
json const j = s;
|
||||
|
||||
// create expected byte vector (hack: create string first)
|
||||
std::vector<uint8_t> expected(N, 'x');
|
||||
@@ -956,8 +984,8 @@ TEST_CASE("MessagePack")
|
||||
{
|
||||
SECTION("empty")
|
||||
{
|
||||
json j = json::array();
|
||||
std::vector<uint8_t> expected = {0x90};
|
||||
json const j = json::array();
|
||||
std::vector<uint8_t> const expected = {0x90};
|
||||
const auto result = json::to_msgpack(j);
|
||||
CHECK(result == expected);
|
||||
|
||||
@@ -968,8 +996,8 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("[null]")
|
||||
{
|
||||
json j = {nullptr};
|
||||
std::vector<uint8_t> expected = {0x91, 0xc0};
|
||||
json const j = {nullptr};
|
||||
std::vector<uint8_t> const expected = {0x91, 0xc0};
|
||||
const auto result = json::to_msgpack(j);
|
||||
CHECK(result == expected);
|
||||
|
||||
@@ -980,8 +1008,8 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("[1,2,3,4,5]")
|
||||
{
|
||||
json j = json::parse("[1,2,3,4,5]");
|
||||
std::vector<uint8_t> expected = {0x95, 0x01, 0x02, 0x03, 0x04, 0x05};
|
||||
json const j = json::parse("[1,2,3,4,5]");
|
||||
std::vector<uint8_t> const expected = {0x95, 0x01, 0x02, 0x03, 0x04, 0x05};
|
||||
const auto result = json::to_msgpack(j);
|
||||
CHECK(result == expected);
|
||||
|
||||
@@ -992,8 +1020,8 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("[[[[]]]]")
|
||||
{
|
||||
json j = json::parse("[[[[]]]]");
|
||||
std::vector<uint8_t> expected = {0x91, 0x91, 0x91, 0x90};
|
||||
json const j = json::parse("[[[[]]]]");
|
||||
std::vector<uint8_t> const expected = {0x91, 0x91, 0x91, 0x90};
|
||||
const auto result = json::to_msgpack(j);
|
||||
CHECK(result == expected);
|
||||
|
||||
@@ -1046,8 +1074,8 @@ TEST_CASE("MessagePack")
|
||||
{
|
||||
SECTION("empty")
|
||||
{
|
||||
json j = json::object();
|
||||
std::vector<uint8_t> expected = {0x80};
|
||||
json const j = json::object();
|
||||
std::vector<uint8_t> const expected = {0x80};
|
||||
const auto result = json::to_msgpack(j);
|
||||
CHECK(result == expected);
|
||||
|
||||
@@ -1058,8 +1086,8 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("{\"\":null}")
|
||||
{
|
||||
json j = {{"", nullptr}};
|
||||
std::vector<uint8_t> expected = {0x81, 0xa0, 0xc0};
|
||||
json const j = {{"", nullptr}};
|
||||
std::vector<uint8_t> const expected = {0x81, 0xa0, 0xc0};
|
||||
const auto result = json::to_msgpack(j);
|
||||
CHECK(result == expected);
|
||||
|
||||
@@ -1070,8 +1098,8 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("{\"a\": {\"b\": {\"c\": {}}}}")
|
||||
{
|
||||
json j = json::parse(R"({"a": {"b": {"c": {}}}})");
|
||||
std::vector<uint8_t> expected =
|
||||
json const j = json::parse(R"({"a": {"b": {"c": {}}}})");
|
||||
std::vector<uint8_t> const expected =
|
||||
{
|
||||
0x81, 0xa1, 0x61, 0x81, 0xa1, 0x62, 0x81, 0xa1, 0x63, 0x80
|
||||
};
|
||||
@@ -1085,7 +1113,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("map 16")
|
||||
{
|
||||
json j = R"({"00": null, "01": null, "02": null, "03": null,
|
||||
json const j = R"({"00": null, "01": null, "02": null, "03": null,
|
||||
"04": null, "05": null, "06": null, "07": null,
|
||||
"08": null, "09": null, "10": null, "11": null,
|
||||
"12": null, "13": null, "14": null, "15": null})"_json;
|
||||
@@ -1150,7 +1178,7 @@ TEST_CASE("MessagePack")
|
||||
// create JSON value with byte array containing of N * 'x'
|
||||
const auto s = std::vector<uint8_t>(N, 'x');
|
||||
json j = json::binary(s);
|
||||
std::uint8_t subtype = 42;
|
||||
std::uint8_t const subtype = 42;
|
||||
j.get_binary().set_subtype(subtype);
|
||||
|
||||
// create expected byte vector
|
||||
@@ -1225,7 +1253,7 @@ TEST_CASE("MessagePack")
|
||||
// create JSON value with string containing of N * 'x'
|
||||
const auto s = std::vector<uint8_t>(N, 'x');
|
||||
json j = json::binary(s);
|
||||
std::uint8_t subtype = 42;
|
||||
std::uint8_t const subtype = 42;
|
||||
j.get_binary().set_subtype(subtype);
|
||||
|
||||
// create expected byte vector (hack: create string first)
|
||||
@@ -1261,7 +1289,7 @@ TEST_CASE("MessagePack")
|
||||
// create JSON value with string containing of N * 'x'
|
||||
const auto s = std::vector<uint8_t>(N, 'x');
|
||||
json j = json::binary(s);
|
||||
std::uint8_t subtype = 42;
|
||||
std::uint8_t const subtype = 42;
|
||||
j.get_binary().set_subtype(subtype);
|
||||
|
||||
// create expected byte vector (hack: create string first)
|
||||
@@ -1298,7 +1326,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// create JSON value with byte array containing of N * 'x'
|
||||
const auto s = std::vector<uint8_t>(N, 'x');
|
||||
json j = json::binary(s);
|
||||
json const j = json::binary(s);
|
||||
|
||||
// create expected byte vector
|
||||
std::vector<std::uint8_t> expected;
|
||||
@@ -1336,7 +1364,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// create JSON value with string containing of N * 'x'
|
||||
const auto s = std::vector<std::uint8_t>(N, 'x');
|
||||
json j = json::binary(s);
|
||||
json const j = json::binary(s);
|
||||
|
||||
// create expected byte vector (hack: create string first)
|
||||
std::vector<std::uint8_t> expected(N, 'x');
|
||||
@@ -1369,7 +1397,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
// create JSON value with string containing of N * 'x'
|
||||
const auto s = std::vector<std::uint8_t>(N, 'x');
|
||||
json j = json::binary(s);
|
||||
json const j = json::binary(s);
|
||||
|
||||
// create expected byte vector (hack: create string first)
|
||||
std::vector<uint8_t> expected(N, 'x');
|
||||
@@ -1398,7 +1426,7 @@ TEST_CASE("MessagePack")
|
||||
SECTION("from float32")
|
||||
{
|
||||
auto given = std::vector<uint8_t>({0xca, 0x41, 0xc8, 0x00, 0x01});
|
||||
json j = json::from_msgpack(given);
|
||||
json const j = json::from_msgpack(given);
|
||||
CHECK(j.get<double>() == Approx(25.0000019073486));
|
||||
}
|
||||
|
||||
@@ -1511,7 +1539,7 @@ TEST_CASE("MessagePack")
|
||||
|
||||
SECTION("strict mode")
|
||||
{
|
||||
std::vector<uint8_t> vec = {0xc0, 0xc0};
|
||||
std::vector<uint8_t> const vec = {0xc0, 0xc0};
|
||||
SECTION("non-strict mode")
|
||||
{
|
||||
const auto result = json::from_msgpack(vec, false);
|
||||
@@ -1531,21 +1559,21 @@ TEST_CASE("MessagePack")
|
||||
{
|
||||
SECTION("start_array(len)")
|
||||
{
|
||||
std::vector<uint8_t> v = {0x93, 0x01, 0x02, 0x03};
|
||||
std::vector<uint8_t> const v = {0x93, 0x01, 0x02, 0x03};
|
||||
SaxCountdown scp(0);
|
||||
CHECK(!json::sax_parse(v, &scp, json::input_format_t::msgpack));
|
||||
}
|
||||
|
||||
SECTION("start_object(len)")
|
||||
{
|
||||
std::vector<uint8_t> v = {0x81, 0xa3, 0x66, 0x6F, 0x6F, 0xc2};
|
||||
std::vector<uint8_t> const v = {0x81, 0xa3, 0x66, 0x6F, 0x6F, 0xc2};
|
||||
SaxCountdown scp(0);
|
||||
CHECK(!json::sax_parse(v, &scp, json::input_format_t::msgpack));
|
||||
}
|
||||
|
||||
SECTION("key()")
|
||||
{
|
||||
std::vector<uint8_t> v = {0x81, 0xa3, 0x66, 0x6F, 0x6F, 0xc2};
|
||||
std::vector<uint8_t> const v = {0x81, 0xa3, 0x66, 0x6F, 0x6F, 0xc2};
|
||||
SaxCountdown scp(1);
|
||||
CHECK(!json::sax_parse(v, &scp, json::input_format_t::msgpack));
|
||||
}
|
||||
@@ -1557,7 +1585,7 @@ TEST_CASE("single MessagePack roundtrip")
|
||||
{
|
||||
SECTION("sample.json")
|
||||
{
|
||||
std::string filename = TEST_DATA_DIRECTORY "/json_testsuite/sample.json";
|
||||
std::string const filename = TEST_DATA_DIRECTORY "/json_testsuite/sample.json";
|
||||
|
||||
// parse JSON file
|
||||
std::ifstream f_json(filename);
|
||||
@@ -1817,7 +1845,7 @@ TEST_CASE("MessagePack roundtrips" * doctest::skip())
|
||||
INFO_WITH_TEMP(filename + ": output to output adapters");
|
||||
// parse JSON file
|
||||
std::ifstream f_json(filename);
|
||||
json j1 = json::parse(f_json);
|
||||
json const j1 = json::parse(f_json);
|
||||
|
||||
// parse MessagePack file
|
||||
auto packed = utils::read_binary_file(filename + ".msgpack");
|
||||
|
||||
Reference in New Issue
Block a user