🔨 clean up

This commit is contained in:
Niels Lohmann 2017-09-10 01:12:03 +02:00
parent b21d7810fa
commit fcba9ec537
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 115 additions and 27 deletions

View file

@ -324,7 +324,7 @@ TEST_CASE("deserialization")
uint8_t v[] = {'\"', 0x7F, 0xDF, 0x7F};
CHECK_THROWS_AS(json::parse(std::begin(v), std::end(v)), json::parse_error&);
CHECK_THROWS_WITH(json::parse(std::begin(v), std::end(v)),
"[json.exception.parse_error.101] parse error at 4: syntax error - invalid string: ill-formed UTF-8 byte; last read: '\"\x7f\xdf\x7f'");
"[json.exception.parse_error.101] parse error at 4: syntax error - invalid string: ill-formed UTF-8 byte; last read: '\"\x7f\xdf\x7f'");
CHECK(not json::accept(std::begin(v), std::end(v)));
json j_error;

View file

@ -225,6 +225,114 @@ TEST_CASE("iterators 1")
CHECK(*it == j_const);
}
SECTION("additional tests")
{
SECTION("!(begin != begin)")
{
CHECK(not(j.begin() != j.begin()));
}
SECTION("!(end != end)")
{
CHECK(not(j.end() != j.end()));
}
SECTION("begin < end")
{
CHECK(j.begin() < j.end());
}
SECTION("begin <= end")
{
CHECK(j.begin() <= j.end());
}
SECTION("end > begin")
{
CHECK(j.end() > j.begin());
}
SECTION("end >= begin")
{
CHECK(j.end() >= j.begin());
}
SECTION("end == end")
{
CHECK(j.end() == j.end());
}
SECTION("end <= end")
{
CHECK(j.end() <= j.end());
}
SECTION("begin == begin")
{
CHECK(j.begin() == j.begin());
}
SECTION("begin <= begin")
{
CHECK(j.begin() <= j.begin());
}
SECTION("begin >= begin")
{
CHECK(j.begin() >= j.begin());
}
SECTION("!(begin == end)")
{
CHECK(not(j.begin() == j.end()));
}
SECTION("begin != end")
{
CHECK(j.begin() != j.end());
}
SECTION("begin+1 == end")
{
CHECK(j.begin() + 1 == j.end());
}
SECTION("begin == end-1")
{
CHECK(j.begin() == j.end() - 1);
}
SECTION("begin != end+1")
{
CHECK(j.begin() != j.end() + 1);
}
SECTION("end != end+1")
{
CHECK(j.end() != j.end() + 1);
}
SECTION("begin+1 != begin+2")
{
CHECK(j.begin() + 1 != j.begin() + 2);
}
SECTION("begin+1 < begin+2")
{
CHECK(j.begin() + 1 < j.begin() + 2);
}
SECTION("begin+1 <= begin+2")
{
CHECK(j.begin() + 1 <= j.begin() + 2);
}
SECTION("end+1 != end+2")
{
CHECK(j.end() + 1 != j.end() + 2);
}
}
SECTION("key/value")
{
auto it = j.begin();