Merge pull request #879 from nlohmann/feature/algorithms

✅ re-added tests for algorithms
nlohmann · Dec 16, 2017 · 7bf007f · 7bf007f
2 parents 980795b + 4c871c5
commit 7bf007f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/test/src/unit-algorithms.cpp b/test/src/unit-algorithms.cpp
@@ -256,7 +256,6 @@ TEST_CASE("algorithms")
 
     SECTION("set operations")
     {
-        /*
         SECTION("std::merge")
         {
             {
@@ -268,7 +267,6 @@ TEST_CASE("algorithms")
                 CHECK(j3 == json({1, 2, 2, 3, 4, 5, 6, 7, 8}));
             }
         }
-        */
 
         SECTION("std::set_difference")
         {
@@ -290,7 +288,6 @@ TEST_CASE("algorithms")
             CHECK(j3 == json({1, 2, 3, 5, 7}));
         }
 
-        /*
         SECTION("std::set_union")
         {
             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));
             CHECK(j3 == json({1, 3, 4, 5, 6, 7, 8}));
         }
-        */
     }
 
     SECTION("heap operations")