bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-29 18:27:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove JSON_ARRAY_SIZE(), JSON_OBJECT_SIZE(), and JSON_STRING_SIZE()

Browse Source
This commit is contained in:
Benoit Blanchon
2023-03-29 19:18:06 +02:00
parent 0328f66340
commit 3f43c2b816
36 changed files with 395 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,8 @@
#define ARDUINOJSON_ENABLE_ARDUINO_STREAM 1
#include <ArduinoJson.h>
using ArduinoJson::detail::sizeofArray;
struct PrintOneCharacterAtATime {
static size_t printStringTo(const std::string& s, Print& p) {
size_t result = 0;
@ -139,6 +141,6 @@ TEST_CASE("Printable") {
REQUIRE(doc.size() == 2);
CHECK(doc[0] == "Hello World!");
CHECK(doc[1] == "Hello World!");
CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 13);
CHECK(doc.memoryUsage() == sizeofArray(2) + 13);
}
}

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

@ -9,11 +9,13 @@
# define CONFLICTS_WITH_BUILTIN_OPERATOR
#endif
using ArduinoJson::detail::sizeofObject;
TEST_CASE("unsigned char[]") {
SECTION("deserializeJson()") {
unsigned char input[] = "{\"a\":42}";
JsonDocument doc(JSON_OBJECT_SIZE(1));
JsonDocument doc(sizeofObject(1));
DeserializationError err = deserializeJson(doc, input);
REQUIRE(err == DeserializationError::Ok);
@ -22,7 +24,7 @@ TEST_CASE("unsigned char[]") {
SECTION("deserializeMsgPack()") {
unsigned char input[] = "\xDE\x00\x01\xA5Hello\xA5world";
JsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(sizeofObject(2));
DeserializationError err = deserializeMsgPack(doc, input);
REQUIRE(err == DeserializationError::Ok);
@ -30,7 +32,7 @@ TEST_CASE("unsigned char[]") {
SECTION("serializeMsgPack(unsigned char[])") {
unsigned char buffer[32];
JsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(sizeofObject(2));
doc["hello"] = "world";
size_t n = serializeMsgPack(doc, buffer);
@ -41,7 +43,7 @@ TEST_CASE("unsigned char[]") {
SECTION("serializeMsgPack(unsigned char*)") {
unsigned char buffer[32];
JsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(sizeofObject(2));
doc["hello"] = "world";
size_t n = serializeMsgPack(doc, buffer, sizeof(buffer));
@ -52,7 +54,7 @@ TEST_CASE("unsigned char[]") {
SECTION("serializeJson(unsigned char[])") {
unsigned char buffer[32];
JsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(sizeofObject(2));
doc["hello"] = "world";
size_t n = serializeJson(doc, buffer);
@ -63,7 +65,7 @@ TEST_CASE("unsigned char[]") {
SECTION("serializeJson(unsigned char*)") {
unsigned char buffer[32];
JsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(sizeofObject(2));
doc["hello"] = "world";
size_t n = serializeJson(doc, buffer, sizeof(buffer));
@ -74,7 +76,7 @@ TEST_CASE("unsigned char[]") {
SECTION("serializeJsonPretty(unsigned char[])") {
unsigned char buffer[32];
JsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(sizeofObject(2));
doc["hello"] = "world";
size_t n = serializeJsonPretty(doc, buffer);
@ -84,7 +86,7 @@ TEST_CASE("unsigned char[]") {
SECTION("serializeJsonPretty(unsigned char*)") {
unsigned char buffer[32];
JsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(sizeofObject(2));
doc["hello"] = "world";
size_t n = serializeJsonPretty(doc, buffer, sizeof(buffer));