From e19dff18c3c99d1969b400e290abce74366c386a Mon Sep 17 00:00:00 2001 From: Philip Rideout Date: Thu, 1 Apr 2021 20:31:16 -0700 Subject: [PATCH] Add JSON unit test, fix ring count output. Shockingly there were no unit tests that did a simple write-then-read. This is important because it's easy to forget details such as trailing commas and the fact that uint8_t is a char. --- docs/remote/filament.wasm | Bin 3844375 -> 3844305 bytes libs/viewer/src/AutomationEngine.cpp | 6 +++++- libs/viewer/src/Settings.cpp | 8 +++----- libs/viewer/tests/test_settings.cpp | 17 +++++++++++++++++ 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/docs/remote/filament.wasm b/docs/remote/filament.wasm index f890818b5496d77d41c1286c30f1e356b1efc43f..32680cc8f099f619a057ee1c212763ca5f5c3df4 100755 GIT binary patch delta 6593 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 diff --git a/libs/viewer/src/AutomationEngine.cpp b/libs/viewer/src/AutomationEngine.cpp index 359b884eb2..da117a2e51 100644 --- a/libs/viewer/src/AutomationEngine.cpp +++ b/libs/viewer/src/AutomationEngine.cpp @@ -140,7 +140,11 @@ void AutomationEngine::applySettings(const char* json, size_t jsonLength, View* MaterialInstance* const* materials, size_t materialCount, IndirectLight* ibl, utils::Entity sunlight, LightManager* lm, Scene* scene, Renderer* renderer) { JsonSerializer serializer; - serializer.readJson(json, jsonLength, mSettings); + if (!serializer.readJson(json, jsonLength, mSettings)) { + std::string jsonWithTerminator(json, json + jsonLength); + slog.e << "Badly formed JSON:\n" << jsonWithTerminator.c_str() << io::endl; + return; + } viewer::applySettings(mSettings->view, view); for (size_t i = 0; i < materialCount; i++) { viewer::applySettings(mSettings->material, materials[i]); diff --git a/libs/viewer/src/Settings.cpp b/libs/viewer/src/Settings.cpp index 61393afd1f..3d33d7ac17 100644 --- a/libs/viewer/src/Settings.cpp +++ b/libs/viewer/src/Settings.cpp @@ -1205,9 +1205,9 @@ static std::ostream& operator<<(std::ostream& out, const DepthOfFieldOptions& in << "\"enabled\": " << to_string(in.enabled) << ",\n" << "\"filter\": " << (in.filter) << ",\n" << "\"nativeResolution\": " << (in.nativeResolution) << ",\n" - << "\"foregroundRingCount\": " << (in.foregroundRingCount) << ",\n" - << "\"backgroundRingCount\": " << (in.backgroundRingCount) << ",\n" - << "\"fastGatherRingCount\": " << (in.fastGatherRingCount) << ",\n" + << "\"foregroundRingCount\": " << int(in.foregroundRingCount) << ",\n" + << "\"backgroundRingCount\": " << int(in.backgroundRingCount) << ",\n" + << "\"fastGatherRingCount\": " << int(in.fastGatherRingCount) << ",\n" << "\"maxForegroundCOC\": " << (in.maxForegroundCOC) << ",\n" << "\"maxBackgroundCOC\": " << (in.maxBackgroundCOC) << "\n" << "}"; @@ -1330,7 +1330,6 @@ bool JsonSerializer::readJson(const char* jsonChunk, size_t size, Settings* out) int tokenCount = jsmn_parse(&parser, jsonChunk, size, nullptr, 0); if (tokenCount <= 0) { - slog.e << "Badly formed JSON." << io::endl; return false; } @@ -1342,7 +1341,6 @@ bool JsonSerializer::readJson(const char* jsonChunk, size_t size, Settings* out) if (tokenCount <= 0) { free(tokens); - slog.e << "Badly formed JSON." << io::endl; return false; } diff --git a/libs/viewer/tests/test_settings.cpp b/libs/viewer/tests/test_settings.cpp index 1273839a5d..6eadab3de4 100644 --- a/libs/viewer/tests/test_settings.cpp +++ b/libs/viewer/tests/test_settings.cpp @@ -162,6 +162,23 @@ TEST_F(ViewSettingsTest, JsonTestDefaults) { ASSERT_EQ(serializer.writeJson(settings2), serializer.writeJson(settings3)); } +TEST_F(ViewSettingsTest, JsonTestSerialization) { + auto canParse = [](bool parseResult, std::string json) { + if (parseResult) { + return testing::AssertionSuccess() << "Settings can be serialized."; + } else { + return testing::AssertionFailure() << "JSON has errors:\n" << json.c_str() << std::endl; + } + }; + + JsonSerializer serializer; + Settings outSettings = {}; + std::string jsonstr = serializer.writeJson(outSettings); + Settings inSettings = {}; + bool result = serializer.readJson(jsonstr.c_str(), jsonstr.size(), &inSettings); + ASSERT_TRUE(canParse(result, jsonstr)); +} + TEST_F(ViewSettingsTest, JsonTestMaterial) { JsonSerializer serializer; Settings settings = {0};