From 2160c9a042069385b81308b6e264da06e60ce9e2 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 09:02:44 -0600 Subject: [PATCH 01/12] switch from StyledWriter to StyledStream writer in tests --- src/jsontestrunner/main.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp index ba98587..46eb872 100644 --- a/src/jsontestrunner/main.cpp +++ b/src/jsontestrunner/main.cpp @@ -8,6 +8,7 @@ #include #include // sort +#include #include #if defined(_MSC_VER) && _MSC_VER >= 1310 @@ -158,8 +159,10 @@ static int rewriteValueTree(const std::string& rewritePath, std::string& rewrite) { // Json::FastWriter writer; // writer.enableYAMLCompatibility(); - Json::StyledWriter writer; - rewrite = writer.write(root); + Json::StyledStreamWriter writer; + std::ostringstream sout; + writer.write(sout, root); + rewrite = sout.str(); FILE* fout = fopen(rewritePath.c_str(), "wt"); if (!fout) { printf("Failed to create rewrite file: %s\n", rewritePath.c_str()); From 942e2c999ad021b8cbd5737a1b70c85871cabbe8 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 11:03:55 -0600 Subject: [PATCH 02/12] unindent test-code --- src/jsontestrunner/main.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp index 46eb872..9891600 100644 --- a/src/jsontestrunner/main.cpp +++ b/src/jsontestrunner/main.cpp @@ -257,19 +257,21 @@ int main(int argc, const char* argv[]) { Json::Value root; exitCode = parseAndSaveValueTree( input, actualPath, "input", root, features, parseOnly); - if (exitCode == 0 && !parseOnly) { - std::string rewrite; - exitCode = rewriteValueTree(rewritePath, root, rewrite); - if (exitCode == 0) { - Json::Value rewriteRoot; - exitCode = parseAndSaveValueTree(rewrite, - rewriteActualPath, - "rewrite", - rewriteRoot, - features, - parseOnly); - } + if (exitCode != 0 || parseOnly) { + return exitCode; } + std::string rewrite; + exitCode = rewriteValueTree(rewritePath, root, rewrite); + if (exitCode =! 0) { + return exitCode; + } + Json::Value rewriteRoot; + exitCode = parseAndSaveValueTree(rewrite, + rewriteActualPath, + "rewrite", + rewriteRoot, + features, + parseOnly); } catch (const std::exception& e) { printf("Unhandled exception:\n%s\n", e.what()); From 05810a760761a3e341395d8d0a7078db5b142725 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 11:06:27 -0600 Subject: [PATCH 03/12] cleaner --- src/jsontestrunner/main.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp index 9891600..0b2f8e2 100644 --- a/src/jsontestrunner/main.cpp +++ b/src/jsontestrunner/main.cpp @@ -257,21 +257,20 @@ int main(int argc, const char* argv[]) { Json::Value root; exitCode = parseAndSaveValueTree( input, actualPath, "input", root, features, parseOnly); - if (exitCode != 0 || parseOnly) { + if (exitCode || parseOnly) { return exitCode; } std::string rewrite; exitCode = rewriteValueTree(rewritePath, root, rewrite); - if (exitCode =! 0) { + if (exitCode) { return exitCode; } Json::Value rewriteRoot; - exitCode = parseAndSaveValueTree(rewrite, - rewriteActualPath, - "rewrite", - rewriteRoot, - features, - parseOnly); + exitCode = parseAndSaveValueTree( + rewrite, rewriteActualPath, "rewrite", rewriteRoot, features, parseOnly); + if (exitCode) { + return exitCode; + } } catch (const std::exception& e) { printf("Unhandled exception:\n%s\n", e.what()); From 632c9b5032e84167e20e6d36728ca7c8bf6dddc2 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 11:09:04 -0600 Subject: [PATCH 04/12] cleaner --- src/jsontestrunner/main.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp index 0b2f8e2..3ded3bd 100644 --- a/src/jsontestrunner/main.cpp +++ b/src/jsontestrunner/main.cpp @@ -130,11 +130,11 @@ printValueTree(FILE* fout, Json::Value& value, const std::string& path = ".") { static int parseAndSaveValueTree(const std::string& input, const std::string& actual, const std::string& kind, - Json::Value& root, const Json::Features& features, - bool parseOnly) { + bool parseOnly, + Json::Value* root) { Json::Reader reader(features); - bool parsingSuccessful = reader.parse(input, root); + bool parsingSuccessful = reader.parse(input, *root); if (!parsingSuccessful) { printf("Failed to parse %s file: \n%s\n", kind.c_str(), @@ -148,7 +148,7 @@ static int parseAndSaveValueTree(const std::string& input, printf("Failed to create %s actual file.\n", kind.c_str()); return 2; } - printValueTree(factual, root); + printValueTree(factual, *root); fclose(factual); } return 0; @@ -156,19 +156,19 @@ static int parseAndSaveValueTree(const std::string& input, static int rewriteValueTree(const std::string& rewritePath, const Json::Value& root, - std::string& rewrite) { + std::string* rewrite) { // Json::FastWriter writer; // writer.enableYAMLCompatibility(); Json::StyledStreamWriter writer; std::ostringstream sout; writer.write(sout, root); - rewrite = sout.str(); + *rewrite = sout.str(); FILE* fout = fopen(rewritePath.c_str(), "wt"); if (!fout) { printf("Failed to create rewrite file: %s\n", rewritePath.c_str()); return 2; } - fprintf(fout, "%s\n", rewrite.c_str()); + fprintf(fout, "%s\n", rewrite->c_str()); fclose(fout); return 0; } @@ -250,24 +250,24 @@ int main(int argc, const char* argv[]) { return 3; } - std::string actualPath = basePath + ".actual"; - std::string rewritePath = basePath + ".rewrite"; - std::string rewriteActualPath = basePath + ".actual-rewrite"; + std::string const actualPath = basePath + ".actual"; + std::string const rewritePath = basePath + ".rewrite"; + std::string const rewriteActualPath = basePath + ".actual-rewrite"; Json::Value root; exitCode = parseAndSaveValueTree( - input, actualPath, "input", root, features, parseOnly); + input, actualPath, "input", features, parseOnly, &root); if (exitCode || parseOnly) { return exitCode; } std::string rewrite; - exitCode = rewriteValueTree(rewritePath, root, rewrite); + exitCode = rewriteValueTree(rewritePath, root, &rewrite); if (exitCode) { return exitCode; } Json::Value rewriteRoot; exitCode = parseAndSaveValueTree( - rewrite, rewriteActualPath, "rewrite", rewriteRoot, features, parseOnly); + rewrite, rewriteActualPath, "rewrite", features, parseOnly, &rewriteRoot); if (exitCode) { return exitCode; } From 79211e1aebdcbb8c4734a24fc40a06cb5c5ffad6 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 11:27:19 -0600 Subject: [PATCH 05/12] Options class for test --- src/jsontestrunner/main.cpp | 84 ++++++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 33 deletions(-) diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp index 3ded3bd..5db8115 100644 --- a/src/jsontestrunner/main.cpp +++ b/src/jsontestrunner/main.cpp @@ -132,7 +132,8 @@ static int parseAndSaveValueTree(const std::string& input, const std::string& kind, const Json::Features& features, bool parseOnly, - Json::Value* root) { + Json::Value* root) +{ Json::Reader reader(features); bool parsingSuccessful = reader.parse(input, *root); if (!parsingSuccessful) { @@ -153,16 +154,31 @@ static int parseAndSaveValueTree(const std::string& input, } return 0; } - -static int rewriteValueTree(const std::string& rewritePath, - const Json::Value& root, - std::string* rewrite) { - // Json::FastWriter writer; - // writer.enableYAMLCompatibility(); +// static std::string useFastWriter(Json::Value const& root) { +// Json::FastWriter writer; +// writer.enableYAMLCompatibility(); +// return writer.write(root); +// } +static std::string useStyledWriter( + Json::Value const& root) +{ + Json::StyledWriter writer; + return writer.write(root); +} +static std::string useStyledStreamWriter( + Json::Value const& root) +{ Json::StyledStreamWriter writer; std::ostringstream sout; writer.write(sout, root); - *rewrite = sout.str(); + return sout.str(); +} +static int rewriteValueTree( + const std::string& rewritePath, + const Json::Value& root, + std::string* rewrite) +{ + *rewrite = useStyledWriter(root); FILE* fout = fopen(rewritePath.c_str(), "wt"); if (!fout) { printf("Failed to create rewrite file: %s\n", rewritePath.c_str()); @@ -197,56 +213,56 @@ static int printUsage(const char* argv[]) { return 3; } -int parseCommandLine(int argc, - const char* argv[], - Json::Features& features, - std::string& path, - bool& parseOnly) { - parseOnly = false; +struct Options +{ + std::string path; + Json::Features features; + bool parseOnly; +}; +static int parseCommandLine( + int argc, const char* argv[], Options* opts) +{ + opts->parseOnly = false; if (argc < 2) { return printUsage(argv); } - int index = 1; if (std::string(argv[1]) == "--json-checker") { - features = Json::Features::strictMode(); - parseOnly = true; + opts->features = Json::Features::strictMode(); + opts->parseOnly = true; ++index; } - if (std::string(argv[1]) == "--json-config") { printConfig(); return 3; } - if (index == argc || index + 1 < argc) { return printUsage(argv); } - - path = argv[index]; + opts->path = argv[index]; return 0; } - +static void tryTest(Options const& opts) +{ +} int main(int argc, const char* argv[]) { - std::string path; - Json::Features features; - bool parseOnly; - int exitCode = parseCommandLine(argc, argv, features, path, parseOnly); + Options opts; + int exitCode = parseCommandLine(argc, argv, &opts); if (exitCode != 0) { return exitCode; } try { - std::string input = readInputTestFile(path.c_str()); + std::string input = readInputTestFile(opts.path.c_str()); if (input.empty()) { - printf("Failed to read input or empty input: %s\n", path.c_str()); + printf("Failed to read input or empty input: %s\n", opts.path.c_str()); return 3; } std::string basePath = removeSuffix(argv[1], ".json"); - if (!parseOnly && basePath.empty()) { + if (!opts.parseOnly && basePath.empty()) { printf("Bad input path. Path does not end with '.expected':\n%s\n", - path.c_str()); + opts.path.c_str()); return 3; } @@ -256,8 +272,9 @@ int main(int argc, const char* argv[]) { Json::Value root; exitCode = parseAndSaveValueTree( - input, actualPath, "input", features, parseOnly, &root); - if (exitCode || parseOnly) { + input, actualPath, "input", + opts.features, opts.parseOnly, &root); + if (exitCode || opts.parseOnly) { return exitCode; } std::string rewrite; @@ -267,7 +284,8 @@ int main(int argc, const char* argv[]) { } Json::Value rewriteRoot; exitCode = parseAndSaveValueTree( - rewrite, rewriteActualPath, "rewrite", features, parseOnly, &rewriteRoot); + rewrite, rewriteActualPath, "rewrite", + opts.features, opts.parseOnly, &rewriteRoot); if (exitCode) { return exitCode; } From 08cfd02d8cab9a275419d1441db291fc203ea366 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 11:33:47 -0600 Subject: [PATCH 06/12] fix minor bugs in test-runner --- src/jsontestrunner/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp index 5db8115..a44a081 100644 --- a/src/jsontestrunner/main.cpp +++ b/src/jsontestrunner/main.cpp @@ -232,7 +232,7 @@ static int parseCommandLine( opts->parseOnly = true; ++index; } - if (std::string(argv[1]) == "--json-config") { + if (std::string(argv[index]) == "--json-config") { printConfig(); return 3; } @@ -259,7 +259,7 @@ int main(int argc, const char* argv[]) { return 3; } - std::string basePath = removeSuffix(argv[1], ".json"); + std::string basePath = removeSuffix(opts.path, ".json"); if (!opts.parseOnly && basePath.empty()) { printf("Bad input path. Path does not end with '.expected':\n%s\n", opts.path.c_str()); From 58c31ac55056b3ef3394b6d0b8f37ae18b3e8455 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 11:36:55 -0600 Subject: [PATCH 07/12] mv try-block --- src/jsontestrunner/main.cpp | 84 +++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp index a44a081..deb0687 100644 --- a/src/jsontestrunner/main.cpp +++ b/src/jsontestrunner/main.cpp @@ -242,58 +242,60 @@ static int parseCommandLine( opts->path = argv[index]; return 0; } -static void tryTest(Options const& opts) +static int runTest(Options const& opts) { + int exitCode = 0; + + std::string input = readInputTestFile(opts.path.c_str()); + if (input.empty()) { + printf("Failed to read input or empty input: %s\n", opts.path.c_str()); + return 3; + } + + std::string basePath = removeSuffix(opts.path, ".json"); + if (!opts.parseOnly && basePath.empty()) { + printf("Bad input path. Path does not end with '.expected':\n%s\n", + opts.path.c_str()); + return 3; + } + + std::string const actualPath = basePath + ".actual"; + std::string const rewritePath = basePath + ".rewrite"; + std::string const rewriteActualPath = basePath + ".actual-rewrite"; + + Json::Value root; + exitCode = parseAndSaveValueTree( + input, actualPath, "input", + opts.features, opts.parseOnly, &root); + if (exitCode || opts.parseOnly) { + return exitCode; + } + std::string rewrite; + exitCode = rewriteValueTree(rewritePath, root, &rewrite); + if (exitCode) { + return exitCode; + } + Json::Value rewriteRoot; + exitCode = parseAndSaveValueTree( + rewrite, rewriteActualPath, "rewrite", + opts.features, opts.parseOnly, &rewriteRoot); + if (exitCode) { + return exitCode; + } + return 0; } int main(int argc, const char* argv[]) { Options opts; int exitCode = parseCommandLine(argc, argv, &opts); if (exitCode != 0) { + printf("Failed to parse command-line."); return exitCode; } - try { - std::string input = readInputTestFile(opts.path.c_str()); - if (input.empty()) { - printf("Failed to read input or empty input: %s\n", opts.path.c_str()); - return 3; - } - - std::string basePath = removeSuffix(opts.path, ".json"); - if (!opts.parseOnly && basePath.empty()) { - printf("Bad input path. Path does not end with '.expected':\n%s\n", - opts.path.c_str()); - return 3; - } - - std::string const actualPath = basePath + ".actual"; - std::string const rewritePath = basePath + ".rewrite"; - std::string const rewriteActualPath = basePath + ".actual-rewrite"; - - Json::Value root; - exitCode = parseAndSaveValueTree( - input, actualPath, "input", - opts.features, opts.parseOnly, &root); - if (exitCode || opts.parseOnly) { - return exitCode; - } - std::string rewrite; - exitCode = rewriteValueTree(rewritePath, root, &rewrite); - if (exitCode) { - return exitCode; - } - Json::Value rewriteRoot; - exitCode = parseAndSaveValueTree( - rewrite, rewriteActualPath, "rewrite", - opts.features, opts.parseOnly, &rewriteRoot); - if (exitCode) { - return exitCode; - } + return runTest(opts); } catch (const std::exception& e) { printf("Unhandled exception:\n%s\n", e.what()); - exitCode = 1; + return 1; } - - return exitCode; } From 3682f60927cf5029eb6299b63ef45082d946a70e Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 11:46:05 -0600 Subject: [PATCH 08/12] --json-writer arg --- src/jsontestrunner/main.cpp | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp index deb0687..f6f12b8 100644 --- a/src/jsontestrunner/main.cpp +++ b/src/jsontestrunner/main.cpp @@ -15,6 +15,15 @@ #pragma warning(disable : 4996) // disable fopen deprecation warning #endif +struct Options +{ + std::string path; + Json::Features features; + bool parseOnly; + typedef std::string (*writeFuncType)(Json::Value const&); + writeFuncType write; +}; + static std::string normalizeFloatingPointStr(double value) { char buffer[32]; #if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) @@ -176,9 +185,10 @@ static std::string useStyledStreamWriter( static int rewriteValueTree( const std::string& rewritePath, const Json::Value& root, + Options::writeFuncType write, std::string* rewrite) { - *rewrite = useStyledWriter(root); + *rewrite = write(root); FILE* fout = fopen(rewritePath.c_str(), "wt"); if (!fout) { printf("Failed to create rewrite file: %s\n", rewritePath.c_str()); @@ -213,21 +223,16 @@ static int printUsage(const char* argv[]) { return 3; } -struct Options -{ - std::string path; - Json::Features features; - bool parseOnly; -}; static int parseCommandLine( int argc, const char* argv[], Options* opts) { opts->parseOnly = false; + opts->write = &useStyledWriter; if (argc < 2) { return printUsage(argv); } int index = 1; - if (std::string(argv[1]) == "--json-checker") { + if (std::string(argv[index]) == "--json-checker") { opts->features = Json::Features::strictMode(); opts->parseOnly = true; ++index; @@ -236,6 +241,18 @@ static int parseCommandLine( printConfig(); return 3; } + if (std::string(argv[index]) == "--json-writer") { + ++index; + std::string const writerName(argv[index++]); + if (writerName == "StyledWriter") { + opts->write = &useStyledWriter; + } else if (writerName == "StyledStreamWriter") { + opts->write = &useStyledStreamWriter; + } else { + printf("Unknown '--json-writer %s'\n", writerName.c_str()); + return 4; + } + } if (index == argc || index + 1 < argc) { return printUsage(argv); } @@ -271,7 +288,7 @@ static int runTest(Options const& opts) return exitCode; } std::string rewrite; - exitCode = rewriteValueTree(rewritePath, root, &rewrite); + exitCode = rewriteValueTree(rewritePath, root, opts.write, &rewrite); if (exitCode) { return exitCode; } From 26c52861b9e5d73eb20c9db2e0952c0e7cdd57b7 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 11:53:16 -0600 Subject: [PATCH 09/12] pass --json-writer StyledWriter --- test/runjsontests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/runjsontests.py b/test/runjsontests.py index 7243063..ffe033f 100644 --- a/test/runjsontests.py +++ b/test/runjsontests.py @@ -72,6 +72,7 @@ def runAllTests( jsontest_executable_path, input_dir = None, is_json_checker_test = (input_path in test_jsonchecker) or expect_failure print('TESTING:', input_path, end=' ') options = is_json_checker_test and '--json-checker' or '' + options += ' --json-writer StyledWriter' cmd = '%s%s %s "%s"' % ( valgrind_path, jsontest_executable_path, options, input_path) From ac6bbbc7392293fec3721b1cec1df2f846b9aa11 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Tue, 20 Jan 2015 11:36:05 -0600 Subject: [PATCH 10/12] show cmd in runjsontests.py --- test/runjsontests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/runjsontests.py b/test/runjsontests.py index ffe033f..5230965 100644 --- a/test/runjsontests.py +++ b/test/runjsontests.py @@ -14,6 +14,7 @@ def getStatusOutput(cmd): Return int, unicode (for both Python 2 and 3). Note: os.popen().close() would return None for 0. """ + print(cmd, file=sys.stderr) pipe = os.popen(cmd) process_output = pipe.read() try: From 70704b9a707b83d66660425783e81f704bc2ce0c Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 12:04:14 -0600 Subject: [PATCH 11/12] test both StyledWriter and StyledStreamWriter --- test/runjsontests.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test/runjsontests.py b/test/runjsontests.py index 5230965..19903b9 100644 --- a/test/runjsontests.py +++ b/test/runjsontests.py @@ -58,7 +58,8 @@ def safeReadFile( path ): return '' % (path,e) def runAllTests( jsontest_executable_path, input_dir = None, - use_valgrind=False, with_json_checker=False ): + use_valgrind=False, with_json_checker=False, + writerClass='StyledWriter'): if not input_dir: input_dir = os.path.join( os.getcwd(), 'data' ) tests = glob( os.path.join( input_dir, '*.json' ) ) @@ -73,7 +74,7 @@ def runAllTests( jsontest_executable_path, input_dir = None, is_json_checker_test = (input_path in test_jsonchecker) or expect_failure print('TESTING:', input_path, end=' ') options = is_json_checker_test and '--json-checker' or '' - options += ' --json-writer StyledWriter' + options += ' --json-writer %s'%writerClass cmd = '%s%s %s "%s"' % ( valgrind_path, jsontest_executable_path, options, input_path) @@ -147,7 +148,15 @@ def main(): else: input_path = None status = runAllTests( jsontest_executable_path, input_path, - use_valgrind=options.valgrind, with_json_checker=options.with_json_checker ) + use_valgrind=options.valgrind, + with_json_checker=options.with_json_checker, + writerClass='StyledWriter') + if status: + sys.exit( status ) + status = runAllTests( jsontest_executable_path, input_path, + use_valgrind=options.valgrind, + with_json_checker=options.with_json_checker, + writerClass='StyledStreamWriter') sys.exit( status ) if __name__ == '__main__': From 3efc587fbabd4a4e6114a82a0acd80b844e64a0e Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Jan 2015 09:03:00 -0600 Subject: [PATCH 12/12] make StyledStreamWriter work more like StyledWriter tests pass --- src/lib_json/json_writer.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp index 778661c..099cc29 100644 --- a/src/lib_json/json_writer.cpp +++ b/src/lib_json/json_writer.cpp @@ -628,7 +628,20 @@ void StyledStreamWriter::unindent() { void StyledStreamWriter::writeCommentBeforeValue(const Value& root) { if (!root.hasComment(commentBefore)) return; - *document_ << root.getComment(commentBefore); + + *document_ << "\n"; + writeIndent(); + const std::string& comment = root.getComment(commentBefore); + std::string::const_iterator iter = comment.begin(); + while (iter != comment.end()) { + *document_ << *iter; + if (*iter == '\n' && + (iter != comment.end() && *(iter + 1) == '/')) + writeIndent(); + ++iter; + } + + // Comments are stripped of trailing newlines, so add one here *document_ << "\n"; }