3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-26 18:51:04 +08:00
Code Issues Projects Releases Wiki Activity

tests: Improve CharReaderFailIfExtraTest (#1011)

Browse Source 
* There was a nonsensical change of 'failIfExtra' before calling strictMode():
  the latter resets the former.
  Dealt with by having one test with pure strictMode and one with strictMode
  but failIfExtra=false.
* The JSONTEST_ASSERT_STRING_EQUAL tests for the error strings swapped
  the 'expected' and 'actual' values.
This commit is contained in:
Frank Richter 2019-08-26 21:36:27 +02:00 committed by Jordan Bayles
parent 2cf939e8c3
commit b941149a37
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/test_lib_json/main.cpp
View File

@ -2116,22 +2116,34 @@ JSONTEST_FIXTURE(CharReaderFailIfExtraTest, issue164) {
Json::String errs; Json::String errs;
bool ok = reader->parse(doc, doc + std::strlen(doc), &root, &errs); bool ok = reader->parse(doc, doc + std::strlen(doc), &root, &errs);
JSONTEST_ASSERT(!ok); JSONTEST_ASSERT(!ok);
JSONTEST_ASSERT_STRING_EQUAL(errs, JSONTEST_ASSERT_STRING_EQUAL("* Line 1, Column 13\n"
"* Line 1, Column 13\n" " Extra non-whitespace after JSON value.\n",
" Extra non-whitespace after JSON value.\n"); errs);
JSONTEST_ASSERT_EQUAL("property", root); JSONTEST_ASSERT_EQUAL("property", root);
delete reader; delete reader;
} }
{ {
b.settings_["failIfExtra"] = false;
b.strictMode(&b.settings_); b.strictMode(&b.settings_);
Json::CharReader* reader(b.newCharReader()); Json::CharReader* reader(b.newCharReader());
Json::String errs; Json::String errs;
bool ok = reader->parse(doc, doc + std::strlen(doc), &root, &errs); bool ok = reader->parse(doc, doc + std::strlen(doc), &root, &errs);
JSONTEST_ASSERT(!ok); JSONTEST_ASSERT(!ok);
JSONTEST_ASSERT_STRING_EQUAL(errs, JSONTEST_ASSERT_STRING_EQUAL("* Line 1, Column 13\n"
"* Line 1, Column 13\n" " Extra non-whitespace after JSON value.\n",
" Extra non-whitespace after JSON value.\n"); errs);
JSONTEST_ASSERT_EQUAL("property", root);
delete reader;
}
{
b.strictMode(&b.settings_);
b.settings_["failIfExtra"] = false;
Json::CharReader* reader(b.newCharReader());
Json::String errs;
bool ok = reader->parse(doc, doc + std::strlen(doc), &root, &errs);
JSONTEST_ASSERT(!ok);
JSONTEST_ASSERT_STRING_EQUAL("* Line 1, Column 1\n"
" A valid JSON document must be either an array or an object value.\n",
errs);
JSONTEST_ASSERT_EQUAL("property", root); JSONTEST_ASSERT_EQUAL("property", root);
delete reader; delete reader;
} }