Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix unit tests that were silently skipped or crashed (depending on the compiler) #1176

Merged
merged 2 commits into from
Aug 14, 2018
Merged

Fix unit tests that were silently skipped or crashed (depending on the compiler) #1176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5aaeb4
Make section names unique in loops, as catch doesn't support duplicate
Jul 28, 2018
05b27e8
Exclude bytewise comparison in certain tests.
Jul 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 42 additions & 12 deletions test/src/unit-cbor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1660,6 +1660,21 @@ TEST_CASE("CBOR roundtrips", "[hide]")
{
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 :
{
"test/data/json_nlohmann_tests/all_unicode.json",
Expand Down Expand Up @@ -1811,12 +1826,12 @@ TEST_CASE("CBOR roundtrips", "[hide]")
{
CAPTURE(filename);

// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);

SECTION("std::vector<uint8_t>")
SECTION(filename + ": std::vector<uint8_t>")
{
// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);

// parse CBOR file
std::ifstream f_cbor(filename + ".cbor", std::ios::binary);
std::vector<uint8_t> packed(
Expand All @@ -1829,8 +1844,12 @@ TEST_CASE("CBOR roundtrips", "[hide]")
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
std::ifstream f_cbor(filename + ".cbor", std::ios::binary);
json j2;
Expand All @@ -1840,8 +1859,12 @@ TEST_CASE("CBOR roundtrips", "[hide]")
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
std::ifstream f_cbor(filename + ".cbor", std::ios::binary);
std::vector<uint8_t> packed(
Expand All @@ -1854,19 +1877,26 @@ TEST_CASE("CBOR roundtrips", "[hide]")
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
std::ifstream f_cbor(filename + ".cbor", std::ios::binary);
std::vector<uint8_t> packed(
(std::istreambuf_iterator<char>(f_cbor)),
std::istreambuf_iterator<char>());

SECTION("std::vector<uint8_t>")
if (!exclude_packed.count(filename))
{
std::vector<uint8_t> vec;
json::to_cbor(j1, vec);
CHECK(vec == packed);
SECTION(filename + ": output adapters: std::vector<uint8_t>")
{
std::vector<uint8_t> vec;
json::to_cbor(j1, vec);
CHECK(vec == packed);
}
}
}
}
Expand Down
57 changes: 45 additions & 12 deletions test/src/unit-msgpack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1349,6 +1349,24 @@ TEST_CASE("MessagePack roundtrips", "[hide]")
{
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 :
{
"test/data/json_nlohmann_tests/all_unicode.json",
Expand Down Expand Up @@ -1500,12 +1518,12 @@ TEST_CASE("MessagePack roundtrips", "[hide]")
{
CAPTURE(filename);

// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);

SECTION("std::vector<uint8_t>")
SECTION(filename + ": std::vector<uint8_t>")
{
// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);

// parse MessagePack file
std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary);
std::vector<uint8_t> packed(
Expand All @@ -1518,8 +1536,12 @@ TEST_CASE("MessagePack roundtrips", "[hide]")
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
std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary);
json j2;
Expand All @@ -1529,8 +1551,12 @@ TEST_CASE("MessagePack roundtrips", "[hide]")
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
std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary);
std::vector<uint8_t> packed(
Expand All @@ -1543,19 +1569,26 @@ TEST_CASE("MessagePack roundtrips", "[hide]")
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
std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary);
std::vector<uint8_t> packed(
(std::istreambuf_iterator<char>(f_msgpack)),
std::istreambuf_iterator<char>());

SECTION("std::vector<uint8_t>")
if (!exclude_packed.count(filename))
{
std::vector<uint8_t> vec;
json::to_msgpack(j1, vec);
CHECK(vec == packed);
SECTION(filename + ": output adapters: std::vector<uint8_t>")
{
std::vector<uint8_t> vec;
json::to_msgpack(j1, vec);
CHECK(vec == packed);
}
}
}
}
Expand Down
30 changes: 21 additions & 9 deletions test/src/unit-ubjson.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2199,12 +2199,12 @@ TEST_CASE("UBJSON roundtrips", "[hide]")
{
CAPTURE(filename);

// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);

SECTION("std::vector<uint8_t>")
SECTION(filename + ": std::vector<uint8_t>")
{
// parse JSON file
std::ifstream f_json(filename);
json j1 = json::parse(f_json);

// parse MessagePack file
std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary);
std::vector<uint8_t> packed(
Expand All @@ -2217,8 +2217,12 @@ TEST_CASE("UBJSON roundtrips", "[hide]")
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
std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary);
json j2;
Expand All @@ -2228,8 +2232,12 @@ TEST_CASE("UBJSON roundtrips", "[hide]")
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
std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary);
std::vector<uint8_t> packed(
Expand All @@ -2242,15 +2250,19 @@ TEST_CASE("UBJSON roundtrips", "[hide]")
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
std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary);
std::vector<uint8_t> packed(
(std::istreambuf_iterator<char>(f_ubjson)),
std::istreambuf_iterator<char>());

SECTION("std::vector<uint8_t>")
SECTION(filename + ": output adapters: std::vector<uint8_t>")
{
std::vector<uint8_t> vec;
json::to_ubjson(j1, vec);
Expand Down