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/MixedConfiguration/decode_unicode_0.cpp
View File

@@ -4,7 +4,7 @@
#include <catch.hpp>
TEST_CASE("ARDUINOJSON_DECODE_UNICODE == 0") {
DynamicJsonDocument doc(2048);
JsonDocument doc(2048);
DeserializationError err = deserializeJson(doc, "\"\\uD834\\uDD1E\"");
REQUIRE(err == DeserializationError::Ok);

2
extras/tests/MixedConfiguration/decode_unicode_1.cpp
View File

@@ -4,7 +4,7 @@
#include <catch.hpp>
TEST_CASE("ARDUINOJSON_DECODE_UNICODE == 1") {
DynamicJsonDocument doc(2048);
JsonDocument doc(2048);
DeserializationError err = deserializeJson(doc, "\"\\uD834\\uDD1E\"");
REQUIRE(err == DeserializationError::Ok);

2
extras/tests/MixedConfiguration/enable_comments_0.cpp
View File

@@ -8,7 +8,7 @@
#include <catch.hpp>
TEST_CASE("Comments should produce InvalidInput") {
DynamicJsonDocument doc(2048);
JsonDocument doc(2048);
const char* testCases[] = {
"/*COMMENT*/ [\"hello\"]",

6
extras/tests/MixedConfiguration/enable_comments_1.cpp
View File

@@ -8,7 +8,7 @@
#include <catch.hpp>
TEST_CASE("Comments in arrays") {
DynamicJsonDocument doc(2048);
JsonDocument doc(2048);
SECTION("Block comments") {
SECTION("Before opening bracket") {
@@ -161,7 +161,7 @@ TEST_CASE("Comments in arrays") {
}
TEST_CASE("Comments in objects") {
DynamicJsonDocument doc(2048);
JsonDocument doc(2048);
SECTION("Block comments") {
SECTION("Before opening brace") {
@@ -371,7 +371,7 @@ TEST_CASE("Comments in objects") {
}
TEST_CASE("Comments alone") {
DynamicJsonDocument doc(2048);
JsonDocument doc(2048);
SECTION("Just a trailing comment with no line break") {
DeserializationError err = deserializeJson(doc, "// comment");

4
extras/tests/MixedConfiguration/enable_infinity_0.cpp
View File

@@ -5,7 +5,7 @@
#include <limits>
static void assertParseFails(const char* json) {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
DeserializationError err = deserializeJson(doc, json);
REQUIRE(err == DeserializationError::InvalidInput);
@@ -20,7 +20,7 @@ static void assertJsonEquals(const JsonDocument& doc,
TEST_CASE("ARDUINOJSON_ENABLE_INFINITY == 0") {
SECTION("serializeJson()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
doc.add(std::numeric_limits<double>::infinity());
doc.add(-std::numeric_limits<double>::infinity());

2
extras/tests/MixedConfiguration/enable_infinity_1.cpp
View File

@@ -9,7 +9,7 @@ using ArduinoJson::detail::isinf;
} // namespace my
TEST_CASE("ARDUINOJSON_ENABLE_INFINITY == 1") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
SECTION("serializeJson()") {
doc.add(std::numeric_limits<double>::infinity());

2
extras/tests/MixedConfiguration/enable_nan_0.cpp
View File

@@ -5,7 +5,7 @@
#include <limits>
TEST_CASE("ARDUINOJSON_ENABLE_NAN == 0") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject root = doc.to<JsonObject>();
SECTION("serializeJson()") {

2
extras/tests/MixedConfiguration/enable_nan_1.cpp
View File

@@ -9,7 +9,7 @@ using ArduinoJson::detail::isnan;
} // namespace my
TEST_CASE("ARDUINOJSON_ENABLE_NAN == 1") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject root = doc.to<JsonObject>();
SECTION("serializeJson()") {

2
extras/tests/MixedConfiguration/enable_progmem_1.cpp
View File

@@ -10,7 +10,7 @@
#include <catch.hpp>
TEST_CASE("Flash strings") {
DynamicJsonDocument doc(2048);
JsonDocument doc(2048);
SECTION("deserializeJson()") {
DeserializationError err = deserializeJson(doc, F("{'hello':'world'}"));

2
extras/tests/MixedConfiguration/enable_string_deduplication_0.cpp
View File

@@ -12,7 +12,7 @@
#include <catch.hpp>
TEST_CASE("ARDUINOJSON_ENABLE_STRING_DEDUPLICATION = 0") {
DynamicJsonDocument doc(1024);
JsonDocument doc(1024);
SECTION("deserializeJson()") {
SECTION("Deduplicate values") {

2
extras/tests/MixedConfiguration/enable_string_deduplication_1.cpp
View File

@@ -12,7 +12,7 @@
#include <catch.hpp>
TEST_CASE("ARDUINOJSON_ENABLE_STRING_DEDUPLICATION = 1") {
DynamicJsonDocument doc(1024);
JsonDocument doc(1024);
SECTION("deserializeJson()") {
SECTION("Deduplicate values") {

2
extras/tests/MixedConfiguration/issue1707.cpp
View File

@@ -12,7 +12,7 @@
#include <catch.hpp>
TEST_CASE("Issue1707") {
DynamicJsonDocument doc(128);
JsonDocument doc(128);
DeserializationError err = deserializeJson(doc, F("{\"hello\":12}"));
REQUIRE(err == DeserializationError::Ok);

2
extras/tests/MixedConfiguration/use_double_0.cpp
View File

@@ -4,7 +4,7 @@
#include <catch.hpp>
TEST_CASE("ARDUINOJSON_USE_DOUBLE == 0") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject root = doc.to<JsonObject>();
root["pi"] = 3.14;

2
extras/tests/MixedConfiguration/use_double_1.cpp
View File

@@ -4,7 +4,7 @@
#include <catch.hpp>
TEST_CASE("ARDUINOJSON_USE_DOUBLE == 1") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject root = doc.to<JsonObject>();
root["pi"] = 3.14;

2
extras/tests/MixedConfiguration/use_long_long_0.cpp
View File

@@ -4,7 +4,7 @@
#include <catch.hpp>
TEST_CASE("ARDUINOJSON_USE_LONG_LONG == 0") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
doc["A"] = 42;
doc["B"] = 84;

2
extras/tests/MixedConfiguration/use_long_long_1.cpp
View File

@@ -4,7 +4,7 @@
#include <catch.hpp>
TEST_CASE("ARDUINOJSON_USE_LONG_LONG == 1") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject root = doc.to<JsonObject>();
root["A"] = 123456789123456789;