overworked test case

This commit is contained in:
Niels 2015-05-03 21:10:22 +02:00
parent c458bf18e6
commit 370929ac08

View file

@ -7695,7 +7695,7 @@ TEST_CASE("parser class")
)"; )";
auto s_array = R"( auto s_array = R"(
[1,2,3,4,[5]] [1,2,[3],4,5]
)"; )";
SECTION("filter nothing") SECTION("filter nothing")
@ -7712,7 +7712,7 @@ TEST_CASE("parser class")
return true; return true;
}); });
CHECK (j_array == json({1, 2, 3, 4, {5}})); CHECK (j_array == json({1, 2, {3}, 4, 5}));
} }
SECTION("filter everything") SECTION("filter everything")
@ -7761,7 +7761,7 @@ TEST_CASE("parser class")
} }
}); });
CHECK (j_array == json({1, 3, 4, {5}})); CHECK (j_array == json({1, {3}, 4, 5}));
} }
SECTION("filter specific events") SECTION("filter specific events")
@ -7801,19 +7801,18 @@ TEST_CASE("parser class")
SECTION("second closing event") SECTION("second closing event")
{ {
int i = 0; bool second = false;
json j_object = json::parse(s_object, [&i](int, json::parse_event_t e, const json&) json j_object = json::parse(s_object, [&second](int, json::parse_event_t e, const json&)
{ {
// filter all number(2) elements
if (e == json::parse_event_t::object_end) if (e == json::parse_event_t::object_end)
{ {
if (i > 0) if (second)
{ {
return false; return false;
} }
else else
{ {
++i; second = true;
return true; return true;
} }
} }
@ -7824,20 +7823,20 @@ TEST_CASE("parser class")
}); });
CHECK (j_object.is_discarded()); CHECK (j_object.is_discarded());
CHECK(second);
i = 0; second = false;
json j_array = json::parse(s_array, [&i](int, json::parse_event_t e, const json&) json j_array = json::parse(s_array, [&second](int, json::parse_event_t e, const json&)
{ {
// filter all number(2) elements
if (e == json::parse_event_t::array_end) if (e == json::parse_event_t::array_end)
{ {
if (i > 0) if (second)
{ {
return false; return false;
} }
else else
{ {
++i; second = true;
return true; return true;
} }
} }
@ -7848,6 +7847,7 @@ TEST_CASE("parser class")
}); });
CHECK (j_array.is_discarded()); CHECK (j_array.is_discarded());
CHECK(second);
} }
} }
} }