diff --git a/CHANGELOG.md b/CHANGELOG.md index 30bc909c..f5a89fdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,23 @@ HEAD * Import functions in the ArduinoJson namespace to get clearer errors * Improved syntax highlighting in Arduino IDE +* Removed default capacity of `DynamicJsonDocument` + +> ### BREAKING CHANGES +> +> The parameter to the constructor of `DynamicJsonDocument` is now mandatory +> +> Old code: +> +> ```c++ +> DynamicJsonDocument doc; +> ``` +> +> New code: +> +> ```c++ +> DynamicJsonDocument doc(1024); +> ``` v6.7.0-beta (2018-12-07) ----------- diff --git a/README.md b/README.md index 40211be5..41c3ea01 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Here is a program that parses a JSON document with ArduinoJson. ```c++ char json[] = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}"; -DynamicJsonDocument doc; +DynamicJsonDocument doc(1024); deserializeJson(doc, json); JsonObjectRef root = doc.as(); @@ -77,7 +77,7 @@ See the [tutorial on arduinojson.org](https://arduinojson.org/doc/decoding/?utm_ Here is a program that generates a JSON document with ArduinoJson: ```c++ -DynamicJsonDocument doc; +DynamicJsonDocument doc(1024); JsonObject root = doc.to(); root["sensor"] = "gps"; diff --git a/examples/ProgmemExample/ProgmemExample.ino b/examples/ProgmemExample/ProgmemExample.ino index 286f25da..44e6a0e2 100644 --- a/examples/ProgmemExample/ProgmemExample.ino +++ b/examples/ProgmemExample/ProgmemExample.ino @@ -14,7 +14,7 @@ void setup() { #ifdef PROGMEM // <- check that Flash strings are supported - DynamicJsonDocument doc; + DynamicJsonDocument doc(1024); // You can use a Flash String as your JSON input. // WARNING: the content of the Flash String will be duplicated in the diff --git a/examples/StringExample/StringExample.ino b/examples/StringExample/StringExample.ino index dd07e834..9c1ec70c 100644 --- a/examples/StringExample/StringExample.ino +++ b/examples/StringExample/StringExample.ino @@ -11,7 +11,7 @@ #include void setup() { - DynamicJsonDocument doc; + DynamicJsonDocument doc(1024); // You can use a String as your JSON input. // WARNING: the content of the String will be duplicated in the JsonBuffer. diff --git a/fuzzing/json_fuzzer.cpp b/fuzzing/json_fuzzer.cpp index bd44def6..db9a3d6c 100644 --- a/fuzzing/json_fuzzer.cpp +++ b/fuzzing/json_fuzzer.cpp @@ -1,7 +1,7 @@ #include extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); DeserializationError error = deserializeJson(doc, data, size); if (!error) { std::string json; diff --git a/fuzzing/msgpack_fuzzer.cpp b/fuzzing/msgpack_fuzzer.cpp index ef7a648e..e6235911 100644 --- a/fuzzing/msgpack_fuzzer.cpp +++ b/fuzzing/msgpack_fuzzer.cpp @@ -1,7 +1,7 @@ #include extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); DeserializationError error = deserializeMsgPack(doc, data, size); if (!error) { std::string json; diff --git a/src/ArduinoJson/Configuration.hpp b/src/ArduinoJson/Configuration.hpp index 26211128..3b9a4f7b 100644 --- a/src/ArduinoJson/Configuration.hpp +++ b/src/ArduinoJson/Configuration.hpp @@ -53,11 +53,6 @@ #define ARDUINOJSON_DEFAULT_NESTING_LIMIT 10 #endif -// Default capacity for DynamicJsonDocument -#ifndef ARDUINOJSON_DEFAULT_POOL_SIZE -#define ARDUINOJSON_DEFAULT_POOL_SIZE 1024 -#endif - #else // ARDUINOJSON_EMBEDDED_MODE // On a computer we have plenty of memory so we can use doubles @@ -89,11 +84,6 @@ #define ARDUINOJSON_DEFAULT_NESTING_LIMIT 50 #endif -// Default capacity for DynamicJsonDocument -#ifndef ARDUINOJSON_DEFAULT_POOL_SIZE -#define ARDUINOJSON_DEFAULT_POOL_SIZE 16384 -#endif - #endif // ARDUINOJSON_EMBEDDED_MODE #ifdef ARDUINO diff --git a/src/ArduinoJson/Document/DynamicJsonDocument.hpp b/src/ArduinoJson/Document/DynamicJsonDocument.hpp index 802ec3ff..06cc4cd1 100644 --- a/src/ArduinoJson/Document/DynamicJsonDocument.hpp +++ b/src/ArduinoJson/Document/DynamicJsonDocument.hpp @@ -12,7 +12,7 @@ namespace ARDUINOJSON_NAMESPACE { class DynamicJsonDocument : public JsonDocument { public: - DynamicJsonDocument(size_t capa = ARDUINOJSON_DEFAULT_POOL_SIZE) + explicit DynamicJsonDocument(size_t capa) : JsonDocument(allocPool(addPadding(capa))) {} DynamicJsonDocument(const DynamicJsonDocument& src) diff --git a/test/IntegrationTests/gbathree.cpp b/test/IntegrationTests/gbathree.cpp index c731724d..9d0a9d84 100644 --- a/test/IntegrationTests/gbathree.cpp +++ b/test/IntegrationTests/gbathree.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("Gbathree") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); DeserializationError error = deserializeJson( doc, diff --git a/test/IntegrationTests/issue772.cpp b/test/IntegrationTests/issue772.cpp index 21ee4efc..26c2149b 100644 --- a/test/IntegrationTests/issue772.cpp +++ b/test/IntegrationTests/issue772.cpp @@ -8,7 +8,8 @@ // https://github.com/bblanchon/ArduinoJson/issues/772 TEST_CASE("Issue772") { - DynamicJsonDocument doc1, doc2; + DynamicJsonDocument doc1(4096); + DynamicJsonDocument doc2(4096); DeserializationError err; std::string data = "{\"state\":{\"reported\":{\"timestamp\":\"2018-07-02T09:40:12Z\"," diff --git a/test/IntegrationTests/round_trip.cpp b/test/IntegrationTests/round_trip.cpp index ac221835..c969212e 100644 --- a/test/IntegrationTests/round_trip.cpp +++ b/test/IntegrationTests/round_trip.cpp @@ -6,7 +6,7 @@ #include void check(std::string originalJson) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(16384); std::string prettyJson; deserializeJson(doc, originalJson); diff --git a/test/JsonArray/add.cpp b/test/JsonArray/add.cpp index 7889c91d..f04d622d 100644 --- a/test/JsonArray/add.cpp +++ b/test/JsonArray/add.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonArray::add()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray array = doc.to(); SECTION("int") { @@ -51,7 +51,7 @@ TEST_CASE("JsonArray::add()") { #endif SECTION("nested array") { - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonArray arr = doc2.to(); array.add(arr); @@ -62,7 +62,7 @@ TEST_CASE("JsonArray::add()") { } SECTION("nested object") { - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonObject obj = doc2.to(); array.add(obj); @@ -74,7 +74,7 @@ TEST_CASE("JsonArray::add()") { SECTION("array subscript") { const char* str = "hello"; - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonArray arr = doc2.to(); arr.add(str); @@ -85,7 +85,7 @@ TEST_CASE("JsonArray::add()") { SECTION("object subscript") { const char* str = "hello"; - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonObject obj = doc2.to(); obj["x"] = str; diff --git a/test/JsonArray/copyFrom.cpp b/test/JsonArray/copyFrom.cpp index 4d962b7f..2d7e2790 100644 --- a/test/JsonArray/copyFrom.cpp +++ b/test/JsonArray/copyFrom.cpp @@ -7,7 +7,7 @@ TEST_CASE("JsonArray::copyFrom()") { SECTION("OneDimension") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray array = doc.to(); char json[32]; int source[] = {1, 2, 3}; @@ -34,7 +34,7 @@ TEST_CASE("JsonArray::copyFrom()") { } SECTION("TwoDimensions") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray array = doc.to(); char json[32]; int source[][3] = {{1, 2, 3}, {4, 5, 6}}; diff --git a/test/JsonArray/copyTo.cpp b/test/JsonArray/copyTo.cpp index 48826550..639e3a04 100644 --- a/test/JsonArray/copyTo.cpp +++ b/test/JsonArray/copyTo.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonArray::copyTo()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("BiggerOneDimensionIntegerArray") { char json[] = "[1,2,3]"; diff --git a/test/JsonArray/createNested.cpp b/test/JsonArray/createNested.cpp index 3d389e5f..a7d5311a 100644 --- a/test/JsonArray/createNested.cpp +++ b/test/JsonArray/createNested.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonArray basics") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray array = doc.to(); SECTION("CreateNestedArray") { diff --git a/test/JsonArray/equals.cpp b/test/JsonArray/equals.cpp index 9559933e..a89503a3 100644 --- a/test/JsonArray/equals.cpp +++ b/test/JsonArray/equals.cpp @@ -6,11 +6,11 @@ #include TEST_CASE("JsonArray::operator==()") { - DynamicJsonDocument doc1; + DynamicJsonDocument doc1(4096); JsonArray array1 = doc1.to(); JsonArrayConst array1c = array1; - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonArray array2 = doc2.to(); JsonArrayConst array2c = array2; diff --git a/test/JsonArray/get.cpp b/test/JsonArray/get.cpp index 72ddbeae..59869712 100644 --- a/test/JsonArray/get.cpp +++ b/test/JsonArray/get.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonArray::get()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); deserializeJson(doc, "[1,2,3]"); JsonArray array = doc.as(); diff --git a/test/JsonArray/isNull.cpp b/test/JsonArray/isNull.cpp index 5ceb55ac..c5830854 100644 --- a/test/JsonArray/isNull.cpp +++ b/test/JsonArray/isNull.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonArray::isNull()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("returns true") { JsonArray arr; @@ -20,7 +20,7 @@ TEST_CASE("JsonArray::isNull()") { } TEST_CASE("JsonArrayConst::isNull()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("returns true") { JsonArrayConst arr; diff --git a/test/JsonArray/remove.cpp b/test/JsonArray/remove.cpp index ac502cd4..14e583cb 100644 --- a/test/JsonArray/remove.cpp +++ b/test/JsonArray/remove.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonArray::remove()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray _array = doc.to(); _array.add(1); _array.add(2); diff --git a/test/JsonArray/size.cpp b/test/JsonArray/size.cpp index 1a3ec655..818b2daa 100644 --- a/test/JsonArray/size.cpp +++ b/test/JsonArray/size.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonArray::size()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray array = doc.to(); SECTION("InitialSizeIsZero") { diff --git a/test/JsonArray/std_string.cpp b/test/JsonArray/std_string.cpp index adb98745..3ba69775 100644 --- a/test/JsonArray/std_string.cpp +++ b/test/JsonArray/std_string.cpp @@ -11,7 +11,7 @@ static void eraseString(std::string &str) { } TEST_CASE("std::string") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray array = doc.to(); SECTION("add()") { diff --git a/test/JsonArray/subscript.cpp b/test/JsonArray/subscript.cpp index a3b408af..7c9c04fc 100644 --- a/test/JsonArray/subscript.cpp +++ b/test/JsonArray/subscript.cpp @@ -7,7 +7,7 @@ #include TEST_CASE("JsonArray::operator[]") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray array = doc.to(); array.add(0); @@ -52,7 +52,7 @@ TEST_CASE("JsonArray::operator[]") { } SECTION("nested array") { - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonArray arr2 = doc2.to(); array[0] = arr2; @@ -63,7 +63,7 @@ TEST_CASE("JsonArray::operator[]") { } SECTION("nested object") { - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonObject obj = doc2.to(); array[0] = obj; @@ -74,7 +74,7 @@ TEST_CASE("JsonArray::operator[]") { } SECTION("array subscript") { - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonArray arr2 = doc2.to(); const char* str = "hello"; @@ -87,7 +87,7 @@ TEST_CASE("JsonArray::operator[]") { SECTION("object subscript") { const char* str = "hello"; - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonObject obj = doc2.to(); obj["x"] = str; @@ -146,7 +146,7 @@ TEST_CASE("JsonArray::operator[]") { } TEST_CASE("JsonArrayConst::operator[]") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray array = doc.to(); array.add(0); diff --git a/test/JsonDeserializer/deserializeJsonArray.cpp b/test/JsonDeserializer/deserializeJsonArray.cpp index 260fec3e..7451ba72 100644 --- a/test/JsonDeserializer/deserializeJsonArray.cpp +++ b/test/JsonDeserializer/deserializeJsonArray.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("deserialize JSON array") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("An empty array") { DeserializationError err = deserializeJson(doc, "[]"); diff --git a/test/JsonDeserializer/deserializeJsonObject.cpp b/test/JsonDeserializer/deserializeJsonObject.cpp index eee363ca..884729fc 100644 --- a/test/JsonDeserializer/deserializeJsonObject.cpp +++ b/test/JsonDeserializer/deserializeJsonObject.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("deserialize JSON object") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("An empty object") { DeserializationError err = deserializeJson(doc, "{}"); diff --git a/test/JsonDeserializer/deserializeJsonValue.cpp b/test/JsonDeserializer/deserializeJsonValue.cpp index 0550bbeb..717b78ce 100644 --- a/test/JsonDeserializer/deserializeJsonValue.cpp +++ b/test/JsonDeserializer/deserializeJsonValue.cpp @@ -13,7 +13,7 @@ using ARDUINOJSON_NAMESPACE::isnan; } // namespace my TEST_CASE("deserializeJson(DynamicJsonDocument&)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("null char*") { DeserializationError err = deserializeJson(doc, static_cast(0)); diff --git a/test/JsonDeserializer/input_types.cpp b/test/JsonDeserializer/input_types.cpp index 9bf9efc7..61dd8ce0 100644 --- a/test/JsonDeserializer/input_types.cpp +++ b/test/JsonDeserializer/input_types.cpp @@ -7,7 +7,7 @@ #include TEST_CASE("deserializeJson(const std::string&)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("should accept const string") { const std::string input("[42]"); @@ -36,7 +36,7 @@ TEST_CASE("deserializeJson(const std::string&)") { } TEST_CASE("deserializeJson(std::istream&)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("array") { std::istringstream json(" [ 42 /* comment */ ] "); diff --git a/test/JsonDeserializer/nestingLimit.cpp b/test/JsonDeserializer/nestingLimit.cpp index fb116762..64784cce 100644 --- a/test/JsonDeserializer/nestingLimit.cpp +++ b/test/JsonDeserializer/nestingLimit.cpp @@ -10,7 +10,7 @@ REQUIRE(DeserializationError::TooDeep == expression); TEST_CASE("JsonDeserializer nestingLimit") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("limit = 0") { doc.nestingLimit = 0; diff --git a/test/JsonDocument/DynamicJsonDocument.cpp b/test/JsonDocument/DynamicJsonDocument.cpp index f4beb2d0..dff2ebad 100644 --- a/test/JsonDocument/DynamicJsonDocument.cpp +++ b/test/JsonDocument/DynamicJsonDocument.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("DynamicJsonDocument") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("serializeJson()") { JsonObject obj = doc.to(); @@ -136,7 +136,7 @@ TEST_CASE("DynamicJsonDocument copies") { } SECTION("Assign from StaticJsonDocument") { - DynamicJsonDocument ddoc; + DynamicJsonDocument ddoc(4096); ddoc.to().set(666); StaticJsonDocument<200> sdoc; diff --git a/test/JsonDocument/StaticJsonDocument.cpp b/test/JsonDocument/StaticJsonDocument.cpp index ebf34aca..584c6ab2 100644 --- a/test/JsonDocument/StaticJsonDocument.cpp +++ b/test/JsonDocument/StaticJsonDocument.cpp @@ -73,7 +73,7 @@ TEST_CASE("StaticJsonDocument") { SECTION("Assign from DynamicJsonDocument") { StaticJsonDocument<200> doc1; - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); doc1.to().set(666); deserializeJson(doc2, "{\"hello\":\"world\"}"); doc2.nestingLimit = 42; @@ -100,7 +100,7 @@ TEST_CASE("StaticJsonDocument") { } SECTION("Construct from DynamicJsonDocument") { - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); deserializeJson(doc2, "{\"hello\":\"world\"}"); doc2.nestingLimit = 42; diff --git a/test/JsonObject/containsKey.cpp b/test/JsonObject/containsKey.cpp index 2bacfa23..83b8dc84 100644 --- a/test/JsonObject/containsKey.cpp +++ b/test/JsonObject/containsKey.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonObject::containsKey()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); obj["hello"] = 42; diff --git a/test/JsonObject/copy.cpp b/test/JsonObject/copy.cpp index b82c3b5d..e9fb4a32 100644 --- a/test/JsonObject/copy.cpp +++ b/test/JsonObject/copy.cpp @@ -6,8 +6,8 @@ #include TEST_CASE("JsonObject::copyFrom()") { - DynamicJsonDocument doc1; - DynamicJsonDocument doc2; + DynamicJsonDocument doc1(4096); + DynamicJsonDocument doc2(4096); JsonObject obj1 = doc1.to(); JsonObject obj2 = doc2.to(); diff --git a/test/JsonObject/createNestedArray.cpp b/test/JsonObject/createNestedArray.cpp index 187ce68e..8e594cbd 100644 --- a/test/JsonObject/createNestedArray.cpp +++ b/test/JsonObject/createNestedArray.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonObject::createNestedArray()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); SECTION("key is a const char*") { diff --git a/test/JsonObject/createNestedObject.cpp b/test/JsonObject/createNestedObject.cpp index 26e8080c..c73ac4f5 100644 --- a/test/JsonObject/createNestedObject.cpp +++ b/test/JsonObject/createNestedObject.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonObject::createNestedObject()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); SECTION("key is a const char*") { diff --git a/test/JsonObject/equals.cpp b/test/JsonObject/equals.cpp index 41d3d46a..65a51f29 100644 --- a/test/JsonObject/equals.cpp +++ b/test/JsonObject/equals.cpp @@ -6,11 +6,11 @@ #include TEST_CASE("JsonObject::operator==()") { - DynamicJsonDocument doc1; + DynamicJsonDocument doc1(4096); JsonObject obj1 = doc1.to(); JsonObjectConst obj1c = obj1; - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonObject obj2 = doc2.to(); JsonObjectConst obj2c = obj2; diff --git a/test/JsonObject/isNull.cpp b/test/JsonObject/isNull.cpp index 6c7e0a9a..fa3c6a46 100644 --- a/test/JsonObject/isNull.cpp +++ b/test/JsonObject/isNull.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonObject::isNull()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("returns true") { JsonObject obj; @@ -20,7 +20,7 @@ TEST_CASE("JsonObject::isNull()") { } TEST_CASE("JsonObjectConst::isNull()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("returns true") { JsonObjectConst obj; diff --git a/test/JsonObject/remove.cpp b/test/JsonObject/remove.cpp index 3c83e7f2..0d509b86 100644 --- a/test/JsonObject/remove.cpp +++ b/test/JsonObject/remove.cpp @@ -7,7 +7,7 @@ #include TEST_CASE("JsonObject::remove()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); obj["a"] = 0; obj["b"] = 1; diff --git a/test/JsonObject/size.cpp b/test/JsonObject/size.cpp index 8ec27493..40ae03cf 100644 --- a/test/JsonObject/size.cpp +++ b/test/JsonObject/size.cpp @@ -7,7 +7,7 @@ #include TEST_CASE("JsonObject::size()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); SECTION("initial size is zero") { diff --git a/test/JsonObject/std_string.cpp b/test/JsonObject/std_string.cpp index 41e7c179..2d6d5183 100644 --- a/test/JsonObject/std_string.cpp +++ b/test/JsonObject/std_string.cpp @@ -11,7 +11,7 @@ static void eraseString(std::string &str) { } TEST_CASE("std::string") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("operator[]") { char json[] = "{\"key\":\"value\"}"; diff --git a/test/JsonObject/subscript.cpp b/test/JsonObject/subscript.cpp index f673a9ee..d879eb19 100644 --- a/test/JsonObject/subscript.cpp +++ b/test/JsonObject/subscript.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonObject::operator[]") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); SECTION("int") { @@ -52,7 +52,7 @@ TEST_CASE("JsonObject::operator[]") { } SECTION("array") { - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonArray arr = doc2.to(); obj["hello"] = arr; @@ -63,7 +63,7 @@ TEST_CASE("JsonObject::operator[]") { } SECTION("object") { - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonObject obj2 = doc2.to(); obj["hello"] = obj2; @@ -74,7 +74,7 @@ TEST_CASE("JsonObject::operator[]") { } SECTION("array subscript") { - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonArray arr = doc2.to(); arr.add(42); @@ -84,7 +84,7 @@ TEST_CASE("JsonObject::operator[]") { } SECTION("object subscript") { - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonObject obj2 = doc2.to(); obj2["x"] = 42; diff --git a/test/JsonSerializer/JsonArrayPretty.cpp b/test/JsonSerializer/JsonArrayPretty.cpp index d0c59487..9480b196 100644 --- a/test/JsonSerializer/JsonArrayPretty.cpp +++ b/test/JsonSerializer/JsonArrayPretty.cpp @@ -15,7 +15,7 @@ static void check(JsonArray array, std::string expected) { } TEST_CASE("serializeJsonPretty(JsonArray)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray array = doc.to(); SECTION("Empty") { diff --git a/test/JsonSerializer/JsonObject.cpp b/test/JsonSerializer/JsonObject.cpp index 90d9a73e..b8af8f6b 100644 --- a/test/JsonSerializer/JsonObject.cpp +++ b/test/JsonSerializer/JsonObject.cpp @@ -17,7 +17,7 @@ void check(const JsonObject obj, const std::string &expected) { } TEST_CASE("serializeJson(JsonObject)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); SECTION("EmptyObject") { @@ -93,8 +93,8 @@ TEST_CASE("serializeJson(JsonObject)") { } SECTION("ThreeNestedArrays") { - DynamicJsonDocument b; - DynamicJsonDocument c; + DynamicJsonDocument b(4096); + DynamicJsonDocument c(4096); obj.createNestedArray("a"); obj["b"] = b.to(); @@ -104,8 +104,8 @@ TEST_CASE("serializeJson(JsonObject)") { } SECTION("ThreeNestedObjects") { - DynamicJsonDocument b; - DynamicJsonDocument c; + DynamicJsonDocument b(4096); + DynamicJsonDocument c(4096); obj.createNestedObject("a"); obj["b"] = b.to(); diff --git a/test/JsonSerializer/JsonObjectPretty.cpp b/test/JsonSerializer/JsonObjectPretty.cpp index 52975014..aea4e585 100644 --- a/test/JsonSerializer/JsonObjectPretty.cpp +++ b/test/JsonSerializer/JsonObjectPretty.cpp @@ -18,7 +18,7 @@ void check(const JsonObject obj, const std::string expected) { } TEST_CASE("serializeJsonPretty(JsonObject)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); SECTION("EmptyObject") { diff --git a/test/JsonSerializer/JsonVariant.cpp b/test/JsonSerializer/JsonVariant.cpp index 3dc8003d..c572b57d 100644 --- a/test/JsonSerializer/JsonVariant.cpp +++ b/test/JsonSerializer/JsonVariant.cpp @@ -8,7 +8,7 @@ template void check(T value, const std::string &expected) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); doc.to().set(value); char buffer[256] = ""; size_t returnValue = serializeJson(doc, buffer, sizeof(buffer)); diff --git a/test/JsonSerializer/misc.cpp b/test/JsonSerializer/misc.cpp index f4bed63a..14bd9def 100644 --- a/test/JsonSerializer/misc.cpp +++ b/test/JsonSerializer/misc.cpp @@ -4,7 +4,7 @@ template void check(T value, const std::string &expected) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); doc.to().set(value); char buffer[256] = ""; size_t returnValue = serializeJson(doc, buffer, sizeof(buffer)); @@ -13,7 +13,7 @@ void check(T value, const std::string &expected) { } TEST_CASE("serializeJson(JsonObjectSubscript)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); deserializeJson(doc, "{\"hello\":42}"); JsonObject obj = doc.as(); std::string result; @@ -24,7 +24,7 @@ TEST_CASE("serializeJson(JsonObjectSubscript)") { } TEST_CASE("serializeJson(JsonArraySubscript)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); deserializeJson(doc, "[42]"); JsonArray arr = doc.as(); std::string result; @@ -35,7 +35,7 @@ TEST_CASE("serializeJson(JsonArraySubscript)") { } TEST_CASE("serializeJson(JsonVariantSubscript)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); deserializeJson(doc, "[42]"); JsonVariant var = doc.as(); std::string result; diff --git a/test/JsonSerializer/std_stream.cpp b/test/JsonSerializer/std_stream.cpp index db36c23b..464234ab 100644 --- a/test/JsonSerializer/std_stream.cpp +++ b/test/JsonSerializer/std_stream.cpp @@ -7,7 +7,7 @@ #include TEST_CASE("operator<<(std::ostream)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); std::ostringstream os; SECTION("JsonVariant containing false") { diff --git a/test/JsonSerializer/std_string.cpp b/test/JsonSerializer/std_string.cpp index 5099017e..fcc94738 100644 --- a/test/JsonSerializer/std_string.cpp +++ b/test/JsonSerializer/std_string.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("serialize JsonArray to std::string") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray array = doc.to(); array.add(4); array.add(2); @@ -27,7 +27,7 @@ TEST_CASE("serialize JsonArray to std::string") { } TEST_CASE("serialize JsonObject to std::string") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); obj["key"] = "value"; diff --git a/test/JsonVariant/as.cpp b/test/JsonVariant/as.cpp index 16618782..a1e84956 100644 --- a/test/JsonVariant/as.cpp +++ b/test/JsonVariant/as.cpp @@ -9,7 +9,7 @@ static const char* null = 0; TEST_CASE("JsonVariant::as()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant variant = doc.to(); SECTION("not set") { diff --git a/test/JsonVariant/compare.cpp b/test/JsonVariant/compare.cpp index ac533a67..1adfd162 100644 --- a/test/JsonVariant/compare.cpp +++ b/test/JsonVariant/compare.cpp @@ -9,7 +9,7 @@ static const char* null = 0; template void checkEquals(T a, T b) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant variant = doc.to(); variant.set(a); @@ -30,7 +30,7 @@ void checkEquals(T a, T b) { template void checkGreater(T a, T b) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant variant = doc.to(); variant.set(a); @@ -47,7 +47,7 @@ void checkGreater(T a, T b) { template void checkLower(T a, T b) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant variant = doc.to(); variant.set(a); @@ -111,7 +111,7 @@ TEST_CASE("JsonVariant comparisons") { } SECTION("null") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant variant = doc.to(); variant.set(null); @@ -126,7 +126,7 @@ TEST_CASE("JsonVariant comparisons") { } SECTION("StringLiteral") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); deserializeJson(doc, "\"hello\""); JsonVariant variant = doc.as(); @@ -153,7 +153,7 @@ TEST_CASE("JsonVariant comparisons") { } SECTION("String") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant variant = doc.to(); variant.set("hello"); @@ -185,7 +185,7 @@ TEST_CASE("JsonVariant comparisons") { char vla[i]; strcpy(vla, "hello"); - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant variant = doc.to(); variant.set("hello"); @@ -200,7 +200,7 @@ TEST_CASE("JsonVariant comparisons") { char vla[i]; strcpy(vla, "hello"); - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant variant = doc.to(); variant.set("world"); @@ -211,7 +211,7 @@ TEST_CASE("JsonVariant comparisons") { } #endif - DynamicJsonDocument doc1, doc2, doc3; + DynamicJsonDocument doc1(4096), doc2(4096), doc3(4096); JsonVariant variant1 = doc1.to(); JsonVariant variant2 = doc2.to(); JsonVariant variant3 = doc3.to(); @@ -329,10 +329,10 @@ TEST_CASE("JsonVariant comparisons") { } // SECTION("VariantsOfDifferentTypes") { - // DynamicJsonDocument doc1; + // DynamicJsonDocument doc1(4096); // JsonObject obj = doc1.to(); - // DynamicJsonDocument doc2; + // DynamicJsonDocument doc2(4096); // JsonArray arr = doc2.to(); // JsonVariant variants[] = { // true, 42, 666.667, "hello", arr, obj, diff --git a/test/JsonVariant/copy.cpp b/test/JsonVariant/copy.cpp index b99b998d..ff8ba385 100644 --- a/test/JsonVariant/copy.cpp +++ b/test/JsonVariant/copy.cpp @@ -6,8 +6,8 @@ #include TEST_CASE("JsonVariant::set(JsonVariant)") { - DynamicJsonDocument doc1; - DynamicJsonDocument doc2; + DynamicJsonDocument doc1(4096); + DynamicJsonDocument doc2(4096); JsonVariant var1 = doc1.to(); JsonVariant var2 = doc2.to(); diff --git a/test/JsonVariant/get.cpp b/test/JsonVariant/get.cpp index 4a58aedd..55214b10 100644 --- a/test/JsonVariant/get.cpp +++ b/test/JsonVariant/get.cpp @@ -9,7 +9,7 @@ template void checkValue(T expected) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant variant = doc.to(); variant.set(expected); @@ -24,7 +24,7 @@ void checkReference(T &expected) { template void checkNumericType() { - DynamicJsonDocument docMin, docMax; + DynamicJsonDocument docMin(4096), docMax(4096); JsonVariant variantMin = docMin.to(); JsonVariant variantMax = docMax.to(); @@ -132,7 +132,7 @@ TEST_CASE("JsonVariant set()/get()") { #endif SECTION("CanStoreObject") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject object = doc.to(); checkValue(object); diff --git a/test/JsonVariant/is.cpp b/test/JsonVariant/is.cpp index b4a3b12b..b9e17b77 100644 --- a/test/JsonVariant/is.cpp +++ b/test/JsonVariant/is.cpp @@ -19,7 +19,7 @@ void checkIsArray(TVariant var) { } void testArray(JsonArray value) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant var = doc.to(); var.set(value); @@ -44,7 +44,7 @@ void checkIsBool(TVariant var) { } void testBool(bool value) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant var = doc.to(); var.set(value); @@ -66,7 +66,7 @@ void checkIsFloat(TVariant var) { } void testFloat(double value) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant var = doc.to(); var.set(value); @@ -89,7 +89,7 @@ void checkIsInteger(TVariant var) { template void testInteger(T value) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant var = doc.to(); var.set(value); @@ -112,7 +112,7 @@ void checkIsString(TVariant var) { } void testString(const char *value) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant var = doc.to(); var.set(value); @@ -122,7 +122,7 @@ void testString(const char *value) { TEST_CASE("JsonVariant::is()") { SECTION("JsonArray") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray array = doc.to(); testArray(array); } diff --git a/test/JsonVariant/isnull.cpp b/test/JsonVariant/isnull.cpp index 98b3036c..2c091ba2 100644 --- a/test/JsonVariant/isnull.cpp +++ b/test/JsonVariant/isnull.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonVariant::isNull()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant variant = doc.to(); SECTION("return true when Undefined") { @@ -20,7 +20,7 @@ TEST_CASE("JsonVariant::isNull()") { } SECTION("return false when EmptyArray") { - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonArray array = doc2.to(); variant.set(array); @@ -28,7 +28,7 @@ TEST_CASE("JsonVariant::isNull()") { } SECTION("return false when EmptyObject") { - DynamicJsonDocument doc2; + DynamicJsonDocument doc2(4096); JsonObject obj = doc2.to(); variant.set(obj); diff --git a/test/JsonVariant/misc.cpp b/test/JsonVariant/misc.cpp index 68077a5f..9d7bdb76 100644 --- a/test/JsonVariant/misc.cpp +++ b/test/JsonVariant/misc.cpp @@ -13,7 +13,7 @@ TEST_CASE("JsonVariant from JsonArray") { } SECTION("JsonArray is not null") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray arr = doc.to(); arr.add(12); arr.add(34); @@ -35,7 +35,7 @@ TEST_CASE("JsonVariant from JsonObject") { } SECTION("JsonObject is not null") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); obj["a"] = 12; obj["b"] = 34; diff --git a/test/JsonVariant/or.cpp b/test/JsonVariant/or.cpp index 4d46e84a..c8a873b1 100644 --- a/test/JsonVariant/or.cpp +++ b/test/JsonVariant/or.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonVariant::operator|()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant variant = doc.to(); SECTION("undefined") { diff --git a/test/JsonVariant/set.cpp b/test/JsonVariant/set.cpp index 7be0be2f..92e4d749 100644 --- a/test/JsonVariant/set.cpp +++ b/test/JsonVariant/set.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonVariant and strings") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant variant = doc.to(); SECTION("stores const char* by reference") { diff --git a/test/JsonVariant/subscript.cpp b/test/JsonVariant/subscript.cpp index b3e7c6a2..2715c0aa 100644 --- a/test/JsonVariant/subscript.cpp +++ b/test/JsonVariant/subscript.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonVariant::operator[]") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant var = doc.to(); SECTION("The JsonVariant is undefined") { @@ -122,7 +122,7 @@ TEST_CASE("JsonVariant::operator[]") { } TEST_CASE("JsonVariantConst::operator[]") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant var = doc.to(); JsonVariantConst cvar = var; diff --git a/test/Misc/unsigned_char.cpp b/test/Misc/unsigned_char.cpp index b1a76ab8..4201e6b3 100644 --- a/test/Misc/unsigned_char.cpp +++ b/test/Misc/unsigned_char.cpp @@ -29,7 +29,7 @@ TEST_CASE("unsigned char[]") { } SECTION("JsonVariant") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("set") { unsigned char value[] = "42"; @@ -92,7 +92,7 @@ TEST_CASE("unsigned char[]") { SECTION("operator[]") { unsigned char key[] = "hello"; - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); obj[key] = "world"; @@ -102,7 +102,7 @@ TEST_CASE("unsigned char[]") { SECTION("JsonObject::operator[] const") { unsigned char key[] = "hello"; - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); deserializeJson(doc, "{\"hello\":\"world\"}"); JsonObject obj = doc.as(); @@ -113,7 +113,7 @@ TEST_CASE("unsigned char[]") { SECTION("containsKey()") { unsigned char key[] = "hello"; - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); deserializeJson(doc, "{\"hello\":\"world\"}"); JsonObject obj = doc.as(); REQUIRE(true == obj.containsKey(key)); @@ -122,7 +122,7 @@ TEST_CASE("unsigned char[]") { SECTION("remove()") { unsigned char key[] = "hello"; - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); deserializeJson(doc, "{\"hello\":\"world\"}"); JsonObject obj = doc.as(); obj.remove(key); @@ -133,7 +133,7 @@ TEST_CASE("unsigned char[]") { SECTION("createNestedArray()") { unsigned char key[] = "hello"; - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); obj.createNestedArray(key); } @@ -141,7 +141,7 @@ TEST_CASE("unsigned char[]") { SECTION("createNestedObject()") { unsigned char key[] = "hello"; - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); obj.createNestedObject(key); } @@ -151,7 +151,7 @@ TEST_CASE("unsigned char[]") { SECTION("operator=") { // issue #416 unsigned char value[] = "world"; - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); obj["hello"] = value; @@ -161,7 +161,7 @@ TEST_CASE("unsigned char[]") { SECTION("set()") { unsigned char value[] = "world"; - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject obj = doc.to(); obj["hello"].set(value); @@ -173,7 +173,7 @@ TEST_CASE("unsigned char[]") { SECTION("add()") { unsigned char value[] = "world"; - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray arr = doc.to(); arr.add(value); @@ -185,7 +185,7 @@ TEST_CASE("unsigned char[]") { SECTION("set()") { unsigned char value[] = "world"; - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray arr = doc.to(); arr.add("hello"); arr[0].set(value); @@ -196,7 +196,7 @@ TEST_CASE("unsigned char[]") { SECTION("operator=") { unsigned char value[] = "world"; - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonArray arr = doc.to(); arr.add("hello"); arr[0] = value; diff --git a/test/MixedConfiguration/use_double_0.cpp b/test/MixedConfiguration/use_double_0.cpp index 9f369582..f38ee1f5 100644 --- a/test/MixedConfiguration/use_double_0.cpp +++ b/test/MixedConfiguration/use_double_0.cpp @@ -4,7 +4,7 @@ #include TEST_CASE("ARDUINOJSON_USE_DOUBLE == 0") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject root = doc.to(); root["pi"] = 3.14; diff --git a/test/MixedConfiguration/use_double_1.cpp b/test/MixedConfiguration/use_double_1.cpp index e027a0f9..ff4a0e35 100644 --- a/test/MixedConfiguration/use_double_1.cpp +++ b/test/MixedConfiguration/use_double_1.cpp @@ -4,7 +4,7 @@ #include TEST_CASE("ARDUINOJSON_USE_DOUBLE == 1") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject root = doc.to(); root["pi"] = 3.14; diff --git a/test/MixedConfiguration/use_long_long_0.cpp b/test/MixedConfiguration/use_long_long_0.cpp index f9267275..a2d8770b 100644 --- a/test/MixedConfiguration/use_long_long_0.cpp +++ b/test/MixedConfiguration/use_long_long_0.cpp @@ -17,7 +17,7 @@ std::string get_expected_json<8>() { } TEST_CASE("ARDUINOJSON_USE_LONG_LONG == 0") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject root = doc.to(); root["A"] = 123456789123456789; diff --git a/test/MixedConfiguration/use_long_long_1.cpp b/test/MixedConfiguration/use_long_long_1.cpp index 6050ed3c..5127a55a 100644 --- a/test/MixedConfiguration/use_long_long_1.cpp +++ b/test/MixedConfiguration/use_long_long_1.cpp @@ -4,7 +4,7 @@ #include TEST_CASE("ARDUINOJSON_USE_LONG_LONG == 1") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject root = doc.to(); root["A"] = 123456789123456789; diff --git a/test/MsgPackDeserializer/deserializeArray.cpp b/test/MsgPackDeserializer/deserializeArray.cpp index 5ddc9c87..9c8293b7 100644 --- a/test/MsgPackDeserializer/deserializeArray.cpp +++ b/test/MsgPackDeserializer/deserializeArray.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("deserialize MsgPack array") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("fixarray") { SECTION("empty") { diff --git a/test/MsgPackDeserializer/deserializeObject.cpp b/test/MsgPackDeserializer/deserializeObject.cpp index 445c1ce6..cb022fdf 100644 --- a/test/MsgPackDeserializer/deserializeObject.cpp +++ b/test/MsgPackDeserializer/deserializeObject.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("deserialize MsgPack object") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("fixmap") { SECTION("empty") { diff --git a/test/MsgPackDeserializer/deserializeVariant.cpp b/test/MsgPackDeserializer/deserializeVariant.cpp index c9b6f27f..32223447 100644 --- a/test/MsgPackDeserializer/deserializeVariant.cpp +++ b/test/MsgPackDeserializer/deserializeVariant.cpp @@ -7,22 +7,22 @@ template static void check(const char* input, U expected) { - DynamicJsonDocument variant; + DynamicJsonDocument doc(4096); - DeserializationError error = deserializeMsgPack(variant, input); + DeserializationError error = deserializeMsgPack(doc, input); REQUIRE(error == DeserializationError::Ok); - REQUIRE(variant.is()); - REQUIRE(variant.as() == expected); + REQUIRE(doc.is()); + REQUIRE(doc.as() == expected); } static void checkIsNull(const char* input) { - DynamicJsonDocument variant; + DynamicJsonDocument doc(4096); - DeserializationError error = deserializeMsgPack(variant, input); + DeserializationError error = deserializeMsgPack(doc, input); REQUIRE(error == DeserializationError::Ok); - REQUIRE(variant.as().isNull()); + REQUIRE(doc.as().isNull()); } TEST_CASE("deserialize MsgPack value") { diff --git a/test/MsgPackDeserializer/incompleteInput.cpp b/test/MsgPackDeserializer/incompleteInput.cpp index 64a494d6..8086ea40 100644 --- a/test/MsgPackDeserializer/incompleteInput.cpp +++ b/test/MsgPackDeserializer/incompleteInput.cpp @@ -6,7 +6,7 @@ #include DeserializationError deserialize(const char* input, size_t len) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); return deserializeMsgPack(doc, input, len); } diff --git a/test/MsgPackDeserializer/input_types.cpp b/test/MsgPackDeserializer/input_types.cpp index ccd33577..2bdd3b1e 100644 --- a/test/MsgPackDeserializer/input_types.cpp +++ b/test/MsgPackDeserializer/input_types.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("deserializeMsgPack(const std::string&)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("should accept const string") { const std::string input("\x92\x01\x02"); @@ -46,7 +46,7 @@ TEST_CASE("deserializeMsgPack(const std::string&)") { } TEST_CASE("deserializeMsgPack(std::istream&)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); SECTION("should accept a zero in input") { std::istringstream input(std::string("\x92\x00\x02", 3)); diff --git a/test/MsgPackDeserializer/nestingLimit.cpp b/test/MsgPackDeserializer/nestingLimit.cpp index 5a4963f7..04c23a0d 100644 --- a/test/MsgPackDeserializer/nestingLimit.cpp +++ b/test/MsgPackDeserializer/nestingLimit.cpp @@ -7,7 +7,7 @@ static void check(const char* input, DeserializationError expected, uint8_t limit) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); doc.nestingLimit = limit; DeserializationError error = deserializeMsgPack(doc, input); diff --git a/test/MsgPackDeserializer/notSupported.cpp b/test/MsgPackDeserializer/notSupported.cpp index a5673b0c..3b9471b8 100644 --- a/test/MsgPackDeserializer/notSupported.cpp +++ b/test/MsgPackDeserializer/notSupported.cpp @@ -6,7 +6,7 @@ #include static void checkNotSupported(const char* input) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); DeserializationError error = deserializeMsgPack(doc, input); diff --git a/test/MsgPackSerializer/destination_types.cpp b/test/MsgPackSerializer/destination_types.cpp index 369cce80..e17b1e5c 100644 --- a/test/MsgPackSerializer/destination_types.cpp +++ b/test/MsgPackSerializer/destination_types.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("serialize MsgPack to various destination types") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject object = doc.to(); object["hello"] = "world"; const char *expected_result = "\x81\xA5hello\xA5world"; diff --git a/test/MsgPackSerializer/measure.cpp b/test/MsgPackSerializer/measure.cpp index 3104e941..a4c9b3da 100644 --- a/test/MsgPackSerializer/measure.cpp +++ b/test/MsgPackSerializer/measure.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("measureMsgPack()") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject object = doc.to(); object["hello"] = "world"; diff --git a/test/MsgPackSerializer/misc.cpp b/test/MsgPackSerializer/misc.cpp index f6e20bc0..cd54a3da 100644 --- a/test/MsgPackSerializer/misc.cpp +++ b/test/MsgPackSerializer/misc.cpp @@ -4,7 +4,7 @@ template void check(T value, const std::string &expected) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); doc.to().set(value); char buffer[256] = ""; size_t returnValue = serializeMsgPack(doc, buffer, sizeof(buffer)); @@ -13,7 +13,7 @@ void check(T value, const std::string &expected) { } TEST_CASE("serializeMsgPack(JsonObjectSubscript)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); deserializeJson(doc, "{\"hello\":42}"); JsonObject obj = doc.as(); std::string result; @@ -24,7 +24,7 @@ TEST_CASE("serializeMsgPack(JsonObjectSubscript)") { } TEST_CASE("serializeMsgPack(JsonArraySubscript)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); deserializeJson(doc, "[42]"); JsonArray arr = doc.as(); std::string result; @@ -35,7 +35,7 @@ TEST_CASE("serializeMsgPack(JsonArraySubscript)") { } TEST_CASE("serializeMsgPack(JsonVariantSubscript)") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); deserializeJson(doc, "[42]"); JsonVariant var = doc.as(); std::string result; diff --git a/test/MsgPackSerializer/serializeObject.cpp b/test/MsgPackSerializer/serializeObject.cpp index 77f7c5f2..f72ac394 100644 --- a/test/MsgPackSerializer/serializeObject.cpp +++ b/test/MsgPackSerializer/serializeObject.cpp @@ -28,7 +28,7 @@ static void check(const JsonObject object, const char (&expected_data)[N]) { //} TEST_CASE("serialize MsgPack object") { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonObject object = doc.to(); SECTION("empty") { diff --git a/test/MsgPackSerializer/serializeVariant.cpp b/test/MsgPackSerializer/serializeVariant.cpp index a9979402..209b99b2 100644 --- a/test/MsgPackSerializer/serializeVariant.cpp +++ b/test/MsgPackSerializer/serializeVariant.cpp @@ -7,7 +7,7 @@ template void check(T value, const char* expected_data, size_t expected_len) { - DynamicJsonDocument doc; + DynamicJsonDocument doc(4096); JsonVariant variant = doc.to(); variant.set(value); std::string expected(expected_data, expected_data + expected_len);