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/Misc/StringWriter.cpp
View File

@ -136,7 +136,7 @@ TEST_CASE("Writer<custom_string>") {
}
TEST_CASE("serializeJson(doc, String)") {
DynamicJsonDocument doc(1024);
JsonDocument doc(1024);
doc["hello"] = "world";
::String output;

2
extras/tests/Misc/TypeTraits.cpp
View File

@ -193,7 +193,7 @@ TEST_CASE("Polyfills/type_traits") {
CHECK(is_convertible<MemberProxy<JsonObject, const char*>,
JsonVariantConst>::value == true);
CHECK(is_convertible<JsonObjectConst, JsonVariantConst>::value == true);
CHECK(is_convertible<DynamicJsonDocument, JsonVariantConst>::value == true);
CHECK(is_convertible<JsonDocument, JsonVariantConst>::value == true);
}
SECTION("is_class") {

8
extras/tests/Misc/printable.cpp
View File

@ -48,7 +48,7 @@ struct PrintableString : public Printable {
TEST_CASE("Printable") {
SECTION("Doesn't overflow") {
DynamicJsonDocument doc(8);
JsonDocument doc(8);
const char* value = "example"; // == 7 chars
doc.set(666); // to make sure we override the value
@ -75,7 +75,7 @@ TEST_CASE("Printable") {
}
SECTION("Overflows early") {
DynamicJsonDocument doc(8);
JsonDocument doc(8);
const char* value = "hello world"; // > 8 chars
doc.set(666); // to make sure we override the value
@ -100,7 +100,7 @@ TEST_CASE("Printable") {
}
SECTION("Overflows adding terminator") {
DynamicJsonDocument doc(8);
JsonDocument doc(8);
const char* value = "overflow"; // == 8 chars
doc.set(666); // to make sure we override the value
@ -133,7 +133,7 @@ TEST_CASE("Printable") {
}
SECTION("String deduplication") {
DynamicJsonDocument doc(128);
JsonDocument doc(128);
doc.add(PrintableString<PrintOneCharacterAtATime>("Hello World!"));
doc.add(PrintableString<PrintAllAtOnce>("Hello World!"));
REQUIRE(doc.size() == 2);

40
extras/tests/Misc/unsigned_char.cpp
View File

@ -13,7 +13,7 @@ TEST_CASE("unsigned char[]") {
SECTION("deserializeJson()") {
unsigned char input[] = "{\"a\":42}";
DynamicJsonDocument doc(JSON_OBJECT_SIZE(1));
JsonDocument doc(JSON_OBJECT_SIZE(1));
DeserializationError err = deserializeJson(doc, input);
REQUIRE(err == DeserializationError::Ok);
@ -22,7 +22,7 @@ TEST_CASE("unsigned char[]") {
SECTION("deserializeMsgPack()") {
unsigned char input[] = "\xDE\x00\x01\xA5Hello\xA5world";
DynamicJsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(JSON_OBJECT_SIZE(2));
DeserializationError err = deserializeMsgPack(doc, input);
REQUIRE(err == DeserializationError::Ok);
@ -30,7 +30,7 @@ TEST_CASE("unsigned char[]") {
SECTION("serializeMsgPack(unsigned char[])") {
unsigned char buffer[32];
DynamicJsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(JSON_OBJECT_SIZE(2));
doc["hello"] = "world";
size_t n = serializeMsgPack(doc, buffer);
@ -41,7 +41,7 @@ TEST_CASE("unsigned char[]") {
SECTION("serializeMsgPack(unsigned char*)") {
unsigned char buffer[32];
DynamicJsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(JSON_OBJECT_SIZE(2));
doc["hello"] = "world";
size_t n = serializeMsgPack(doc, buffer, sizeof(buffer));
@ -52,7 +52,7 @@ TEST_CASE("unsigned char[]") {
SECTION("serializeJson(unsigned char[])") {
unsigned char buffer[32];
DynamicJsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(JSON_OBJECT_SIZE(2));
doc["hello"] = "world";
size_t n = serializeJson(doc, buffer);
@ -63,7 +63,7 @@ TEST_CASE("unsigned char[]") {
SECTION("serializeJson(unsigned char*)") {
unsigned char buffer[32];
DynamicJsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(JSON_OBJECT_SIZE(2));
doc["hello"] = "world";
size_t n = serializeJson(doc, buffer, sizeof(buffer));
@ -74,7 +74,7 @@ TEST_CASE("unsigned char[]") {
SECTION("serializeJsonPretty(unsigned char[])") {
unsigned char buffer[32];
DynamicJsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(JSON_OBJECT_SIZE(2));
doc["hello"] = "world";
size_t n = serializeJsonPretty(doc, buffer);
@ -84,7 +84,7 @@ TEST_CASE("unsigned char[]") {
SECTION("serializeJsonPretty(unsigned char*)") {
unsigned char buffer[32];
DynamicJsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(JSON_OBJECT_SIZE(2));
doc["hello"] = "world";
size_t n = serializeJsonPretty(doc, buffer, sizeof(buffer));
@ -93,7 +93,7 @@ TEST_CASE("unsigned char[]") {
}
SECTION("JsonVariant") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
SECTION("set") {
unsigned char value[] = "42";
@ -156,7 +156,7 @@ TEST_CASE("unsigned char[]") {
SECTION("operator[]") {
unsigned char key[] = "hello";
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
obj[key] = "world";
@ -166,7 +166,7 @@ TEST_CASE("unsigned char[]") {
SECTION("JsonObject::operator[] const") {
unsigned char key[] = "hello";
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
deserializeJson(doc, "{\"hello\":\"world\"}");
JsonObject obj = doc.as<JsonObject>();
@ -177,7 +177,7 @@ TEST_CASE("unsigned char[]") {
SECTION("containsKey()") {
unsigned char key[] = "hello";
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
deserializeJson(doc, "{\"hello\":\"world\"}");
JsonObject obj = doc.as<JsonObject>();
REQUIRE(true == obj.containsKey(key));
@ -186,7 +186,7 @@ TEST_CASE("unsigned char[]") {
SECTION("remove()") {
unsigned char key[] = "hello";
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
deserializeJson(doc, "{\"hello\":\"world\"}");
JsonObject obj = doc.as<JsonObject>();
obj.remove(key);
@ -197,7 +197,7 @@ TEST_CASE("unsigned char[]") {
SECTION("createNestedArray()") {
unsigned char key[] = "hello";
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
obj.createNestedArray(key);
}
@ -205,7 +205,7 @@ TEST_CASE("unsigned char[]") {
SECTION("createNestedObject()") {
unsigned char key[] = "hello";
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
obj.createNestedObject(key);
}
@ -215,7 +215,7 @@ TEST_CASE("unsigned char[]") {
SECTION("operator=") { // issue #416
unsigned char value[] = "world";
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
obj["hello"] = value;
@ -225,7 +225,7 @@ TEST_CASE("unsigned char[]") {
SECTION("set()") {
unsigned char value[] = "world";
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
obj["hello"].set(value);
@ -237,7 +237,7 @@ TEST_CASE("unsigned char[]") {
SECTION("add()") {
unsigned char value[] = "world";
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonArray arr = doc.to<JsonArray>();
arr.add(value);
@ -249,7 +249,7 @@ TEST_CASE("unsigned char[]") {
SECTION("set()") {
unsigned char value[] = "world";
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonArray arr = doc.to<JsonArray>();
arr.add("hello");
arr[0].set(value);
@ -260,7 +260,7 @@ TEST_CASE("unsigned char[]") {
SECTION("operator=") {
unsigned char value[] = "world";
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonArray arr = doc.to<JsonArray>();
arr.add("hello");
arr[0] = value;