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

Merge DynamicJsonDocument with JsonDocument

Browse Source
This commit is contained in:
Benoit Blanchon
2023-03-20 10:49:01 +01:00
parent db9258bcd7
commit 540901e219
164 changed files with 550 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/tests/JsonSerializer/CustomWriter.cpp
View File

@ -30,7 +30,7 @@ class CustomWriter {
};
TEST_CASE("CustomWriter") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonArray array = doc.to<JsonArray>();
array.add(4);
array.add(2);

2
extras/tests/JsonSerializer/JsonArray.cpp
View File

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

2
extras/tests/JsonSerializer/JsonArrayPretty.cpp
View File

@ -15,7 +15,7 @@ static void checkArray(JsonArray array, std::string expected) {
}
TEST_CASE("serializeJsonPretty(JsonArray)") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonArray array = doc.to<JsonArray>();
SECTION("Empty") {

10
extras/tests/JsonSerializer/JsonObject.cpp
View File

@ -20,7 +20,7 @@ static void checkObject(const JsonObject obj, const std::string& expected) {
}
TEST_CASE("serializeJson(JsonObject)") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
SECTION("EmptyObject") {
@ -96,8 +96,8 @@ TEST_CASE("serializeJson(JsonObject)") {
}
SECTION("ThreeNestedArrays") {
DynamicJsonDocument b(4096);
DynamicJsonDocument c(4096);
JsonDocument b(4096);
JsonDocument c(4096);
obj.createNestedArray("a");
obj["b"] = b.to<JsonArray>();
@ -107,8 +107,8 @@ TEST_CASE("serializeJson(JsonObject)") {
}
SECTION("ThreeNestedObjects") {
DynamicJsonDocument b(4096);
DynamicJsonDocument c(4096);
JsonDocument b(4096);
JsonDocument c(4096);
obj.createNestedObject("a");
obj["b"] = b.to<JsonObject>();

2
extras/tests/JsonSerializer/JsonObjectPretty.cpp
View File

@ -19,7 +19,7 @@ static void checkObjectPretty(const JsonObject obj,
}
TEST_CASE("serializeJsonPretty(JsonObject)") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
SECTION("EmptyObject") {

2
extras/tests/JsonSerializer/JsonVariant.cpp
View File

@ -8,7 +8,7 @@
template <typename T>
void check(T value, const std::string& expected) {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
doc.to<JsonVariant>().set(value);
char buffer[256] = "";
size_t returnValue = serializeJson(doc, buffer, sizeof(buffer));

6
extras/tests/JsonSerializer/misc.cpp
View File

@ -3,7 +3,7 @@
#include <limits>
TEST_CASE("serializeJson(MemberProxy)") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
deserializeJson(doc, "{\"hello\":42}");
JsonObject obj = doc.as<JsonObject>();
std::string result;
@ -14,7 +14,7 @@ TEST_CASE("serializeJson(MemberProxy)") {
}
TEST_CASE("serializeJson(ElementProxy)") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
deserializeJson(doc, "[42]");
JsonArray arr = doc.as<JsonArray>();
std::string result;
@ -25,7 +25,7 @@ TEST_CASE("serializeJson(ElementProxy)") {
}
TEST_CASE("serializeJson(JsonVariantSubscript)") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
deserializeJson(doc, "[42]");
JsonVariant var = doc.as<JsonVariant>();
std::string result;

2
extras/tests/JsonSerializer/std_stream.cpp
View File

@ -7,7 +7,7 @@
#include <sstream>
TEST_CASE("operator<<(std::ostream)") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
std::ostringstream os;
SECTION("JsonVariant containing false") {

6
extras/tests/JsonSerializer/std_string.cpp
View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("serialize JsonArray to std::string") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonArray array = doc.to<JsonArray>();
array.add(4);
array.add(2);
@ -27,7 +27,7 @@ TEST_CASE("serialize JsonArray to std::string") {
}
TEST_CASE("serialize JsonObject to std::string") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
obj["key"] = "value";
@ -47,7 +47,7 @@ TEST_CASE("serialize JsonObject to std::string") {
}
TEST_CASE("serialize an std::string containing a NUL") {
DynamicJsonDocument doc(256);
JsonDocument doc(256);
doc.set(std::string("hello\0world", 11));
CHECK(doc.memoryUsage() == 12);