Merge branch 'develop' into feature/manual_lexer

This commit is contained in:
Niels Lohmann 2017-03-29 00:57:09 +02:00
commit a690a9f2d2
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
5 changed files with 68 additions and 33 deletions

View file

@ -127,7 +127,7 @@ TEST_CASE("Unicode", "[hide]")
// strings in a JSON array
std::ifstream f("test/data/json_nlohmann_tests/all_unicode.json");
json j;
CHECK_NOTHROW(j << f);
CHECK_NOTHROW(f >> j);
// the array has 1112064 + 1 elemnts (a terminating "null" value)
// Note: 1112064 = 0x1FFFFF code points - 2048 invalid values between
@ -170,7 +170,7 @@ TEST_CASE("Unicode", "[hide]")
// read a file with a UTF-8 BOM
std::ifstream f("test/data/json_nlohmann_tests/bom.json");
json j;
CHECK_NOTHROW(j << f);
CHECK_NOTHROW(f >> j);
}
SECTION("error for incomplete/wrong BOM")