feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Merge branch 'master' into 6.x

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	src/ArduinoJson/Deserialization/JsonParser.hpp
#	src/ArduinoJson/Deserialization/JsonParserImpl.hpp
#	test/JsonBuffer/nestingLimit.cpp
This commit is contained in:
Benoit Blanchon
2018-03-14 14:46:53 +01:00
parent b2a8085651 3523296e3d
commit e3e4aa89ad
5 changed files with 113 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
test/JsonParser/nestingLimit.cpp
View File

@ -5,45 +5,66 @@
#include <ArduinoJson.h>
#include <catch.hpp>
JsonError tryParseArray(const char *json, uint8_t nestingLimit) {
DynamicJsonArray array;
return deserializeJson(array, json, nestingLimit);
}
JsonError tryParseObject(const char *json, uint8_t nestingLimit) {
DynamicJsonObject obj;
return deserializeJson(obj, json, nestingLimit);
}
#define SHOULD_WORK(expression) REQUIRE(JsonError::Ok == expression);
#define SHOULD_FAIL(expression) REQUIRE(JsonError::TooDeep == expression);
TEST_CASE("JsonParser nestingLimit") {
SECTION("ParseArrayWithNestingLimit0") {
REQUIRE(tryParseArray("[]", 0) == JsonError::Ok);
REQUIRE(tryParseArray("[[]]", 0) == JsonError::TooDeep);
SECTION("deserializeJson(JsonArray&)") {
DynamicJsonArray arr;
SECTION("limit = 0") {
SHOULD_FAIL(deserializeJson(arr, "[]", 0));
}
SECTION("limit = 1") {
SHOULD_WORK(deserializeJson(arr, "[]", 1));
SHOULD_FAIL(deserializeJson(arr, "[[]]", 1));
}
SECTION("limit = 2") {
SHOULD_WORK(deserializeJson(arr, "[[]]", 2));
SHOULD_FAIL(deserializeJson(arr, "[[[]]]", 2));
}
}
SECTION("ParseArrayWithNestingLimit1") {
REQUIRE(tryParseArray("[[]]", 1) == JsonError::Ok);
REQUIRE(tryParseArray("[[[]]]", 1) == JsonError::TooDeep);
SECTION("deserializeJson(JsonObject&)") {
DynamicJsonObject obj;
SECTION("limit = 0") {
SHOULD_FAIL(deserializeJson(obj, "{}", 0));
}
SECTION("limit = 1") {
SHOULD_WORK(deserializeJson(obj, "{\"key\":42}", 1));
SHOULD_FAIL(deserializeJson(obj, "{\"key\":{\"key\":42}}", 1));
}
SECTION("limit = 2") {
SHOULD_WORK(deserializeJson(obj, "{\"key\":{\"key\":42}}", 2));
SHOULD_FAIL(deserializeJson(obj, "{\"key\":{\"key\":{\"key\":42}}}", 2));
}
}
SECTION("ParseArrayWithNestingLimit2") {
REQUIRE(tryParseArray("[[[]]]", 2) == JsonError::Ok);
REQUIRE(tryParseArray("[[[[]]]]", 2) == JsonError::TooDeep);
}
SECTION("deserializeJson(JsonVariant&)") {
DynamicJsonVariant var;
SECTION("ParseObjectWithNestingLimit0") {
REQUIRE(tryParseObject("{}", 0) == JsonError::Ok);
REQUIRE(tryParseObject("{\"key\":{}}", 0) == JsonError::TooDeep);
}
SECTION("limit = 0") {
SHOULD_WORK(deserializeJson(var, "\"toto\"", 0));
SHOULD_WORK(deserializeJson(var, "123", 0));
SHOULD_WORK(deserializeJson(var, "true", 0));
SHOULD_FAIL(deserializeJson(var, "[]", 0));
SHOULD_FAIL(deserializeJson(var, "{}", 0));
SHOULD_FAIL(deserializeJson(var, "[\"toto\"]", 0));
SHOULD_FAIL(deserializeJson(var, "{\"toto\":1}", 0));
}
SECTION("ParseObjectWithNestingLimit1") {
REQUIRE(tryParseObject("{\"key\":{}}", 1) == JsonError::Ok);
REQUIRE(tryParseObject("{\"key\":{\"key\":{}}}", 1) == JsonError::TooDeep);
}
SECTION("ParseObjectWithNestingLimit2") {
REQUIRE(tryParseObject("{\"key\":{\"key\":{}}}", 2) == JsonError::Ok);
REQUIRE(tryParseObject("{\"key\":{\"key\":{\"key\":{}}}}", 2) ==
JsonError::TooDeep);
SECTION("limit = 1") {
SHOULD_WORK(deserializeJson(var, "[\"toto\"]", 1));
SHOULD_WORK(deserializeJson(var, "{\"toto\":1}", 1));
SHOULD_FAIL(deserializeJson(var, "{\"toto\":{}}", 1));
SHOULD_FAIL(deserializeJson(var, "{\"toto\":[]}", 1));
SHOULD_FAIL(deserializeJson(var, "[[\"toto\"]]", 1));
SHOULD_FAIL(deserializeJson(var, "[{\"toto\":1}]", 1));
}
}
}