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

Added StaticJsonDocument and DynamicJsonDocument.

Browse Source 
Removed StaticJsonArray and DynamicJsonArray.
Removed StaticJsonObject and DynamicJsonObject.
Removed StaticJsonVariant and DynamicJsonVariant.
This commit is contained in:
Benoit Blanchon
2018-04-17 21:27:45 +02:00
parent a13b9e8bdc
commit 1feb92679d
100 changed files with 1696 additions and 1844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/JsonSerializer/JsonArray.cpp
View File

@ -15,7 +15,8 @@ static void check(JsonArray &array, std::string expected) {
}
TEST_CASE("serializeJson(JsonArray)") {
StaticJsonArray<JSON_ARRAY_SIZE(2)> array;
StaticJsonDocument<JSON_ARRAY_SIZE(2)> doc;
JsonArray &array = doc.to<JsonArray>();
SECTION("Empty") {
check(array, "[]");

3
test/JsonSerializer/JsonArrayPretty.cpp
View File

@ -15,7 +15,8 @@ static void check(JsonArray& array, std::string expected) {
}
TEST_CASE("serializeJsonPretty(JsonArray)") {
DynamicJsonArray array;
DynamicJsonDocument doc;
JsonArray& array = doc.to<JsonArray>();
SECTION("Empty") {
check(array, "[]");

18
test/JsonSerializer/JsonObject.cpp
View File

@ -17,7 +17,8 @@ void check(const JsonObject &obj, const std::string &expected) {
}
TEST_CASE("serializeJson(JsonObject)") {
DynamicJsonObject obj;
DynamicJsonDocument doc;
JsonObject &obj = doc.to<JsonObject>();
SECTION("EmptyObject") {
check(obj, "{}");
@ -92,22 +93,23 @@ TEST_CASE("serializeJson(JsonObject)") {
}
SECTION("ThreeNestedArrays") {
DynamicJsonArray b, c;
DynamicJsonDocument b;
DynamicJsonDocument c;
obj.createNestedArray("a");
obj["b"] = b;
obj.set("c", c);
obj["b"] = b.to<JsonArray>();
obj.set("c", c.to<JsonArray>());
check(obj, "{\"a\":[],\"b\":[],\"c\":[]}");
}
SECTION("ThreeNestedObjects") {
DynamicJsonObject b;
DynamicJsonObject c;
DynamicJsonDocument b;
DynamicJsonDocument c;
obj.createNestedObject("a");
obj["b"] = b;
obj.set("c", c);
obj["b"] = b.to<JsonObject>();
obj.set("c", c.to<JsonObject>());
check(obj, "{\"a\":{},\"b\":{},\"c\":{}}");
}

3
test/JsonSerializer/JsonObjectPretty.cpp
View File

@ -18,7 +18,8 @@ void check(const JsonObject &obj, const std::string expected) {
}
TEST_CASE("serializeJsonPretty(JsonObject)") {
DynamicJsonObject obj;
DynamicJsonDocument doc;
JsonObject &obj = doc.to<JsonObject>();
SECTION("EmptyObject") {
check(obj, "{}");