Merge pull request #879 from nlohmann/feature/algorithms

 re-added tests for algorithms
This commit is contained in:
Niels Lohmann 2017-12-16 12:41:07 +01:00 committed by GitHub
commit 7bf007f2bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -256,7 +256,6 @@ TEST_CASE("algorithms")
SECTION("set operations") SECTION("set operations")
{ {
/*
SECTION("std::merge") SECTION("std::merge")
{ {
{ {
@ -268,7 +267,6 @@ TEST_CASE("algorithms")
CHECK(j3 == json({1, 2, 2, 3, 4, 5, 6, 7, 8})); CHECK(j3 == json({1, 2, 2, 3, 4, 5, 6, 7, 8}));
} }
} }
*/
SECTION("std::set_difference") SECTION("std::set_difference")
{ {
@ -290,7 +288,6 @@ TEST_CASE("algorithms")
CHECK(j3 == json({1, 2, 3, 5, 7})); CHECK(j3 == json({1, 2, 3, 5, 7}));
} }
/*
SECTION("std::set_union") SECTION("std::set_union")
{ {
json j1 = {2, 4, 6, 8}; json j1 = {2, 4, 6, 8};
@ -310,7 +307,6 @@ TEST_CASE("algorithms")
std::set_symmetric_difference(j1.begin(), j1.end(), j2.begin(), j2.end(), std::back_inserter(j3)); std::set_symmetric_difference(j1.begin(), j1.end(), j2.begin(), j2.end(), std::back_inserter(j3));
CHECK(j3 == json({1, 3, 4, 5, 6, 7, 8})); CHECK(j3 == json({1, 3, 4, 5, 6, 7, 8}));
} }
*/
} }
SECTION("heap operations") SECTION("heap operations")