bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-15 19:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added StaticJsonDocument and DynamicJsonDocument.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

25
test/JsonArray/add.cpp
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());
}
}

3
test/JsonArray/basics.cpp
View File

@ -6,7 +6,8 @@
#include <catch.hpp>
TEST_CASE("JsonArray basics") {
DynamicJsonArray array;
DynamicJsonDocument doc;
JsonArray& array = doc.to<JsonArray>();
SECTION("SuccessIsTrue") {
REQUIRE(array.success());

12
test/JsonArray/copyFrom.cpp
View File

@ -7,7 +7,8 @@
TEST_CASE("JsonArray::copyFrom()") {
SECTION("OneDimension") {
DynamicJsonArray array;
DynamicJsonDocument doc;
JsonArray& array = doc.to<JsonArray>();
char json[32];
int source[] = {1, 2, 3};
@ -20,7 +21,8 @@ TEST_CASE("JsonArray::copyFrom()") {
SECTION("OneDimension_JsonBufferTooSmall") {
const size_t SIZE = JSON_ARRAY_SIZE(2);
StaticJsonArray<SIZE> array;
StaticJsonDocument<SIZE> doc;
JsonArray& array = doc.to<JsonArray>();
char json[32];
int source[] = {1, 2, 3};
@ -32,7 +34,8 @@ TEST_CASE("JsonArray::copyFrom()") {
}
SECTION("TwoDimensions") {
DynamicJsonArray array;
DynamicJsonDocument doc;
JsonArray& array = doc.to<JsonArray>();
char json[32];
int source[][3] = {{1, 2, 3}, {4, 5, 6}};
@ -46,7 +49,8 @@ TEST_CASE("JsonArray::copyFrom()") {
SECTION("TwoDimensions_JsonBufferTooSmall") {
const size_t SIZE =
JSON_ARRAY_SIZE(2) + JSON_ARRAY_SIZE(3) + JSON_ARRAY_SIZE(2);
StaticJsonArray<SIZE> array;
StaticJsonDocument<SIZE> doc;
JsonArray& array = doc.to<JsonArray>();
char json[32];
int source[][3] = {{1, 2, 3}, {4, 5, 6}};

11
test/JsonArray/copyTo.cpp
View File

@ -6,12 +6,13 @@
#include <catch.hpp>
TEST_CASE("JsonArray::copyTo()") {
DynamicJsonArray array;
DynamicJsonDocument doc;
SECTION("BiggerOneDimensionIntegerArray") {
char json[] = "[1,2,3]";
JsonError err = deserializeJson(array, json);
JsonError err = deserializeJson(doc, json);
REQUIRE(err == JsonError::Ok);
JsonArray& array = doc.as<JsonArray>();
int destination[4] = {0};
size_t result = array.copyTo(destination);
@ -25,8 +26,9 @@ TEST_CASE("JsonArray::copyTo()") {
SECTION("SmallerOneDimensionIntegerArray") {
char json[] = "[1,2,3]";
JsonError err = deserializeJson(array, json);
JsonError err = deserializeJson(doc, json);
REQUIRE(err == JsonError::Ok);
JsonArray& array = doc.as<JsonArray>();
int destination[2] = {0};
size_t result = array.copyTo(destination);
@ -39,8 +41,9 @@ TEST_CASE("JsonArray::copyTo()") {
SECTION("TwoOneDimensionIntegerArray") {
char json[] = "[[1,2],[3],[4]]";
JsonError err = deserializeJson(array, json);
JsonError err = deserializeJson(doc, json);
REQUIRE(err == JsonError::Ok);
JsonArray& array = doc.as<JsonArray>();
int destination[3][2] = {{0}};
array.copyTo(destination);

3
test/JsonArray/iterator.cpp
View File

@ -7,7 +7,8 @@
template <typename TIterator>
static void run_iterator_test() {
StaticJsonArray<JSON_ARRAY_SIZE(2)> array;
StaticJsonDocument<JSON_ARRAY_SIZE(2)> doc;
JsonArray& array = doc.to<JsonArray>();
array.add(12);
array.add(34);

3
test/JsonArray/remove.cpp
View File

@ -6,7 +6,8 @@
#include <catch.hpp>
TEST_CASE("JsonArray::remove()") {
DynamicJsonArray _array;
DynamicJsonDocument doc;
JsonArray& _array = doc.to<JsonArray>();
_array.add(1);
_array.add(2);
_array.add(3);

21
test/JsonArray/set.cpp
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());
}
}

3
test/JsonArray/size.cpp
View File

@ -6,7 +6,8 @@
#include <catch.hpp>
TEST_CASE("JsonArray::size()") {
DynamicJsonArray _array;
DynamicJsonDocument doc;
JsonArray& _array = doc.to<JsonArray>();
SECTION("increases after add()") {
_array.add("hello");

21
test/JsonArray/subscript.cpp
View File

@ -7,7 +7,8 @@
#include <catch.hpp>
TEST_CASE("JsonArray::operator[]") {
DynamicJsonArray _array;
DynamicJsonDocument doc;
JsonArray& _array = doc.to<JsonArray>();
_array.add(0);
SECTION("int") {
@ -51,7 +52,8 @@ TEST_CASE("JsonArray::operator[]") {
}
SECTION("nested array") {
DynamicJsonArray arr;
DynamicJsonDocument doc2;
JsonArray& arr = doc2.to<JsonArray>();
_array[0] = arr;
@ -64,7 +66,8 @@ TEST_CASE("JsonArray::operator[]") {
}
SECTION("nested object") {
DynamicJsonObject obj;
DynamicJsonDocument doc2;
JsonObject& obj = doc2.to<JsonObject>();
_array[0] = obj;
@ -77,7 +80,8 @@ TEST_CASE("JsonArray::operator[]") {
}
SECTION("array subscript") {
DynamicJsonArray arr;
DynamicJsonDocument doc2;
JsonArray& arr = doc2.to<JsonArray>();
const char* str = "hello";
arr.add(str);
@ -88,8 +92,9 @@ TEST_CASE("JsonArray::operator[]") {
}
SECTION("object subscript") {
DynamicJsonObject obj;
const char* str = "hello";
DynamicJsonDocument doc2;
JsonObject& obj = doc2.to<JsonObject>();
obj["x"] = str;
@ -101,18 +106,18 @@ TEST_CASE("JsonArray::operator[]") {
SECTION("should not duplicate const char*") {
_array[0] = "world";
const size_t expectedSize = JSON_ARRAY_SIZE(1);
REQUIRE(expectedSize == _array.memoryUsage());
REQUIRE(expectedSize == doc.memoryUsage());
}
SECTION("should duplicate char*") {
_array[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[0] = std::string("world");
const size_t expectedSize = JSON_ARRAY_SIZE(1) + 6;
REQUIRE(expectedSize == _array.memoryUsage());
REQUIRE(expectedSize == doc.memoryUsage());
}
}