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

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/JsonObject/clear.cpp
View File

@ -14,7 +14,7 @@ TEST_CASE("JsonObject::clear()") {
}
SECTION("Removes all elements") {
DynamicJsonDocument doc(64);
JsonDocument doc(64);
JsonObject obj = doc.to<JsonObject>();
obj["hello"] = 1;
obj["world"] = 2;

12
extras/tests/JsonObject/compare.cpp
View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("Compare JsonObject with JsonObject") {
DynamicJsonDocument doc(512);
JsonDocument doc(512);
SECTION("Compare with unbound") {
JsonObject object = doc.to<JsonObject>();
@ -82,7 +82,7 @@ TEST_CASE("Compare JsonObject with JsonObject") {
}
TEST_CASE("Compare JsonObject with JsonVariant") {
DynamicJsonDocument doc(512);
JsonDocument doc(512);
SECTION("Compare with self") {
JsonObject object = doc.to<JsonObject>();
@ -153,7 +153,7 @@ TEST_CASE("Compare JsonObject with JsonVariant") {
}
TEST_CASE("Compare JsonObject with JsonVariantConst") {
DynamicJsonDocument doc(512);
JsonDocument doc(512);
SECTION("Compare with unbound") {
JsonObject object = doc.to<JsonObject>();
@ -247,7 +247,7 @@ TEST_CASE("Compare JsonObject with JsonVariantConst") {
}
TEST_CASE("Compare JsonObject with JsonObjectConst") {
DynamicJsonDocument doc(512);
JsonDocument doc(512);
SECTION("Compare with unbound") {
JsonObject object = doc.to<JsonObject>();
@ -347,7 +347,7 @@ TEST_CASE("Compare JsonObject with JsonObjectConst") {
}
TEST_CASE("Compare JsonObjectConst with JsonObjectConst") {
DynamicJsonDocument doc(512);
JsonDocument doc(512);
SECTION("Compare with unbound") {
JsonObject object = doc.to<JsonObject>();
@ -430,7 +430,7 @@ TEST_CASE("Compare JsonObjectConst with JsonObjectConst") {
}
TEST_CASE("Compare JsonObjectConst with JsonVariant") {
DynamicJsonDocument doc(512);
JsonDocument doc(512);
SECTION("Compare with self") {
JsonObject object = doc.to<JsonObject>();

2
extras/tests/JsonObject/containsKey.cpp
View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonObject::containsKey()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
obj["hello"] = 42;

8
extras/tests/JsonObject/copy.cpp
View File

@ -6,8 +6,8 @@
#include <catch.hpp>
TEST_CASE("JsonObject::set()") {
DynamicJsonDocument doc1(4096);
DynamicJsonDocument doc2(4096);
JsonDocument doc1(4096);
JsonDocument doc2(4096);
JsonObject obj1 = doc1.to<JsonObject>();
JsonObject obj2 = doc2.to<JsonObject>();
@ -72,7 +72,7 @@ TEST_CASE("JsonObject::set()") {
}
SECTION("destination too small to store the key") {
DynamicJsonDocument doc3(JSON_OBJECT_SIZE(1));
JsonDocument doc3(JSON_OBJECT_SIZE(1));
JsonObject obj3 = doc3.to<JsonObject>();
obj1[std::string("hello")] = "world";
@ -84,7 +84,7 @@ TEST_CASE("JsonObject::set()") {
}
SECTION("destination too small to store the value") {
DynamicJsonDocument doc3(JSON_OBJECT_SIZE(1));
JsonDocument doc3(JSON_OBJECT_SIZE(1));
JsonObject obj3 = doc3.to<JsonObject>();
obj1["hello"] = std::string("world");

2
extras/tests/JsonObject/createNestedArray.cpp
View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonObject::createNestedArray()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
SECTION("key is a const char*") {

2
extras/tests/JsonObject/createNestedObject.cpp
View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonObject::createNestedObject()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
SECTION("key is a const char*") {

4
extras/tests/JsonObject/equals.cpp
View File

@ -6,11 +6,11 @@
#include <catch.hpp>
TEST_CASE("JsonObject::operator==()") {
DynamicJsonDocument doc1(4096);
JsonDocument doc1(4096);
JsonObject obj1 = doc1.to<JsonObject>();
JsonObjectConst obj1c = obj1;
DynamicJsonDocument doc2(4096);
JsonDocument doc2(4096);
JsonObject obj2 = doc2.to<JsonObject>();
JsonObjectConst obj2c = obj2;

8
extras/tests/JsonObject/isNull.cpp
View File

@ -12,7 +12,7 @@ TEST_CASE("JsonObject::isNull()") {
}
SECTION("returns false") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
REQUIRE(obj.isNull() == false);
}
@ -25,7 +25,7 @@ TEST_CASE("JsonObjectConst::isNull()") {
}
SECTION("returns false") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObjectConst obj = doc.to<JsonObject>();
REQUIRE(obj.isNull() == false);
}
@ -38,7 +38,7 @@ TEST_CASE("JsonObject::operator bool()") {
}
SECTION("returns true") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
REQUIRE(static_cast<bool>(obj) == true);
}
@ -51,7 +51,7 @@ TEST_CASE("JsonObjectConst::operator bool()") {
}
SECTION("returns true") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObjectConst obj = doc.to<JsonObject>();
REQUIRE(static_cast<bool>(obj) == true);
}

4
extras/tests/JsonObject/iterator.cpp
View File

@ -8,7 +8,7 @@
using namespace Catch::Matchers;
TEST_CASE("JsonObject::begin()/end()") {
DynamicJsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(JSON_OBJECT_SIZE(2));
JsonObject obj = doc.to<JsonObject>();
obj["ab"] = 12;
obj["cd"] = 34;
@ -38,7 +38,7 @@ TEST_CASE("JsonObject::begin()/end()") {
}
TEST_CASE("JsonObjectConst::begin()/end()") {
DynamicJsonDocument doc(JSON_OBJECT_SIZE(2));
JsonDocument doc(JSON_OBJECT_SIZE(2));
JsonObject obj = doc.to<JsonObject>();
obj["ab"] = 12;
obj["cd"] = 34;

2
extras/tests/JsonObject/memoryUsage.cpp
View File

@ -7,7 +7,7 @@
#include <string>
TEST_CASE("JsonObject::memoryUsage()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
SECTION("return 0 if uninitialized") {

2
extras/tests/JsonObject/nesting.cpp
View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonObject::nesting()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
SECTION("return 0 if uninitialized") {

2
extras/tests/JsonObject/remove.cpp
View File

@ -7,7 +7,7 @@
#include <string>
TEST_CASE("JsonObject::remove()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
obj["a"] = 0;
obj["b"] = 1;

2
extras/tests/JsonObject/size.cpp
View File

@ -7,7 +7,7 @@
#include <string>
TEST_CASE("JsonObject::size()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
SECTION("initial size is zero") {

2
extras/tests/JsonObject/std_string.cpp
View File

@ -12,7 +12,7 @@ static void eraseString(std::string& str) {
}
TEST_CASE("std::string") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
SECTION("operator[]") {
char json[] = "{\"key\":\"value\"}";

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

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonObject::operator[]") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
SECTION("int") {
@ -51,7 +51,7 @@ TEST_CASE("JsonObject::operator[]") {
}
SECTION("array") {
DynamicJsonDocument doc2(4096);
JsonDocument doc2(4096);
JsonArray arr = doc2.to<JsonArray>();
obj["hello"] = arr;
@ -62,7 +62,7 @@ TEST_CASE("JsonObject::operator[]") {
}
SECTION("object") {
DynamicJsonDocument doc2(4096);
JsonDocument doc2(4096);
JsonObject obj2 = doc2.to<JsonObject>();
obj["hello"] = obj2;
@ -73,7 +73,7 @@ TEST_CASE("JsonObject::operator[]") {
}
SECTION("array subscript") {
DynamicJsonDocument doc2(4096);
JsonDocument doc2(4096);
JsonArray arr = doc2.to<JsonArray>();
arr.add(42);
@ -83,7 +83,7 @@ TEST_CASE("JsonObject::operator[]") {
}
SECTION("object subscript") {
DynamicJsonDocument doc2(4096);
JsonDocument doc2(4096);
JsonObject obj2 = doc2.to<JsonObject>();
obj2["x"] = 42;