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

@ -6,7 +6,8 @@
#include <catch.hpp>
TEST_CASE("JsonArray::add()") {
DynamicJsonArray _array;
DynamicJsonDocument doc;
JsonArray& _array = doc.to<JsonArray>();
SECTION("int") {
_array.add(123);
@ -38,7 +39,8 @@ TEST_CASE("JsonArray::add()") {
}
SECTION("nested array") {
DynamicJsonArray arr;
DynamicJsonDocument doc2;
JsonArray& arr = doc2.to<JsonArray>();
_array.add(arr);
@ -48,7 +50,8 @@ TEST_CASE("JsonArray::add()") {
}
SECTION("nested object") {
DynamicJsonObject obj;
DynamicJsonDocument doc2;
JsonObject& obj = doc2.to<JsonObject>();
_array.add(obj);
@ -59,7 +62,8 @@ TEST_CASE("JsonArray::add()") {
SECTION("array subscript") {
const char* str = "hello";
DynamicJsonArray arr;
DynamicJsonDocument doc2;
JsonArray& arr = doc2.to<JsonArray>();
arr.add(str);
_array.add(arr[0]);
@ -69,7 +73,8 @@ TEST_CASE("JsonArray::add()") {
SECTION("object subscript") {
const char* str = "hello";
DynamicJsonObject obj;
DynamicJsonDocument doc2;
JsonObject& obj = doc2.to<JsonObject>();
obj["x"] = str;
_array.add(obj["x"]);
@ -80,30 +85,30 @@ TEST_CASE("JsonArray::add()") {
SECTION("should not duplicate const char*") {
_array.add("world");
const size_t expectedSize = JSON_ARRAY_SIZE(1);
REQUIRE(expectedSize == _array.memoryUsage());
REQUIRE(expectedSize == doc.memoryUsage());
}
SECTION("should duplicate char*") {
_array.add(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.add(std::string("world"));
const size_t expectedSize = JSON_ARRAY_SIZE(1) + 6;
REQUIRE(expectedSize == _array.memoryUsage());
REQUIRE(expectedSize == doc.memoryUsage());
}
SECTION("should not duplicate RawJson(const char*)") {
_array.add(RawJson("{}"));
const size_t expectedSize = JSON_ARRAY_SIZE(1);
REQUIRE(expectedSize == _array.memoryUsage());
REQUIRE(expectedSize == doc.memoryUsage());
}
SECTION("should duplicate RawJson(char*)") {
_array.add(RawJson(const_cast<char*>("{}")));
const size_t expectedSize = JSON_ARRAY_SIZE(1) + 3;
REQUIRE(expectedSize == _array.memoryUsage());
REQUIRE(expectedSize == doc.memoryUsage());
}
}