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 committed 2023-03-20 14:49:51 +01:00
1 parent db9258bcd7
commit 540901e219
164 files changed
+550 -666
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

extras/tests/MsgPackSerializer/destination_types.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("serialize MsgPack to various destination types") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject object = doc.to<JsonObject>();
object["hello"] = "world";
const char* expected_result = "\x81\xA5hello\xA5world";
extras/tests/MsgPackSerializer/measure.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("measureMsgPack()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject object = doc.to<JsonObject>();
object["hello"] = "world";
extras/tests/MsgPackSerializer/misc.cpp
+4 -4
View File
@@ -4,7 +4,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 = serializeMsgPack(doc, buffer, sizeof(buffer));
@@ -13,7 +13,7 @@ void check(T value, const std::string& expected) {
}
TEST_CASE("serializeMsgPack(MemberProxy)") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
deserializeJson(doc, "{\"hello\":42}");
JsonObject obj = doc.as<JsonObject>();
std::string result;
@@ -24,7 +24,7 @@ TEST_CASE("serializeMsgPack(MemberProxy)") {
}
TEST_CASE("serializeMsgPack(ElementProxy)") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
deserializeJson(doc, "[42]");
JsonArray arr = doc.as<JsonArray>();
std::string result;
@@ -35,7 +35,7 @@ TEST_CASE("serializeMsgPack(ElementProxy)") {
}
TEST_CASE("serializeMsgPack(JsonVariantSubscript)") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
deserializeJson(doc, "[42]");
JsonVariant var = doc.as<JsonVariant>();
std::string result;
extras/tests/MsgPackSerializer/serializeArray.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ static void check(const JsonArray array, const std::string& expected) {
}
TEST_CASE("serialize MsgPack array") {
DynamicJsonDocument doc(JSON_ARRAY_SIZE(65536));
JsonDocument doc(JSON_ARRAY_SIZE(65536));
JsonArray array = doc.to<JsonArray>();
SECTION("empty") {
extras/tests/MsgPackSerializer/serializeObject.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ static void check(const JsonObject object, const char (&expected_data)[N]) {
//}
TEST_CASE("serialize MsgPack object") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject object = doc.to<JsonObject>();
SECTION("empty") {
extras/tests/MsgPackSerializer/serializeVariant.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
template <typename T>
static void checkVariant(T value, const char* expected_data,
size_t expected_len) {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc.to<JsonVariant>();
variant.set(value);
std::string expected(expected_data, expected_data + expected_len);