Update to ArduinoJson 7.0.4

This commit is contained in:
iranl
2024-04-19 14:44:01 +02:00
parent 1378732081
commit 81be0a689a
444 changed files with 10842 additions and 9422 deletions

View File

@@ -1,5 +1,5 @@
// ArduinoJson - https://arduinojson.org
// Copyright © 2014-2023, Benoit BLANCHON
// Copyright © 2014-2024, Benoit BLANCHON
// MIT License
#include <ArduinoJson.h>
@@ -13,7 +13,7 @@ TEST_CASE("unsigned char[]") {
SECTION("deserializeJson()") {
unsigned char input[] = "{\"a\":42}";
StaticJsonDocument<JSON_OBJECT_SIZE(1)> doc;
JsonDocument doc;
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";
StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
JsonDocument doc;
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];
StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
JsonDocument doc;
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];
StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
JsonDocument doc;
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];
StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
JsonDocument doc;
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];
StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
JsonDocument doc;
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];
StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
JsonDocument doc;
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];
StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
JsonDocument doc;
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;
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;
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;
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;
deserializeJson(doc, "{\"hello\":\"world\"}");
JsonObject obj = doc.as<JsonObject>();
REQUIRE(true == obj.containsKey(key));
@@ -186,36 +186,20 @@ TEST_CASE("unsigned char[]") {
SECTION("remove()") {
unsigned char key[] = "hello";
DynamicJsonDocument doc(4096);
JsonDocument doc;
deserializeJson(doc, "{\"hello\":\"world\"}");
JsonObject obj = doc.as<JsonObject>();
obj.remove(key);
REQUIRE(0 == obj.size());
}
SECTION("createNestedArray()") {
unsigned char key[] = "hello";
DynamicJsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
obj.createNestedArray(key);
}
SECTION("createNestedObject()") {
unsigned char key[] = "hello";
DynamicJsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
obj.createNestedObject(key);
}
}
SECTION("MemberProxy") {
SECTION("operator=") { // issue #416
unsigned char value[] = "world";
DynamicJsonDocument doc(4096);
JsonDocument doc;
JsonObject obj = doc.to<JsonObject>();
obj["hello"] = value;
@@ -225,7 +209,7 @@ TEST_CASE("unsigned char[]") {
SECTION("set()") {
unsigned char value[] = "world";
DynamicJsonDocument doc(4096);
JsonDocument doc;
JsonObject obj = doc.to<JsonObject>();
obj["hello"].set(value);
@@ -237,7 +221,7 @@ TEST_CASE("unsigned char[]") {
SECTION("add()") {
unsigned char value[] = "world";
DynamicJsonDocument doc(4096);
JsonDocument doc;
JsonArray arr = doc.to<JsonArray>();
arr.add(value);
@@ -249,7 +233,7 @@ TEST_CASE("unsigned char[]") {
SECTION("set()") {
unsigned char value[] = "world";
DynamicJsonDocument doc(4096);
JsonDocument doc;
JsonArray arr = doc.to<JsonArray>();
arr.add("hello");
arr[0].set(value);
@@ -260,7 +244,7 @@ TEST_CASE("unsigned char[]") {
SECTION("operator=") {
unsigned char value[] = "world";
DynamicJsonDocument doc(4096);
JsonDocument doc;
JsonArray arr = doc.to<JsonArray>();
arr.add("hello");
arr[0] = value;