j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🚧 working on AppVeyor's errors

Browse source
This commit is contained in:
Niels Lohmann 2018-01-08 19:48:18 +01:00
parent 126ce2e56c
commit 3d7658da89
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
test/src/unit-ubjson.cpp
View file

@ -88,7 +88,7 @@ TEST_CASE("UBJSON")
SECTION("-9223372036854775808..-2147483649 (int64)") SECTION("-9223372036854775808..-2147483649 (int64)")
{ {
std::vector<int64_t> numbers; std::vector<int64_t> numbers;
numbers.push_back(INT64_MIN); numbers.push_back((std::numeric_limits<int64_t>::min)());
numbers.push_back(-1000000000000000000); numbers.push_back(-1000000000000000000);
numbers.push_back(-100000000000000000); numbers.push_back(-100000000000000000);
numbers.push_back(-10000000000000000); numbers.push_back(-10000000000000000);
@ -128,14 +128,14 @@ TEST_CASE("UBJSON")
// check individual bytes // check individual bytes
CHECK(result[0] == 'L'); CHECK(result[0] == 'L');
uint64_t restored = (static_cast<uint64_t>(result[1]) << 070) + int64_t restored = (static_cast<int64_t>(result[1]) << 070) +
(static_cast<uint64_t>(result[2]) << 060) + (static_cast<int64_t>(result[2]) << 060) +
(static_cast<uint64_t>(result[3]) << 050) + (static_cast<int64_t>(result[3]) << 050) +
(static_cast<uint64_t>(result[4]) << 040) + (static_cast<int64_t>(result[4]) << 040) +
(static_cast<uint64_t>(result[5]) << 030) + (static_cast<int64_t>(result[5]) << 030) +
(static_cast<uint64_t>(result[6]) << 020) + (static_cast<int64_t>(result[6]) << 020) +
(static_cast<uint64_t>(result[7]) << 010) + (static_cast<int64_t>(result[7]) << 010) +
static_cast<uint64_t>(result[8]); static_cast<int64_t>(result[8]);
CHECK(restored == i); CHECK(restored == i);
// roundtrip // roundtrip
@ -145,7 +145,7 @@ TEST_CASE("UBJSON")
SECTION("-2147483648..-32769 (int32)") SECTION("-2147483648..-32769 (int32)")
{ {
std::vector<int64_t> numbers; std::vector<int32_t> numbers;
numbers.push_back(-32769); numbers.push_back(-32769);
numbers.push_back(-100000); numbers.push_back(-100000);
numbers.push_back(-1000000); numbers.push_back(-1000000);