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/JsonVariant/add.cpp
View File

@ -7,7 +7,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::add()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant var = doc.to<JsonVariant>();
SECTION("add integer to new variant") {

2
extras/tests/JsonVariant/as.cpp
View File

@ -15,7 +15,7 @@ enum MY_ENUM { ONE = 1, TWO = 2 };
TEST_CASE("JsonVariant::as()") {
static const char* null = 0;
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc.to<JsonVariant>();
SECTION("not set") {

2
extras/tests/JsonVariant/clear.cpp
View File

@ -7,7 +7,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::clear()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant var = doc.to<JsonVariant>();
SECTION("size goes back to zero") {

4
extras/tests/JsonVariant/compare.cpp
View File

@ -9,7 +9,7 @@
// Here, we're just filling the holes
TEST_CASE("Compare JsonVariant with value") {
DynamicJsonDocument doc(256);
JsonDocument doc(256);
JsonVariant a = doc.add();
SECTION("null vs (char*)0") {
@ -37,7 +37,7 @@ TEST_CASE("Compare JsonVariant with value") {
}
TEST_CASE("Compare JsonVariant with JsonVariant") {
DynamicJsonDocument doc(256);
JsonDocument doc(256);
JsonVariant a = doc.add();
JsonVariant b = doc.add();

4
extras/tests/JsonVariant/containsKey.cpp
View File

@ -7,7 +7,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::containsKey()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant var = doc.to<JsonVariant>();
SECTION("containsKey(const char*)") {
@ -26,7 +26,7 @@ TEST_CASE("JsonVariant::containsKey()") {
}
TEST_CASE("JsonVariantConst::containsKey()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
doc["hello"] = "world";
JsonVariantConst cvar = doc.as<JsonVariant>();

4
extras/tests/JsonVariant/converters.cpp
View File

@ -32,7 +32,7 @@ bool canConvertFromJson(JsonVariantConst src, const Date&) {
} // namespace
TEST_CASE("Custom converter with overloading") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
SECTION("convert JSON to Date") {
doc["date"]["day"] = 2;
@ -107,7 +107,7 @@ struct Converter<Complex> {
} // namespace ArduinoJson
TEST_CASE("Custom converter with specialization") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
SECTION("convert JSON to Complex") {
doc["value"]["real"] = 2;

4
extras/tests/JsonVariant/copy.cpp
View File

@ -6,8 +6,8 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::set(JsonVariant)") {
DynamicJsonDocument doc1(4096);
DynamicJsonDocument doc2(4096);
JsonDocument doc1(4096);
JsonDocument doc2(4096);
JsonVariant var1 = doc1.to<JsonVariant>();
JsonVariant var2 = doc2.to<JsonVariant>();

8
extras/tests/JsonVariant/createNested.cpp
View File

@ -7,7 +7,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::createNestedObject()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc.to<JsonVariant>();
SECTION("promotes to array") {
@ -21,7 +21,7 @@ TEST_CASE("JsonVariant::createNestedObject()") {
}
TEST_CASE("JsonVariant::createNestedArray()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc.to<JsonVariant>();
SECTION("promotes to array") {
@ -33,7 +33,7 @@ TEST_CASE("JsonVariant::createNestedArray()") {
}
TEST_CASE("JsonVariant::createNestedObject(key)") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc.to<JsonVariant>();
SECTION("promotes to object") {
@ -46,7 +46,7 @@ TEST_CASE("JsonVariant::createNestedObject(key)") {
}
TEST_CASE("JsonVariant::createNestedArray(key)") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc.to<JsonVariant>();
SECTION("promotes to object") {

4
extras/tests/JsonVariant/is.cpp
View File

@ -8,7 +8,7 @@
enum MYENUM2 { ONE = 1, TWO = 2 };
TEST_CASE("JsonVariant::is<T>()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc.to<JsonVariant>();
SECTION("unbound") {
@ -164,7 +164,7 @@ TEST_CASE("JsonVariant::is<T>()") {
}
TEST_CASE("JsonVariantConst::is<T>()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc.to<JsonVariant>();
JsonVariantConst cvariant = variant;

10
extras/tests/JsonVariant/isnull.cpp
View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::isNull()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc.to<JsonVariant>();
SECTION("returns true when Undefined") {
@ -20,7 +20,7 @@ TEST_CASE("JsonVariant::isNull()") {
}
SECTION("returns false when EmptyArray") {
DynamicJsonDocument doc2(4096);
JsonDocument doc2(4096);
JsonArray array = doc2.to<JsonArray>();
variant.set(array);
@ -28,7 +28,7 @@ TEST_CASE("JsonVariant::isNull()") {
}
SECTION("returns false when EmptyObject") {
DynamicJsonDocument doc2(4096);
JsonDocument doc2(4096);
JsonObject obj = doc2.to<JsonObject>();
variant.set(obj);
@ -71,13 +71,13 @@ TEST_CASE("JsonVariant::isNull()") {
}
SECTION("returns true for a shallow null copy") {
DynamicJsonDocument doc2(128);
JsonDocument doc2(128);
variant.shallowCopy(doc2);
CHECK(variant.isNull() == true);
}
SECTION("returns false for a shallow array copy") {
DynamicJsonDocument doc2(128);
JsonDocument doc2(128);
doc2[0] = 42;
variant.shallowCopy(doc2);
CHECK(variant.isNull() == false);

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

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

4
extras/tests/JsonVariant/misc.cpp
View File

@ -18,7 +18,7 @@ TEST_CASE("JsonVariant from JsonArray") {
}
SECTION("JsonArray is not null") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonArray arr = doc.to<JsonArray>();
arr.add(12);
arr.add(34);
@ -40,7 +40,7 @@ TEST_CASE("JsonVariant from JsonObject") {
}
SECTION("JsonObject is not null") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject obj = doc.to<JsonObject>();
obj["a"] = 12;
obj["b"] = 34;

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

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

2
extras/tests/JsonVariant/nullptr.cpp
View File

@ -3,7 +3,7 @@
#include <catch.hpp>
TEST_CASE("nullptr") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc.to<JsonVariant>();
SECTION("JsonVariant == nullptr") {

2
extras/tests/JsonVariant/or.cpp
View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::operator|()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc["value"].to<JsonVariant>();
SECTION("null") {

4
extras/tests/JsonVariant/overflow.cpp
View File

@ -7,7 +7,7 @@
template <typename TOut, typename TIn>
void shouldBeOk(TIn value) {
DynamicJsonDocument doc(1);
JsonDocument doc(1);
JsonVariant var = doc.to<JsonVariant>();
var.set(value);
REQUIRE(var.as<TOut>() == TOut(value));
@ -15,7 +15,7 @@ void shouldBeOk(TIn value) {
template <typename TOut, typename TIn>
void shouldOverflow(TIn value) {
DynamicJsonDocument doc(1);
JsonDocument doc(1);
JsonVariant var = doc.to<JsonVariant>();
var.set(value);
REQUIRE(var.as<TOut>() == 0);

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

@ -7,7 +7,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::remove()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant var = doc.to<JsonVariant>();
SECTION("remove(int)") {

10
extras/tests/JsonVariant/set.cpp
View File

@ -8,7 +8,7 @@
enum ErrorCode { ERROR_01 = 1, ERROR_10 = 10 };
TEST_CASE("JsonVariant::set() when there is enough memory") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc.to<JsonVariant>();
SECTION("const char*") {
@ -128,7 +128,7 @@ TEST_CASE("JsonVariant::set() when there is enough memory") {
}
TEST_CASE("JsonVariant::set() with not enough memory") {
DynamicJsonDocument doc(1);
JsonDocument doc(1);
JsonVariant v = doc.to<JsonVariant>();
@ -155,11 +155,11 @@ TEST_CASE("JsonVariant::set() with not enough memory") {
}
}
TEST_CASE("JsonVariant::set(DynamicJsonDocument)") {
DynamicJsonDocument doc1(1024);
TEST_CASE("JsonVariant::set(JsonDocument)") {
JsonDocument doc1(1024);
doc1["hello"] = "world";
DynamicJsonDocument doc2(1024);
JsonDocument doc2(1024);
JsonVariant v = doc2.to<JsonVariant>();
// Should copy the doc

2
extras/tests/JsonVariant/shallowCopy.cpp
View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::shallowCopy()") {
DynamicJsonDocument doc1(1024), doc2(1024);
JsonDocument doc1(1024), doc2(1024);
JsonVariant variant = doc1.to<JsonVariant>();
SECTION("JsonVariant::shallowCopy(JsonDocument&)") {

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

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::size()") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc.to<JsonVariant>();
SECTION("unbound reference") {

12
extras/tests/JsonVariant/stl_containers.cpp
View File

@ -69,13 +69,13 @@ TEST_CASE("vector<int>") {
SECTION("toJson") {
std::vector<int> v = {1, 2};
DynamicJsonDocument doc(128);
JsonDocument doc(128);
doc.set(v);
REQUIRE(doc.as<std::string>() == "[1,2]");
}
SECTION("fromJson") {
DynamicJsonDocument doc(128);
JsonDocument doc(128);
doc.add(1);
doc.add(2);
@ -86,7 +86,7 @@ TEST_CASE("vector<int>") {
}
SECTION("checkJson") {
DynamicJsonDocument doc(128);
JsonDocument doc(128);
CHECK(doc.is<std::vector<int>>() == false);
doc.add(1);
@ -106,13 +106,13 @@ TEST_CASE("array<int, 2>") {
v[0] = 1;
v[1] = 2;
DynamicJsonDocument doc(128);
JsonDocument doc(128);
doc.set(v);
REQUIRE(doc.as<std::string>() == "[1,2]");
}
SECTION("fromJson") {
DynamicJsonDocument doc(128);
JsonDocument doc(128);
doc.add(1);
doc.add(2);
@ -123,7 +123,7 @@ TEST_CASE("array<int, 2>") {
}
SECTION("checkJson") {
DynamicJsonDocument doc(128);
JsonDocument doc(128);
CHECK(doc.is<array_type>() == false);
doc.add(1);

4
extras/tests/JsonVariant/subscript.cpp
View File

@ -6,7 +6,7 @@
#include <catch.hpp>
TEST_CASE("JsonVariant::operator[]") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant var = doc.to<JsonVariant>();
SECTION("The JsonVariant is null") {
@ -132,7 +132,7 @@ TEST_CASE("JsonVariant::operator[]") {
}
TEST_CASE("JsonVariantConst::operator[]") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant var = doc.to<JsonVariant>();
JsonVariantConst cvar = var;

8
extras/tests/JsonVariant/types.cpp
View File

@ -9,7 +9,7 @@
template <typename T>
void checkValue(T expected) {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc.to<JsonVariant>();
variant.set(expected);
@ -24,7 +24,7 @@ void checkReference(T& expected) {
template <typename T>
void checkNumericType() {
DynamicJsonDocument docMin(4096), docMax(4096);
JsonDocument docMin(4096), docMax(4096);
JsonVariant variantMin = docMin.to<JsonVariant>();
JsonVariant variantMax = docMax.to<JsonVariant>();
@ -129,7 +129,7 @@ TEST_CASE("JsonVariant set()/get()") {
#endif
SECTION("CanStoreObject") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonObject object = doc.to<JsonObject>();
checkValue<JsonObject>(object);
@ -137,7 +137,7 @@ TEST_CASE("JsonVariant set()/get()") {
}
TEST_CASE("volatile") {
DynamicJsonDocument doc(4096);
JsonDocument doc(4096);
JsonVariant variant = doc.to<JsonVariant>();
SECTION("volatile int") {