From d5aaeb4cce173a108a81c247c98de1714e02b833 Mon Sep 17 00:00:00 2001 From: Michael Gmelin Date: Sun, 29 Jul 2018 01:29:50 +0200 Subject: [PATCH] Make section names unique in loops, as catch doesn't support duplicate sections, see also https://github.com/catchorg/Catch2/issues/816#issuecomment-278268122 As a result, when built with gcc, loop iterations were skipped. When built with clang, the test aborted with an assertion in catch.hpp line 6222. This also addresses the issues discussed here: https://github.com/nlohmann/json/issues/1032#issuecomment-378707696 and here: https://github.com/catchorg/Catch2/issues/1241 Please note that this introduces new problems, as some of the unit tests fail now - the library stores keys in lexographical order, while the cbor/msgpack/ubjson examples store them in original order. --- test/src/unit-cbor.cpp | 10 +++++----- test/src/unit-msgpack.cpp | 10 +++++----- test/src/unit-ubjson.cpp | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/test/src/unit-cbor.cpp b/test/src/unit-cbor.cpp index 21235b0d..291f893a 100644 --- a/test/src/unit-cbor.cpp +++ b/test/src/unit-cbor.cpp @@ -1815,7 +1815,7 @@ TEST_CASE("CBOR roundtrips", "[hide]") std::ifstream f_json(filename); json j1 = json::parse(f_json); - SECTION("std::vector") + SECTION(filename + ": std::vector") { // parse CBOR file std::ifstream f_cbor(filename + ".cbor", std::ios::binary); @@ -1829,7 +1829,7 @@ TEST_CASE("CBOR roundtrips", "[hide]") CHECK(j1 == j2); } - SECTION("std::ifstream") + SECTION(filename + ": std::ifstream") { // parse CBOR file std::ifstream f_cbor(filename + ".cbor", std::ios::binary); @@ -1840,7 +1840,7 @@ TEST_CASE("CBOR roundtrips", "[hide]") CHECK(j1 == j2); } - SECTION("uint8_t* and size") + SECTION(filename + ": uint8_t* and size") { // parse CBOR file std::ifstream f_cbor(filename + ".cbor", std::ios::binary); @@ -1854,7 +1854,7 @@ TEST_CASE("CBOR roundtrips", "[hide]") CHECK(j1 == j2); } - SECTION("output to output adapters") + SECTION(filename + ": output to output adapters") { // parse CBOR file std::ifstream f_cbor(filename + ".cbor", std::ios::binary); @@ -1862,7 +1862,7 @@ TEST_CASE("CBOR roundtrips", "[hide]") (std::istreambuf_iterator(f_cbor)), std::istreambuf_iterator()); - SECTION("std::vector") + SECTION(filename + ": output adapters: std::vector") { std::vector vec; json::to_cbor(j1, vec); diff --git a/test/src/unit-msgpack.cpp b/test/src/unit-msgpack.cpp index b10afbf4..37e30664 100644 --- a/test/src/unit-msgpack.cpp +++ b/test/src/unit-msgpack.cpp @@ -1504,7 +1504,7 @@ TEST_CASE("MessagePack roundtrips", "[hide]") std::ifstream f_json(filename); json j1 = json::parse(f_json); - SECTION("std::vector") + SECTION(filename + ": std::vector") { // parse MessagePack file std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary); @@ -1518,7 +1518,7 @@ TEST_CASE("MessagePack roundtrips", "[hide]") CHECK(j1 == j2); } - SECTION("std::ifstream") + SECTION(filename + ": std::ifstream") { // parse MessagePack file std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary); @@ -1529,7 +1529,7 @@ TEST_CASE("MessagePack roundtrips", "[hide]") CHECK(j1 == j2); } - SECTION("uint8_t* and size") + SECTION(filename + ": uint8_t* and size") { // parse MessagePack file std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary); @@ -1543,7 +1543,7 @@ TEST_CASE("MessagePack roundtrips", "[hide]") CHECK(j1 == j2); } - SECTION("output to output adapters") + SECTION(filename + ": output to output adapters") { // parse MessagePack file std::ifstream f_msgpack(filename + ".msgpack", std::ios::binary); @@ -1551,7 +1551,7 @@ TEST_CASE("MessagePack roundtrips", "[hide]") (std::istreambuf_iterator(f_msgpack)), std::istreambuf_iterator()); - SECTION("std::vector") + SECTION(filename + ": output adapters: std::vector") { std::vector vec; json::to_msgpack(j1, vec); diff --git a/test/src/unit-ubjson.cpp b/test/src/unit-ubjson.cpp index 0e15c164..0c3f4559 100644 --- a/test/src/unit-ubjson.cpp +++ b/test/src/unit-ubjson.cpp @@ -2203,7 +2203,7 @@ TEST_CASE("UBJSON roundtrips", "[hide]") std::ifstream f_json(filename); json j1 = json::parse(f_json); - SECTION("std::vector") + SECTION(filename + ": std::vector") { // parse MessagePack file std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary); @@ -2217,7 +2217,7 @@ TEST_CASE("UBJSON roundtrips", "[hide]") CHECK(j1 == j2); } - SECTION("std::ifstream") + SECTION(filename + ": std::ifstream") { // parse MessagePack file std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary); @@ -2228,7 +2228,7 @@ TEST_CASE("UBJSON roundtrips", "[hide]") CHECK(j1 == j2); } - SECTION("uint8_t* and size") + SECTION(filename + ": uint8_t* and size") { // parse MessagePack file std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary); @@ -2242,7 +2242,7 @@ TEST_CASE("UBJSON roundtrips", "[hide]") CHECK(j1 == j2); } - SECTION("output to output adapters") + SECTION(filename + ": output to output adapters") { // parse MessagePack file std::ifstream f_ubjson(filename + ".ubjson", std::ios::binary); @@ -2250,7 +2250,7 @@ TEST_CASE("UBJSON roundtrips", "[hide]") (std::istreambuf_iterator(f_ubjson)), std::istreambuf_iterator()); - SECTION("std::vector") + SECTION(filename + ": output adapters: std::vector") { std::vector vec; json::to_ubjson(j1, vec);