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

Merge pull request #1176 from grembo/develop

Browse source 
Fix unit tests that were silently skipped or crashed (depending on the compiler)
This commit is contained in:
Niels Lohmann 2018-08-14 21:48:49 +02:00 committed by GitHub
commit 861ee400cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 108 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
test/src/unit-cbor.cpp
View file

@ -1660,6 +1660,21 @@ TEST_CASE("CBOR roundtrips", "[hide]")
{ {
SECTION("input from flynn") SECTION("input from flynn")
{ {
// most of these are exluded due to differences in key order (not a real problem)
auto exclude_packed = std::set<std::string>{
"test/data/json.org/1.json",
"test/data/json.org/2.json",
"test/data/json.org/3.json",
"test/data/json.org/4.json",
"test/data/json.org/5.json",
"test/data/json_testsuite/sample.json", // kills AppVeyor
"test/data/json_tests/pass1.json",
"test/data/regression/working_file.json",
"test/data/nst_json_testsuite/test_parsing/y_object.json",
"test/data/nst_json_testsuite/test_parsing/y_object_duplicated_key.json",
"test/data/nst_json_testsuite/test_parsing/y_object_long_strings.json",
};
for (std::string filename : for (std::string filename :
{ {
"test/data/json_nlohmann_tests/all_unicode.json", "test/data/json_nlohmann_tests/all_unicode.json",
@ -1811,12 +1826,12 @@ TEST_CASE("CBOR roundtrips", "[hide]")
{ {
CAPTURE(filename); CAPTURE(filename);
SECTION(filename + ": std::vector<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);
SECTION("std::vector<uint8_t>")
{
// parse CBOR file // parse CBOR file
std::ifstream f_cbor(filename + ".cbor", std::ios::binary); std::ifstream f_cbor(filename + ".cbor", std::ios::binary);
std::vector<uint8_t> packed( std::vector<uint8_t> packed(
@ -1829,8 +1844,12 @@ TEST_CASE("CBOR roundtrips", "[hide]")
CHECK(j1 == j2); CHECK(j1 == j2);
} }
SECTION("std::ifstream") SECTION(filename + ": std::ifstream")
{ {
// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);
// parse CBOR file // parse CBOR file
std::ifstream f_cbor(filename + ".cbor", std::ios::binary); std::ifstream f_cbor(filename + ".cbor", std::ios::binary);
json j2; json j2;
@ -1840,8 +1859,12 @@ TEST_CASE("CBOR roundtrips", "[hide]")
CHECK(j1 == j2); CHECK(j1 == j2);
} }
SECTION("uint8_t* and size") SECTION(filename + ": uint8_t* and size")
{ {
// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);
// parse CBOR file // parse CBOR file
std::ifstream f_cbor(filename + ".cbor", std::ios::binary); std::ifstream f_cbor(filename + ".cbor", std::ios::binary);
std::vector<uint8_t> packed( std::vector<uint8_t> packed(
@ -1854,15 +1877,21 @@ TEST_CASE("CBOR roundtrips", "[hide]")
CHECK(j1 == j2); CHECK(j1 == j2);
} }
SECTION("output to output adapters") SECTION(filename + ": output to output adapters")
{ {
// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);
// parse CBOR file // parse CBOR file
std::ifstream f_cbor(filename + ".cbor", std::ios::binary); std::ifstream f_cbor(filename + ".cbor", std::ios::binary);
std::vector<uint8_t> packed( std::vector<uint8_t> packed(
(std::istreambuf_iterator<char>(f_cbor)), (std::istreambuf_iterator<char>(f_cbor)),
std::istreambuf_iterator<char>()); std::istreambuf_iterator<char>());
SECTION("std::vector<uint8_t>") if (!exclude_packed.count(filename))
{
SECTION(filename + ": output adapters: std::vector<uint8_t>")
{ {
std::vector<uint8_t> vec; std::vector<uint8_t> vec;
json::to_cbor(j1, vec); json::to_cbor(j1, vec);
@ -1871,6 +1900,7 @@ TEST_CASE("CBOR roundtrips", "[hide]")
} }
} }
} }
}
} }
TEST_CASE("all CBOR first bytes", "[!throws]") TEST_CASE("all CBOR first bytes", "[!throws]")

45
test/src/unit-msgpack.cpp
View file

@ -1349,6 +1349,24 @@ TEST_CASE("MessagePack roundtrips", "[hide]")
{ {
SECTION("input from msgpack-python") SECTION("input from msgpack-python")
{ {
// most of these are exluded due to differences in key order (not a real problem)
auto exclude_packed = std::set<std::string>{
"test/data/json.org/1.json",
"test/data/json.org/2.json",
"test/data/json.org/3.json",
"test/data/json.org/4.json",
"test/data/json.org/5.json",
"test/data/json_testsuite/sample.json", // kills AppVeyor
"test/data/json_tests/pass1.json",
"test/data/regression/working_file.json",
"test/data/nst_json_testsuite/test_parsing/y_object.json",
"test/data/nst_json_testsuite/test_parsing/y_object_basic.json",
"test/data/nst_json_testsuite/test_parsing/y_object_duplicated_key.json",
"test/data/nst_json_testsuite/test_parsing/y_object_long_strings.json",
"test/data/nst_json_testsuite/test_parsing/y_object_simple.json",
"test/data/nst_json_testsuite/test_parsing/y_object_string_unicode.json",
};
for (std::string filename : for (std::string filename :
{ {
"test/data/json_nlohmann_tests/all_unicode.json", "test/data/json_nlohmann_tests/all_unicode.json",
@ -1500,12 +1518,12 @@ TEST_CASE("MessagePack roundtrips", "[hide]")
{ {
CAPTURE(filename); CAPTURE(filename);
SECTION(filename + ": std::vector<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);
SECTION("std::vector<uint8_t>")
{
// parse MessagePack file // parse MessagePack file
std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary); std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary);
std::vector<uint8_t> packed( std::vector<uint8_t> packed(
@ -1518,8 +1536,12 @@ TEST_CASE("MessagePack roundtrips", "[hide]")
CHECK(j1 == j2); CHECK(j1 == j2);
} }
SECTION("std::ifstream") SECTION(filename + ": std::ifstream")
{ {
// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);
// parse MessagePack file // parse MessagePack file
std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary); std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary);
json j2; json j2;
@ -1529,8 +1551,12 @@ TEST_CASE("MessagePack roundtrips", "[hide]")
CHECK(j1 == j2); CHECK(j1 == j2);
} }
SECTION("uint8_t* and size") SECTION(filename + ": uint8_t* and size")
{ {
// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);
// parse MessagePack file // parse MessagePack file
std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary); std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary);
std::vector<uint8_t> packed( std::vector<uint8_t> packed(
@ -1543,15 +1569,21 @@ TEST_CASE("MessagePack roundtrips", "[hide]")
CHECK(j1 == j2); CHECK(j1 == j2);
} }
SECTION("output to output adapters") SECTION(filename + ": output to output adapters")
{ {
// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);
// parse MessagePack file // parse MessagePack file
std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary); std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary);
std::vector<uint8_t> packed( std::vector<uint8_t> packed(
(std::istreambuf_iterator<char>(f_msgpack)), (std::istreambuf_iterator<char>(f_msgpack)),
std::istreambuf_iterator<char>()); std::istreambuf_iterator<char>());
SECTION("std::vector<uint8_t>") if (!exclude_packed.count(filename))
{
SECTION(filename + ": output adapters: std::vector<uint8_t>")
{ {
std::vector<uint8_t> vec; std::vector<uint8_t> vec;
json::to_msgpack(j1, vec); json::to_msgpack(j1, vec);
@ -1560,4 +1592,5 @@ TEST_CASE("MessagePack roundtrips", "[hide]")
} }
} }
} }
}
} }

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

@ -2199,12 +2199,12 @@ TEST_CASE("UBJSON roundtrips", "[hide]")
{ {
CAPTURE(filename); CAPTURE(filename);
SECTION(filename + ": std::vector<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);
SECTION("std::vector<uint8_t>")
{
// parse MessagePack file // parse MessagePack file
std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary); std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary);
std::vector<uint8_t> packed( std::vector<uint8_t> packed(
@ -2217,8 +2217,12 @@ TEST_CASE("UBJSON roundtrips", "[hide]")
CHECK(j1 == j2); CHECK(j1 == j2);
} }
SECTION("std::ifstream") SECTION(filename + ": std::ifstream")
{ {
// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);
// parse MessagePack file // parse MessagePack file
std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary); std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary);
json j2; json j2;
@ -2228,8 +2232,12 @@ TEST_CASE("UBJSON roundtrips", "[hide]")
CHECK(j1 == j2); CHECK(j1 == j2);
} }
SECTION("uint8_t* and size") SECTION(filename + ": uint8_t* and size")
{ {
// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);
// parse MessagePack file // parse MessagePack file
std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary); std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary);
std::vector<uint8_t> packed( std::vector<uint8_t> packed(
@ -2242,15 +2250,19 @@ TEST_CASE("UBJSON roundtrips", "[hide]")
CHECK(j1 == j2); CHECK(j1 == j2);
} }
SECTION("output to output adapters") SECTION(filename + ": output to output adapters")
{ {
// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);
// parse MessagePack file // parse MessagePack file
std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary); std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary);
std::vector<uint8_t> packed( std::vector<uint8_t> packed(
(std::istreambuf_iterator<char>(f_ubjson)), (std::istreambuf_iterator<char>(f_ubjson)),
std::istreambuf_iterator<char>()); std::istreambuf_iterator<char>());
SECTION("std::vector<uint8_t>") SECTION(filename + ": output adapters: std::vector<uint8_t>")
{ {
std::vector<uint8_t> vec; std::vector<uint8_t> vec;
json::to_ubjson(j1, vec); json::to_ubjson(j1, vec);