Added StaticJsonDocument and DynamicJsonDocument.

Removed StaticJsonArray and DynamicJsonArray.
Removed StaticJsonObject and DynamicJsonObject.
Removed StaticJsonVariant and DynamicJsonVariant.
This commit is contained in:
Benoit Blanchon
2018-04-17 21:27:45 +02:00
parent a13b9e8bdc
commit 1feb92679d
100 changed files with 1696 additions and 1844 deletions

View File

@ -8,7 +8,8 @@
using namespace Catch::Matchers;
TEST_CASE("JsonArray::set()") {
DynamicJsonArray _array;
DynamicJsonDocument doc;
JsonArray& _array = doc.to<JsonArray>();
_array.add(0);
SECTION("int") {
@ -40,7 +41,8 @@ TEST_CASE("JsonArray::set()") {
}
SECTION("nested array") {
DynamicJsonArray arr;
DynamicJsonDocument doc2;
JsonArray& arr = doc2.to<JsonArray>();
_array.set(0, arr);
@ -50,7 +52,8 @@ TEST_CASE("JsonArray::set()") {
}
SECTION("nested object") {
DynamicJsonObject obj;
DynamicJsonDocument doc2;
JsonObject& obj = doc2.to<JsonObject>();
_array.set(0, obj);
@ -60,7 +63,8 @@ TEST_CASE("JsonArray::set()") {
}
SECTION("array subscript") {
DynamicJsonArray arr;
DynamicJsonDocument doc2;
JsonArray& arr = doc2.to<JsonArray>();
arr.add("hello");
_array.set(0, arr[0]);
@ -69,7 +73,8 @@ TEST_CASE("JsonArray::set()") {
}
SECTION("object subscript") {
DynamicJsonObject obj;
DynamicJsonDocument doc2;
JsonObject& obj = doc2.to<JsonObject>();
obj["x"] = "hello";
_array.set(0, obj["x"]);
@ -80,18 +85,18 @@ TEST_CASE("JsonArray::set()") {
SECTION("should not duplicate const char*") {
_array.set(0, "world");
const size_t expectedSize = JSON_ARRAY_SIZE(1);
REQUIRE(expectedSize == _array.memoryUsage());
REQUIRE(expectedSize == doc.memoryUsage());
}
SECTION("should duplicate char*") {
_array.set(0, const_cast<char*>("world"));
const size_t expectedSize = JSON_ARRAY_SIZE(1) + 6;
REQUIRE(expectedSize == _array.memoryUsage());
REQUIRE(expectedSize == doc.memoryUsage());
}
SECTION("should duplicate std::string") {
_array.set(0, std::string("world"));
const size_t expectedSize = JSON_ARRAY_SIZE(1) + 6;
REQUIRE(expectedSize == _array.memoryUsage());
REQUIRE(expectedSize == doc.memoryUsage());
}
}