wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added JSON reparsing and error output to all JsonBuilder output tests.

This commit is contained in:
Stephen Atherton 2018-09-10 03:21:55 -07:00
parent 9828db4399
commit 4510881ba1
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fdbserver/Status.actor.cpp
View File

@ -1949,13 +1949,17 @@ ACTOR Future<StatusReply> clusterGetStatus(
bool checkAsciiNumber(const char *s) {
JsonBuilderObject number;
number.setKeyRawNumber("number", s);
printf("'%s' => %s\n", s, number.getJson().c_str());
std::string js = number.getJson();
printf("'%s' => %s\n", s, js.c_str());
try {
// Make sure it parses as JSON
readJSONStrictly(number.getJson());
} catch(...) {
readJSONStrictly(js);
} catch(Error &e) {
printf("error: %s\n", e.what());
return false;
}
return true;
}
@ -1963,6 +1967,15 @@ bool checkJson(const JsonBuilder &j, const char *expected) {
std::string js = j.getJson();
printf("json: '%s'\n", js.c_str());
printf("expected: '%s'\n\n", expected);
try {
// Make sure it parses as JSON
readJSONStrictly(js);
} catch(Error &e) {
printf("error: %s\n", e.what());
return false;
}
return js == expected;
}