diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index b240f81c..c7a074b2 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -27,7 +27,7 @@ Here is the environment that I used: Here is a small snippet that reproduces the issue. ```c++ -JsonDocument doc(1024); +JsonDocument doc; DeserializationError error = deserializeJson(doc, "{\"hello\":\"world\"}"); diff --git a/.github/ISSUE_TEMPLATE/help.md b/.github/ISSUE_TEMPLATE/help.md index f835c6be..8ed18639 100644 --- a/.github/ISSUE_TEMPLATE/help.md +++ b/.github/ISSUE_TEMPLATE/help.md @@ -28,7 +28,7 @@ Here is the environment that I'm using': Here is a small snippet that demonstrate the problem. ```c++ -JsonDocument doc(1024); +JsonDocument doc; DeserializationError error = deserializeJson(doc, "{\"hello\":\"world\"}"); diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 144e1398..47a8cab3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -484,7 +484,7 @@ jobs: g++ -x c++ - <()` * Fix double call to `size()` in `serializeMsgPack()` * Include `ARDUINOJSON_SLOT_OFFSET_SIZE` in the namespace name -* Remove `JsonVariant::shallowCopy()` +* Remove `JsonVariant::shallowCopy()` +* `JsonDocument`'s capacity grows as needed, no need to pass it to the constructor anymore diff --git a/README.md b/README.md index 8748c143..fa895c90 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ Here is a program that parses a JSON document with ArduinoJson. ```c++ char json[] = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}"; -JsonDocument doc(1024); +JsonDocument doc; deserializeJson(doc, json); const char* sensor = doc["sensor"]; @@ -122,7 +122,7 @@ See the [tutorial on arduinojson.org](https://arduinojson.org/v6/doc/deserializa Here is a program that generates a JSON document with ArduinoJson: ```c++ -JsonDocument doc(1024); +JsonDocument doc; doc["sensor"] = "gps"; doc["time"] = 1351824120; diff --git a/examples/JsonConfigFile/JsonConfigFile.ino b/examples/JsonConfigFile/JsonConfigFile.ino index 23b963a6..fa243c83 100644 --- a/examples/JsonConfigFile/JsonConfigFile.ino +++ b/examples/JsonConfigFile/JsonConfigFile.ino @@ -45,7 +45,7 @@ void loadConfiguration(const char* filename, Config& config) { // Allocate a temporary JsonDocument // Don't forget to change the capacity to match your requirements. // Use https://arduinojson.org/v6/assistant to compute the capacity. - JsonDocument doc(512); + JsonDocument doc; // Deserialize the JSON document DeserializationError error = deserializeJson(doc, file); @@ -77,7 +77,7 @@ void saveConfiguration(const char* filename, const Config& config) { // Allocate a temporary JsonDocument // Don't forget to change the capacity to match your requirements. // Use https://arduinojson.org/assistant to compute the capacity. - JsonDocument doc(256); + JsonDocument doc; // Set the values in the document doc["hostname"] = config.hostname; diff --git a/examples/JsonFilterExample/JsonFilterExample.ino b/examples/JsonFilterExample/JsonFilterExample.ino index 319c2f13..5abf9816 100644 --- a/examples/JsonFilterExample/JsonFilterExample.ino +++ b/examples/JsonFilterExample/JsonFilterExample.ino @@ -34,12 +34,12 @@ void setup() { "1000000,\"timezone\":0,\"sunrise\":1581492085,\"sunset\":1581527294}}"); // The filter: it contains "true" for each value we want to keep - JsonDocument filter(200); + JsonDocument filter; filter["list"][0]["dt"] = true; filter["list"][0]["main"]["temp"] = true; // Deserialize the document - JsonDocument doc(400); + JsonDocument doc; deserializeJson(doc, input_json, DeserializationOption::Filter(filter)); // Print the result diff --git a/examples/JsonGeneratorExample/JsonGeneratorExample.ino b/examples/JsonGeneratorExample/JsonGeneratorExample.ino index aa51e0a6..cc0a2ed8 100644 --- a/examples/JsonGeneratorExample/JsonGeneratorExample.ino +++ b/examples/JsonGeneratorExample/JsonGeneratorExample.ino @@ -19,7 +19,7 @@ void setup() { // Inside the parentheses, 200 is the RAM allocated to this document. // Don't forget to change this value to match your requirement. // Use https://arduinojson.org/v6/assistant to compute the capacity. - JsonDocument doc(200); + JsonDocument doc; // Add values in the document // diff --git a/examples/JsonHttpClient/JsonHttpClient.ino b/examples/JsonHttpClient/JsonHttpClient.ino index 20e8e495..60d2991f 100644 --- a/examples/JsonHttpClient/JsonHttpClient.ino +++ b/examples/JsonHttpClient/JsonHttpClient.ino @@ -25,7 +25,8 @@ void setup() { // Initialize Serial port Serial.begin(9600); - while (!Serial) continue; + while (!Serial) + continue; // Initialize Ethernet library byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED}; @@ -78,7 +79,7 @@ void setup() { // Allocate the JSON document // Use https://arduinojson.org/v6/assistant to compute the capacity. - JsonDocument doc(256); + JsonDocument doc; // Parse JSON object DeserializationError error = deserializeJson(doc, client); diff --git a/examples/JsonParserExample/JsonParserExample.ino b/examples/JsonParserExample/JsonParserExample.ino index 37571b67..24787113 100644 --- a/examples/JsonParserExample/JsonParserExample.ino +++ b/examples/JsonParserExample/JsonParserExample.ino @@ -19,7 +19,7 @@ void setup() { // Inside the parentheses, 200 is the capacity of the memory pool in bytes. // Don't forget to change this value to match your JSON document. // Use https://arduinojson.org/v6/assistant to compute the capacity. - JsonDocument doc(200); + JsonDocument doc; // JSON input string. // diff --git a/examples/JsonServer/JsonServer.ino b/examples/JsonServer/JsonServer.ino index b7452272..7d95f9de 100644 --- a/examples/JsonServer/JsonServer.ino +++ b/examples/JsonServer/JsonServer.ino @@ -58,7 +58,7 @@ void loop() { // Allocate a temporary JsonDocument // Use https://arduinojson.org/v6/assistant to compute the capacity. - JsonDocument doc(500); + JsonDocument doc; // Create the "analog" array JsonArray analogValues = doc.createNestedArray("analog"); diff --git a/examples/JsonUdpBeacon/JsonUdpBeacon.ino b/examples/JsonUdpBeacon/JsonUdpBeacon.ino index 139bc394..501e34ef 100644 --- a/examples/JsonUdpBeacon/JsonUdpBeacon.ino +++ b/examples/JsonUdpBeacon/JsonUdpBeacon.ino @@ -48,7 +48,7 @@ void setup() { void loop() { // Allocate a temporary JsonDocument // Use https://arduinojson.org/v6/assistant to compute the capacity. - JsonDocument doc(500); + JsonDocument doc; // Create the "analog" array JsonArray analogValues = doc.createNestedArray("analog"); diff --git a/examples/MsgPackParser/MsgPackParser.ino b/examples/MsgPackParser/MsgPackParser.ino index d4882149..a6bb73b1 100644 --- a/examples/MsgPackParser/MsgPackParser.ino +++ b/examples/MsgPackParser/MsgPackParser.ino @@ -20,7 +20,7 @@ void setup() { // Inside the parentheses, 200 is the capacity of the memory pool in bytes. // Don't forget to change this value to match your JSON document. // Use https://arduinojson.org/v6/assistant to compute the capacity. - JsonDocument doc(200); + JsonDocument doc; // MessagePack input string. // diff --git a/examples/ProgmemExample/ProgmemExample.ino b/examples/ProgmemExample/ProgmemExample.ino index 7b713fd7..04880769 100644 --- a/examples/ProgmemExample/ProgmemExample.ino +++ b/examples/ProgmemExample/ProgmemExample.ino @@ -14,7 +14,7 @@ #include void setup() { - JsonDocument doc(1024); + JsonDocument doc; // You can use a Flash String as your JSON input. // WARNING: the strings in the input will be duplicated in the JsonDocument. diff --git a/examples/StringExample/StringExample.ino b/examples/StringExample/StringExample.ino index 240e9784..3d754597 100644 --- a/examples/StringExample/StringExample.ino +++ b/examples/StringExample/StringExample.ino @@ -13,7 +13,7 @@ #include void setup() { - JsonDocument doc(1024); + JsonDocument doc; // You can use a String as your JSON input. // WARNING: the string in the input will be duplicated in the JsonDocument. diff --git a/extras/ci/espidf/main/main.cpp b/extras/ci/espidf/main/main.cpp index 70ee1dd0..97f91949 100644 --- a/extras/ci/espidf/main/main.cpp +++ b/extras/ci/espidf/main/main.cpp @@ -6,7 +6,7 @@ extern "C" void app_main() { char buffer[256]; - JsonDocument doc(200); + JsonDocument doc; doc["hello"] = "world"; serializeJson(doc, buffer); diff --git a/extras/fuzzing/json_fuzzer.cpp b/extras/fuzzing/json_fuzzer.cpp index df9ebcb1..8d78aa34 100644 --- a/extras/fuzzing/json_fuzzer.cpp +++ b/extras/fuzzing/json_fuzzer.cpp @@ -1,7 +1,7 @@ #include extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { - JsonDocument doc(4096); + JsonDocument doc; DeserializationError error = deserializeJson(doc, data, size); if (!error) { std::string json; diff --git a/extras/fuzzing/msgpack_fuzzer.cpp b/extras/fuzzing/msgpack_fuzzer.cpp index 577e5a6e..3011501b 100644 --- a/extras/fuzzing/msgpack_fuzzer.cpp +++ b/extras/fuzzing/msgpack_fuzzer.cpp @@ -1,7 +1,7 @@ #include extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { - JsonDocument doc(4096); + JsonDocument doc; DeserializationError error = deserializeMsgPack(doc, data, size); if (!error) { std::string json; diff --git a/extras/scripts/wandbox/JsonGeneratorExample.cpp b/extras/scripts/wandbox/JsonGeneratorExample.cpp index 9b29ce5a..18d68b61 100644 --- a/extras/scripts/wandbox/JsonGeneratorExample.cpp +++ b/extras/scripts/wandbox/JsonGeneratorExample.cpp @@ -13,7 +13,7 @@ int main() { // Inside the parentheses, 200 is the RAM allocated to this document. // Don't forget to change this value to match your requirement. // Use https://arduinojson.org/v6/assistant to compute the capacity. - JsonDocument doc(200); + JsonDocument doc; // Add values in the document // diff --git a/extras/scripts/wandbox/JsonParserExample.cpp b/extras/scripts/wandbox/JsonParserExample.cpp index 9af47c03..d83d2e85 100644 --- a/extras/scripts/wandbox/JsonParserExample.cpp +++ b/extras/scripts/wandbox/JsonParserExample.cpp @@ -13,7 +13,7 @@ int main() { // Inside the parentheses, 200 is the capacity of the memory pool in bytes. // Don't forget to change this value to match your JSON document. // Use https://arduinojson.org/v6/assistant to compute the capacity. - JsonDocument doc(300); + JsonDocument doc; // JSON input string. // diff --git a/extras/scripts/wandbox/MsgPackParserExample.cpp b/extras/scripts/wandbox/MsgPackParserExample.cpp index 77066998..605df763 100644 --- a/extras/scripts/wandbox/MsgPackParserExample.cpp +++ b/extras/scripts/wandbox/MsgPackParserExample.cpp @@ -13,7 +13,7 @@ int main() { // Inside the parentheses, 300 is the size of the memory pool in bytes. // Don't forget to change this value to match your JSON document. // Use https://arduinojson.org/assistant to compute the capacity. - JsonDocument doc(300); + JsonDocument doc; // MessagePack input string. // diff --git a/extras/tests/Cpp17/string_view.cpp b/extras/tests/Cpp17/string_view.cpp index 61487dfb..894705a1 100644 --- a/extras/tests/Cpp17/string_view.cpp +++ b/extras/tests/Cpp17/string_view.cpp @@ -11,7 +11,7 @@ using ArduinoJson::detail::sizeofArray; using ArduinoJson::detail::sizeofString; TEST_CASE("string_view") { - JsonDocument doc(256); + JsonDocument doc; JsonVariant variant = doc.to(); SECTION("deserializeJson()") { diff --git a/extras/tests/Cpp20/smoke_test.cpp b/extras/tests/Cpp20/smoke_test.cpp index 85b2d60a..72dd50f3 100644 --- a/extras/tests/Cpp20/smoke_test.cpp +++ b/extras/tests/Cpp20/smoke_test.cpp @@ -4,7 +4,7 @@ #include TEST_CASE("C++20 smoke test") { - JsonDocument doc(128); + JsonDocument doc; deserializeJson(doc, "{\"hello\":\"world\"}"); REQUIRE(doc["hello"] == "world"); diff --git a/extras/tests/FailingBuilds/Issue978.cpp b/extras/tests/FailingBuilds/Issue978.cpp index 66a75b11..cf22b553 100644 --- a/extras/tests/FailingBuilds/Issue978.cpp +++ b/extras/tests/FailingBuilds/Issue978.cpp @@ -8,6 +8,6 @@ struct Stream {}; int main() { Stream* stream = 0; - JsonDocument doc(1024); + JsonDocument doc; deserializeJson(doc, stream); } diff --git a/extras/tests/FailingBuilds/assign_char.cpp b/extras/tests/FailingBuilds/assign_char.cpp index f6c81702..5b19290c 100644 --- a/extras/tests/FailingBuilds/assign_char.cpp +++ b/extras/tests/FailingBuilds/assign_char.cpp @@ -7,6 +7,6 @@ // See issue #1498 int main() { - JsonDocument doc(1024); + JsonDocument doc; doc["dummy"] = 'A'; } diff --git a/extras/tests/FailingBuilds/read_long_long.cpp b/extras/tests/FailingBuilds/read_long_long.cpp index 7e4248b1..08d8bf93 100644 --- a/extras/tests/FailingBuilds/read_long_long.cpp +++ b/extras/tests/FailingBuilds/read_long_long.cpp @@ -11,6 +11,6 @@ ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(long long) int main() { - JsonDocument doc(1024); + JsonDocument doc; doc["dummy"].as(); } diff --git a/extras/tests/FailingBuilds/variant_as_char.cpp b/extras/tests/FailingBuilds/variant_as_char.cpp index ce83e45d..708fadf2 100644 --- a/extras/tests/FailingBuilds/variant_as_char.cpp +++ b/extras/tests/FailingBuilds/variant_as_char.cpp @@ -7,6 +7,6 @@ // See issue #1498 int main() { - JsonDocument doc(1024); + JsonDocument doc; doc["dummy"].as(); } diff --git a/extras/tests/FailingBuilds/write_long_long.cpp b/extras/tests/FailingBuilds/write_long_long.cpp index ace250da..42de1bc3 100644 --- a/extras/tests/FailingBuilds/write_long_long.cpp +++ b/extras/tests/FailingBuilds/write_long_long.cpp @@ -10,6 +10,6 @@ #endif int main() { - JsonDocument doc(1024); + JsonDocument doc; doc["dummy"] = static_cast(42); } diff --git a/extras/tests/IntegrationTests/gbathree.cpp b/extras/tests/IntegrationTests/gbathree.cpp index 2f988cf9..499114ce 100644 --- a/extras/tests/IntegrationTests/gbathree.cpp +++ b/extras/tests/IntegrationTests/gbathree.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("Gbathree") { - JsonDocument doc(4096); + JsonDocument doc; DeserializationError error = deserializeJson( doc, diff --git a/extras/tests/IntegrationTests/issue772.cpp b/extras/tests/IntegrationTests/issue772.cpp index 511aec84..150826cf 100644 --- a/extras/tests/IntegrationTests/issue772.cpp +++ b/extras/tests/IntegrationTests/issue772.cpp @@ -8,8 +8,8 @@ // https://github.com/bblanchon/ArduinoJson/issues/772 TEST_CASE("Issue772") { - JsonDocument doc1(4096); - JsonDocument doc2(4096); + JsonDocument doc1; + JsonDocument doc2; DeserializationError err; std::string data = "{\"state\":{\"reported\":{\"timestamp\":\"2018-07-02T09:40:12Z\"," diff --git a/extras/tests/IntegrationTests/openweathermap.cpp b/extras/tests/IntegrationTests/openweathermap.cpp index 09309dd2..40b1bb61 100644 --- a/extras/tests/IntegrationTests/openweathermap.cpp +++ b/extras/tests/IntegrationTests/openweathermap.cpp @@ -53,12 +53,12 @@ TEST_CASE("OpenWeatherMap") { "]}"; // clang-format on - JsonDocument filter(512); + JsonDocument filter; filter["list"][0]["dt"] = true; filter["list"][0]["main"]["temp"] = true; filter["list"][0]["weather"][0]["description"] = true; - JsonDocument doc(16384); + JsonDocument doc; REQUIRE( deserializeJson(doc, input_json, DeserializationOption::Filter(filter)) == diff --git a/extras/tests/IntegrationTests/round_trip.cpp b/extras/tests/IntegrationTests/round_trip.cpp index 567e253a..446a155e 100644 --- a/extras/tests/IntegrationTests/round_trip.cpp +++ b/extras/tests/IntegrationTests/round_trip.cpp @@ -6,7 +6,7 @@ #include void check(std::string originalJson) { - JsonDocument doc(16384); + JsonDocument doc; std::string prettyJson; deserializeJson(doc, originalJson); diff --git a/extras/tests/JsonArray/add.cpp b/extras/tests/JsonArray/add.cpp index 68ee2e42..2d0a8051 100644 --- a/extras/tests/JsonArray/add.cpp +++ b/extras/tests/JsonArray/add.cpp @@ -9,7 +9,7 @@ using ArduinoJson::detail::sizeofArray; using ArduinoJson::detail::sizeofString; TEST_CASE("JsonArray::add()") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); SECTION("int") { @@ -54,7 +54,7 @@ TEST_CASE("JsonArray::add()") { #endif SECTION("nested array") { - JsonDocument doc2(4096); + JsonDocument doc2; JsonArray arr = doc2.to(); array.add(arr); @@ -65,7 +65,7 @@ TEST_CASE("JsonArray::add()") { } SECTION("nested object") { - JsonDocument doc2(4096); + JsonDocument doc2; JsonObject obj = doc2.to(); array.add(obj); @@ -77,7 +77,7 @@ TEST_CASE("JsonArray::add()") { SECTION("array subscript") { const char* str = "hello"; - JsonDocument doc2(4096); + JsonDocument doc2; JsonArray arr = doc2.to(); arr.add(str); @@ -88,7 +88,7 @@ TEST_CASE("JsonArray::add()") { SECTION("object subscript") { const char* str = "hello"; - JsonDocument doc2(4096); + JsonDocument doc2; JsonObject obj = doc2.to(); obj["x"] = str; diff --git a/extras/tests/JsonArray/clear.cpp b/extras/tests/JsonArray/clear.cpp index 660e83b7..faeac9a5 100644 --- a/extras/tests/JsonArray/clear.cpp +++ b/extras/tests/JsonArray/clear.cpp @@ -14,7 +14,7 @@ TEST_CASE("JsonArray::clear()") { } SECTION("Removes all elements") { - JsonDocument doc(64); + JsonDocument doc; JsonArray array = doc.to(); array.add(1); array.add(2); diff --git a/extras/tests/JsonArray/compare.cpp b/extras/tests/JsonArray/compare.cpp index 3c5243e0..7198f6c2 100644 --- a/extras/tests/JsonArray/compare.cpp +++ b/extras/tests/JsonArray/compare.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("Compare JsonArray with JsonArray") { - JsonDocument doc(256); + JsonDocument doc; SECTION("Compare with unbound") { JsonArray array = doc.to(); @@ -82,7 +82,7 @@ TEST_CASE("Compare JsonArray with JsonArray") { } TEST_CASE("Compare JsonArray with JsonVariant") { - JsonDocument doc(256); + JsonDocument doc; SECTION("Compare with self") { JsonArray array = doc.to(); @@ -153,7 +153,7 @@ TEST_CASE("Compare JsonArray with JsonVariant") { } TEST_CASE("Compare JsonArray with JsonVariantConst") { - JsonDocument doc(256); + JsonDocument doc; SECTION("Compare with unbound") { JsonArray array = doc.to(); @@ -247,7 +247,7 @@ TEST_CASE("Compare JsonArray with JsonVariantConst") { } TEST_CASE("Compare JsonArray with JsonArrayConst") { - JsonDocument doc(256); + JsonDocument doc; SECTION("Compare with unbound") { JsonArray array = doc.to(); @@ -347,7 +347,7 @@ TEST_CASE("Compare JsonArray with JsonArrayConst") { } TEST_CASE("Compare JsonArrayConst with JsonArrayConst") { - JsonDocument doc(256); + JsonDocument doc; SECTION("Compare with unbound") { JsonArray array = doc.to(); @@ -430,7 +430,7 @@ TEST_CASE("Compare JsonArrayConst with JsonArrayConst") { } TEST_CASE("Compare JsonArrayConst with JsonVariant") { - JsonDocument doc(256); + JsonDocument doc; SECTION("Compare with self") { JsonArray array = doc.to(); diff --git a/extras/tests/JsonArray/copyArray.cpp b/extras/tests/JsonArray/copyArray.cpp index 0c986843..985ba764 100644 --- a/extras/tests/JsonArray/copyArray.cpp +++ b/extras/tests/JsonArray/copyArray.cpp @@ -7,11 +7,9 @@ #include "Allocators.hpp" -using ArduinoJson::detail::sizeofArray; - TEST_CASE("copyArray()") { SECTION("int[] -> JsonArray") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); char json[32]; int source[] = {1, 2, 3}; @@ -24,7 +22,7 @@ TEST_CASE("copyArray()") { } SECTION("std::string[] -> JsonArray") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); char json[32]; std::string source[] = {"a", "b", "c"}; @@ -37,7 +35,7 @@ TEST_CASE("copyArray()") { } SECTION("const char*[] -> JsonArray") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); char json[32]; const char* source[] = {"a", "b", "c"}; @@ -50,7 +48,7 @@ TEST_CASE("copyArray()") { } SECTION("const char[][] -> JsonArray") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); char json[32]; char source[][2] = {"a", "b", "c"}; @@ -63,7 +61,7 @@ TEST_CASE("copyArray()") { } SECTION("const char[][] -> JsonDocument") { - JsonDocument doc(4096); + JsonDocument doc; char json[32]; char source[][2] = {"a", "b", "c"}; @@ -75,7 +73,7 @@ TEST_CASE("copyArray()") { } SECTION("const char[][] -> MemberProxy") { - JsonDocument doc(4096); + JsonDocument doc; char json[32]; char source[][2] = {"a", "b", "c"}; @@ -87,7 +85,7 @@ TEST_CASE("copyArray()") { } SECTION("int[] -> JsonDocument") { - JsonDocument doc(4096); + JsonDocument doc; char json[32]; int source[] = {1, 2, 3}; @@ -99,7 +97,7 @@ TEST_CASE("copyArray()") { } SECTION("int[] -> MemberProxy") { - JsonDocument doc(4096); + JsonDocument doc; char json[32]; int source[] = {1, 2, 3}; @@ -111,7 +109,7 @@ TEST_CASE("copyArray()") { } SECTION("int[] -> JsonArray, but not enough memory") { - JsonDocument doc(0, FailingAllocator::instance()); + JsonDocument doc(FailingAllocator::instance()); JsonArray array = doc.to(); int source[] = {1, 2, 3}; @@ -120,7 +118,7 @@ TEST_CASE("copyArray()") { } SECTION("int[][] -> JsonArray") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); char json[32]; int source[][3] = {{1, 2, 3}, {4, 5, 6}}; @@ -133,7 +131,7 @@ TEST_CASE("copyArray()") { } SECTION("int[][] -> MemberProxy") { - JsonDocument doc(4096); + JsonDocument doc; char json[32]; int source[][3] = {{1, 2, 3}, {4, 5, 6}}; @@ -145,7 +143,7 @@ TEST_CASE("copyArray()") { } SECTION("int[][] -> JsonDocument") { - JsonDocument doc(4096); + JsonDocument doc; char json[32]; int source[][3] = {{1, 2, 3}, {4, 5, 6}}; @@ -157,7 +155,7 @@ TEST_CASE("copyArray()") { } SECTION("int[][] -> JsonArray, but not enough memory") { - JsonDocument doc(0, FailingAllocator::instance()); + JsonDocument doc(FailingAllocator::instance()); JsonArray array = doc.to(); int source[][3] = {{1, 2, 3}, {4, 5, 6}}; @@ -166,7 +164,7 @@ TEST_CASE("copyArray()") { } SECTION("JsonArray -> int[], with more space than needed") { - JsonDocument doc(4096); + JsonDocument doc; char json[] = "[1,2,3]"; DeserializationError err = deserializeJson(doc, json); CHECK(err == DeserializationError::Ok); @@ -183,7 +181,7 @@ TEST_CASE("copyArray()") { } SECTION("JsonArray -> int[], without enough space") { - JsonDocument doc(4096); + JsonDocument doc; char json[] = "[1,2,3]"; DeserializationError err = deserializeJson(doc, json); CHECK(err == DeserializationError::Ok); @@ -198,7 +196,7 @@ TEST_CASE("copyArray()") { } SECTION("JsonArray -> std::string[]") { - JsonDocument doc(4096); + JsonDocument doc; char json[] = "[\"a\",\"b\",\"c\"]"; DeserializationError err = deserializeJson(doc, json); CHECK(err == DeserializationError::Ok); @@ -215,7 +213,7 @@ TEST_CASE("copyArray()") { } SECTION("JsonArray -> char[N][]") { - JsonDocument doc(4096); + JsonDocument doc; char json[] = "[\"a12345\",\"b123456\",\"c1234567\"]"; DeserializationError err = deserializeJson(doc, json); CHECK(err == DeserializationError::Ok); @@ -232,7 +230,7 @@ TEST_CASE("copyArray()") { } SECTION("JsonDocument -> int[]") { - JsonDocument doc(4096); + JsonDocument doc; char json[] = "[1,2,3]"; DeserializationError err = deserializeJson(doc, json); CHECK(err == DeserializationError::Ok); @@ -248,7 +246,7 @@ TEST_CASE("copyArray()") { } SECTION("MemberProxy -> int[]") { - JsonDocument doc(4096); + JsonDocument doc; char json[] = "{\"data\":[1,2,3]}"; DeserializationError err = deserializeJson(doc, json); CHECK(err == DeserializationError::Ok); @@ -264,7 +262,7 @@ TEST_CASE("copyArray()") { } SECTION("ElementProxy -> int[]") { - JsonDocument doc(4096); + JsonDocument doc; char json[] = "[[1,2,3]]"; DeserializationError err = deserializeJson(doc, json); CHECK(err == DeserializationError::Ok); @@ -280,7 +278,7 @@ TEST_CASE("copyArray()") { } SECTION("JsonArray -> int[][]") { - JsonDocument doc(4096); + JsonDocument doc; char json[] = "[[1,2],[3],[4]]"; DeserializationError err = deserializeJson(doc, json); @@ -299,7 +297,7 @@ TEST_CASE("copyArray()") { } SECTION("JsonDocument -> int[][]") { - JsonDocument doc(4096); + JsonDocument doc; char json[] = "[[1,2],[3],[4]]"; DeserializationError err = deserializeJson(doc, json); @@ -317,7 +315,7 @@ TEST_CASE("copyArray()") { } SECTION("MemberProxy -> int[][]") { - JsonDocument doc(4096); + JsonDocument doc; char json[] = "{\"data\":[[1,2],[3],[4]]}"; DeserializationError err = deserializeJson(doc, json); diff --git a/extras/tests/JsonArray/createNested.cpp b/extras/tests/JsonArray/createNested.cpp index 14994ca3..b930a18b 100644 --- a/extras/tests/JsonArray/createNested.cpp +++ b/extras/tests/JsonArray/createNested.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonArray basics") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); SECTION("CreateNestedArray") { diff --git a/extras/tests/JsonArray/equals.cpp b/extras/tests/JsonArray/equals.cpp index f14cb17c..301d130f 100644 --- a/extras/tests/JsonArray/equals.cpp +++ b/extras/tests/JsonArray/equals.cpp @@ -6,11 +6,11 @@ #include TEST_CASE("JsonArray::operator==()") { - JsonDocument doc1(4096); + JsonDocument doc1; JsonArray array1 = doc1.to(); JsonArrayConst array1c = array1; - JsonDocument doc2(4096); + JsonDocument doc2; JsonArray array2 = doc2.to(); JsonArrayConst array2c = array2; diff --git a/extras/tests/JsonArray/isNull.cpp b/extras/tests/JsonArray/isNull.cpp index b88c7839..b86de557 100644 --- a/extras/tests/JsonArray/isNull.cpp +++ b/extras/tests/JsonArray/isNull.cpp @@ -12,7 +12,7 @@ TEST_CASE("JsonArray::isNull()") { } SECTION("returns false") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray arr = doc.to(); REQUIRE(arr.isNull() == false); } @@ -25,7 +25,7 @@ TEST_CASE("JsonArrayConst::isNull()") { } SECTION("returns false") { - JsonDocument doc(4096); + JsonDocument doc; JsonArrayConst arr = doc.to(); REQUIRE(arr.isNull() == false); } @@ -38,7 +38,7 @@ TEST_CASE("JsonArray::operator bool()") { } SECTION("returns true") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray arr = doc.to(); REQUIRE(static_cast(arr) == true); } @@ -51,7 +51,7 @@ TEST_CASE("JsonArrayConst::operator bool()") { } SECTION("returns true") { - JsonDocument doc(4096); + JsonDocument doc; JsonArrayConst arr = doc.to(); REQUIRE(static_cast(arr) == true); } diff --git a/extras/tests/JsonArray/iterator.cpp b/extras/tests/JsonArray/iterator.cpp index 1c148a56..fa3ee545 100644 --- a/extras/tests/JsonArray/iterator.cpp +++ b/extras/tests/JsonArray/iterator.cpp @@ -5,11 +5,9 @@ #include #include -using ArduinoJson::detail::sizeofArray; - template static void run_iterator_test() { - JsonDocument doc(sizeofArray(2)); + JsonDocument doc; JsonArray tmp = doc.to(); tmp.add(12); tmp.add(34); diff --git a/extras/tests/JsonArray/memoryUsage.cpp b/extras/tests/JsonArray/memoryUsage.cpp index 36857844..6519bdda 100644 --- a/extras/tests/JsonArray/memoryUsage.cpp +++ b/extras/tests/JsonArray/memoryUsage.cpp @@ -10,7 +10,7 @@ using ArduinoJson::detail::sizeofObject; using ArduinoJson::detail::sizeofString; TEST_CASE("JsonArray::memoryUsage()") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray arr = doc.to(); SECTION("return 0 if uninitialized") { diff --git a/extras/tests/JsonArray/nesting.cpp b/extras/tests/JsonArray/nesting.cpp index b00cb5ed..22ec70a3 100644 --- a/extras/tests/JsonArray/nesting.cpp +++ b/extras/tests/JsonArray/nesting.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonArray::nesting()") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray arr = doc.to(); SECTION("return 0 if uninitialized") { diff --git a/extras/tests/JsonArray/remove.cpp b/extras/tests/JsonArray/remove.cpp index f582b912..4e002c59 100644 --- a/extras/tests/JsonArray/remove.cpp +++ b/extras/tests/JsonArray/remove.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonArray::remove()") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); array.add(1); array.add(2); diff --git a/extras/tests/JsonArray/size.cpp b/extras/tests/JsonArray/size.cpp index 9036740e..7919f11e 100644 --- a/extras/tests/JsonArray/size.cpp +++ b/extras/tests/JsonArray/size.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonArray::size()") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); SECTION("returns 0 is empty") { diff --git a/extras/tests/JsonArray/std_string.cpp b/extras/tests/JsonArray/std_string.cpp index 47bd18ac..13e7f541 100644 --- a/extras/tests/JsonArray/std_string.cpp +++ b/extras/tests/JsonArray/std_string.cpp @@ -12,7 +12,7 @@ static void eraseString(std::string& str) { } TEST_CASE("std::string") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); SECTION("add()") { diff --git a/extras/tests/JsonArray/subscript.cpp b/extras/tests/JsonArray/subscript.cpp index 1f24d450..e6ef264b 100644 --- a/extras/tests/JsonArray/subscript.cpp +++ b/extras/tests/JsonArray/subscript.cpp @@ -10,7 +10,7 @@ using ArduinoJson::detail::sizeofArray; using ArduinoJson::detail::sizeofString; TEST_CASE("JsonArray::operator[]") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); SECTION("Pad with null") { @@ -68,7 +68,7 @@ TEST_CASE("JsonArray::operator[]") { } SECTION("nested array") { - JsonDocument doc2(4096); + JsonDocument doc2; JsonArray arr2 = doc2.to(); array[0] = arr2; @@ -79,7 +79,7 @@ TEST_CASE("JsonArray::operator[]") { } SECTION("nested object") { - JsonDocument doc2(4096); + JsonDocument doc2; JsonObject obj = doc2.to(); array[0] = obj; @@ -90,7 +90,7 @@ TEST_CASE("JsonArray::operator[]") { } SECTION("array subscript") { - JsonDocument doc2(4096); + JsonDocument doc2; JsonArray arr2 = doc2.to(); const char* str = "hello"; @@ -103,7 +103,7 @@ TEST_CASE("JsonArray::operator[]") { SECTION("object subscript") { const char* str = "hello"; - JsonDocument doc2(4096); + JsonDocument doc2; JsonObject obj = doc2.to(); obj["x"] = str; @@ -162,7 +162,7 @@ TEST_CASE("JsonArray::operator[]") { } TEST_CASE("JsonArrayConst::operator[]") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); array.add(0); diff --git a/extras/tests/JsonDeserializer/array.cpp b/extras/tests/JsonDeserializer/array.cpp index 4b897644..55180ce7 100644 --- a/extras/tests/JsonDeserializer/array.cpp +++ b/extras/tests/JsonDeserializer/array.cpp @@ -8,11 +8,10 @@ #include "Allocators.hpp" using ArduinoJson::detail::sizeofArray; -using ArduinoJson::detail::sizeofObject; using ArduinoJson::detail::sizeofString; TEST_CASE("deserialize JSON array") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("An empty array") { DeserializationError err = deserializeJson(doc, "[]"); @@ -260,7 +259,7 @@ TEST_CASE("deserialize JSON array") { TEST_CASE("deserialize JSON array under memory constraints") { TimebombAllocator allocator(100); - JsonDocument doc(0, &allocator); + JsonDocument doc(&allocator); SECTION("empty array requires no allocation") { allocator.setCountdown(0); diff --git a/extras/tests/JsonDeserializer/filter.cpp b/extras/tests/JsonDeserializer/filter.cpp index c6182965..7116402e 100644 --- a/extras/tests/JsonDeserializer/filter.cpp +++ b/extras/tests/JsonDeserializer/filter.cpp @@ -689,8 +689,8 @@ TEST_CASE("Filtering") { for (size_t i = 0; i < sizeof(testCases) / sizeof(testCases[0]); i++) { CAPTURE(i); - JsonDocument filter(256); - JsonDocument doc(256); + JsonDocument filter; + JsonDocument doc; TestCase& tc = testCases[i]; CAPTURE(tc.filter); @@ -710,10 +710,10 @@ TEST_CASE("Filtering") { TEST_CASE("Zero-copy mode") { // issue #1697 char input[] = "{\"include\":42,\"exclude\":666}"; - JsonDocument filter(256); + JsonDocument filter; filter["include"] = true; - JsonDocument doc(256); + JsonDocument doc; DeserializationError err = deserializeJson(doc, input, DeserializationOption::Filter(filter)); @@ -722,8 +722,8 @@ TEST_CASE("Zero-copy mode") { // issue #1697 } TEST_CASE("Overloads") { - JsonDocument doc(256); - JsonDocument filter(256); + JsonDocument doc; + JsonDocument filter; using namespace DeserializationOption; diff --git a/extras/tests/JsonDeserializer/incomplete_input.cpp b/extras/tests/JsonDeserializer/incomplete_input.cpp index 65a96096..174120fe 100644 --- a/extras/tests/JsonDeserializer/incomplete_input.cpp +++ b/extras/tests/JsonDeserializer/incomplete_input.cpp @@ -18,7 +18,7 @@ TEST_CASE("Truncated JSON input") { "{", "{a", "{a:", "{a:1", "{a:1,", "{a:1,"}; const size_t testCount = sizeof(testCases) / sizeof(testCases[0]); - JsonDocument doc(4096); + JsonDocument doc; for (size_t i = 0; i < testCount; i++) { const char* input = testCases[i]; diff --git a/extras/tests/JsonDeserializer/input_types.cpp b/extras/tests/JsonDeserializer/input_types.cpp index 7c88be9a..886c5207 100644 --- a/extras/tests/JsonDeserializer/input_types.cpp +++ b/extras/tests/JsonDeserializer/input_types.cpp @@ -13,7 +13,7 @@ using ArduinoJson::detail::sizeofObject; using ArduinoJson::detail::sizeofString; TEST_CASE("deserializeJson(char*)") { - JsonDocument doc(1024); + JsonDocument doc; char input[] = "{\"hello\":\"world\"}"; @@ -24,7 +24,7 @@ TEST_CASE("deserializeJson(char*)") { } TEST_CASE("deserializeJson(unsigned char*, unsigned int)") { // issue #1897 - JsonDocument doc(1024); + JsonDocument doc; unsigned char input[] = "{\"hello\":\"world\"}"; unsigned char* input_ptr = input; @@ -36,7 +36,7 @@ TEST_CASE("deserializeJson(unsigned char*, unsigned int)") { // issue #1897 } TEST_CASE("deserializeJson(uint8_t*, size_t)") { // issue #1898 - JsonDocument doc(1024); + JsonDocument doc; uint8_t input[] = "{\"hello\":\"world\"}"; uint8_t* input_ptr = input; @@ -48,7 +48,7 @@ TEST_CASE("deserializeJson(uint8_t*, size_t)") { // issue #1898 } TEST_CASE("deserializeJson(const std::string&)") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("should accept const string") { const std::string input("[42]"); @@ -77,7 +77,7 @@ TEST_CASE("deserializeJson(const std::string&)") { } TEST_CASE("deserializeJson(std::istream&)") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("array") { std::istringstream json(" [ 42 ] "); @@ -148,7 +148,7 @@ TEST_CASE("deserializeJson(VLA)") { char vla[i]; strcpy(vla, "{\"a\":42}"); - JsonDocument doc(sizeofObject(1)); + JsonDocument doc; DeserializationError err = deserializeJson(doc, vla); REQUIRE(err == DeserializationError::Ok); @@ -156,7 +156,7 @@ TEST_CASE("deserializeJson(VLA)") { #endif TEST_CASE("deserializeJson(CustomReader)") { - JsonDocument doc(4096); + JsonDocument doc; CustomReader reader("[4,2]"); DeserializationError err = deserializeJson(doc, reader); @@ -167,10 +167,10 @@ TEST_CASE("deserializeJson(CustomReader)") { } TEST_CASE("deserializeJson(JsonDocument&, MemberProxy)") { - JsonDocument doc1(4096); + JsonDocument doc1; doc1["payload"] = "[4,2]"; - JsonDocument doc2(4096); + JsonDocument doc2; DeserializationError err = deserializeJson(doc2, doc1["payload"]); REQUIRE(err == DeserializationError::Ok); @@ -180,10 +180,10 @@ TEST_CASE("deserializeJson(JsonDocument&, MemberProxy)") { } TEST_CASE("deserializeJson(JsonDocument&, JsonVariant)") { - JsonDocument doc1(4096); + JsonDocument doc1; doc1["payload"] = "[4,2]"; - JsonDocument doc2(4096); + JsonDocument doc2; DeserializationError err = deserializeJson(doc2, doc1["payload"].as()); @@ -194,10 +194,10 @@ TEST_CASE("deserializeJson(JsonDocument&, JsonVariant)") { } TEST_CASE("deserializeJson(JsonDocument&, JsonVariantConst)") { - JsonDocument doc1(4096); + JsonDocument doc1; doc1["payload"] = "[4,2]"; - JsonDocument doc2(4096); + JsonDocument doc2; DeserializationError err = deserializeJson(doc2, doc1["payload"].as()); @@ -208,10 +208,10 @@ TEST_CASE("deserializeJson(JsonDocument&, JsonVariantConst)") { } TEST_CASE("deserializeJson(JsonDocument&, ElementProxy)") { - JsonDocument doc1(4096); + JsonDocument doc1; doc1[0] = "[4,2]"; - JsonDocument doc2(4096); + JsonDocument doc2; DeserializationError err = deserializeJson(doc2, doc1[0]); REQUIRE(err == DeserializationError::Ok); diff --git a/extras/tests/JsonDeserializer/invalid_input.cpp b/extras/tests/JsonDeserializer/invalid_input.cpp index cb714fd1..1e12a8b2 100644 --- a/extras/tests/JsonDeserializer/invalid_input.cpp +++ b/extras/tests/JsonDeserializer/invalid_input.cpp @@ -13,7 +13,7 @@ TEST_CASE("Invalid JSON input") { "3}"}; const size_t testCount = sizeof(testCases) / sizeof(testCases[0]); - JsonDocument doc(4096); + JsonDocument doc; for (size_t i = 0; i < testCount; i++) { const char* input = testCases[i]; @@ -30,7 +30,7 @@ TEST_CASE("Invalid JSON input that should pass") { }; const size_t testCount = sizeof(testCases) / sizeof(testCases[0]); - JsonDocument doc(4096); + JsonDocument doc; for (size_t i = 0; i < testCount; i++) { const char* input = testCases[i]; diff --git a/extras/tests/JsonDeserializer/misc.cpp b/extras/tests/JsonDeserializer/misc.cpp index d9feccce..1dd6867d 100644 --- a/extras/tests/JsonDeserializer/misc.cpp +++ b/extras/tests/JsonDeserializer/misc.cpp @@ -10,7 +10,7 @@ using namespace Catch::Matchers; using ArduinoJson::detail::sizeofObject; TEST_CASE("deserializeJson(JsonDocument&)") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("Edge cases") { SECTION("null char*") { diff --git a/extras/tests/JsonDeserializer/nestingLimit.cpp b/extras/tests/JsonDeserializer/nestingLimit.cpp index 90ef59b1..0e5ca1ef 100644 --- a/extras/tests/JsonDeserializer/nestingLimit.cpp +++ b/extras/tests/JsonDeserializer/nestingLimit.cpp @@ -12,7 +12,7 @@ REQUIRE(DeserializationError::TooDeep == expression); TEST_CASE("JsonDeserializer nesting") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("Input = const char*") { SECTION("limit = 0") { diff --git a/extras/tests/JsonDeserializer/number.cpp b/extras/tests/JsonDeserializer/number.cpp index 884a01f3..7158f4f4 100644 --- a/extras/tests/JsonDeserializer/number.cpp +++ b/extras/tests/JsonDeserializer/number.cpp @@ -16,7 +16,7 @@ using ArduinoJson::detail::isnan; } // namespace my TEST_CASE("deserialize an integer") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("Integer") { SECTION("0") { diff --git a/extras/tests/JsonDeserializer/object.cpp b/extras/tests/JsonDeserializer/object.cpp index cd57d507..ad23b07b 100644 --- a/extras/tests/JsonDeserializer/object.cpp +++ b/extras/tests/JsonDeserializer/object.cpp @@ -7,12 +7,11 @@ #include "Allocators.hpp" -using ArduinoJson::detail::sizeofArray; using ArduinoJson::detail::sizeofObject; using ArduinoJson::detail::sizeofString; TEST_CASE("deserialize JSON object") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("An empty object") { DeserializationError err = deserializeJson(doc, "{}"); @@ -323,7 +322,7 @@ TEST_CASE("deserialize JSON object") { TEST_CASE("deserialize JSON object under memory constraints") { TimebombAllocator allocator(1024); - JsonDocument doc(0, &allocator); + JsonDocument doc(&allocator); SECTION("empty object requires no allocation") { allocator.setCountdown(0); diff --git a/extras/tests/JsonDeserializer/string.cpp b/extras/tests/JsonDeserializer/string.cpp index 24c6bfa0..3c9e400c 100644 --- a/extras/tests/JsonDeserializer/string.cpp +++ b/extras/tests/JsonDeserializer/string.cpp @@ -41,7 +41,7 @@ TEST_CASE("Valid JSON strings value") { }; const size_t testCount = sizeof(testCases) / sizeof(testCases[0]); - JsonDocument doc(4096); + JsonDocument doc; for (size_t i = 0; i < testCount; i++) { const TestCase& testCase = testCases[i]; @@ -53,7 +53,7 @@ TEST_CASE("Valid JSON strings value") { } TEST_CASE("\\u0000") { - JsonDocument doc(200); + JsonDocument doc; DeserializationError err = deserializeJson(doc, "\"wx\\u0000yz\""); REQUIRE(err == DeserializationError::Ok); @@ -74,7 +74,7 @@ TEST_CASE("Truncated JSON string") { const char* testCases[] = {"\"hello", "\'hello", "'\\u", "'\\u00", "'\\u000"}; const size_t testCount = sizeof(testCases) / sizeof(testCases[0]); - JsonDocument doc(4096); + JsonDocument doc; for (size_t i = 0; i < testCount; i++) { const char* input = testCases[i]; @@ -89,7 +89,7 @@ TEST_CASE("Invalid JSON string") { "'\\u000G'", "'\\u000/'", "'\\x1234'"}; const size_t testCount = sizeof(testCases) / sizeof(testCases[0]); - JsonDocument doc(4096); + JsonDocument doc; for (size_t i = 0; i < testCount; i++) { const char* input = testCases[i]; @@ -101,7 +101,7 @@ TEST_CASE("Invalid JSON string") { TEST_CASE("Allocation of the key fails") { TimebombAllocator timebombAllocator(0); SpyingAllocator spyingAllocator(&timebombAllocator); - JsonDocument doc(1024, &spyingAllocator); + JsonDocument doc(&spyingAllocator); SECTION("Quoted string, first member") { REQUIRE(deserializeJson(doc, "{\"example\":1}") == @@ -146,7 +146,7 @@ TEST_CASE("Allocation of the key fails") { TEST_CASE("String allocation fails") { SpyingAllocator spyingAllocator(FailingAllocator::instance()); - JsonDocument doc(0, &spyingAllocator); + JsonDocument doc(&spyingAllocator); SECTION("Input is const char*") { REQUIRE(deserializeJson(doc, "\"hello\"") == @@ -157,7 +157,7 @@ TEST_CASE("String allocation fails") { } TEST_CASE("Deduplicate values") { - JsonDocument doc(1024); + JsonDocument doc; deserializeJson(doc, "[\"example\",\"example\"]"); CHECK(doc.memoryUsage() == sizeofArray(2) + sizeofString(7)); @@ -165,7 +165,7 @@ TEST_CASE("Deduplicate values") { } TEST_CASE("Deduplicate keys") { - JsonDocument doc(1024); + JsonDocument doc; deserializeJson(doc, "[{\"example\":1},{\"example\":2}]"); CHECK(doc.memoryUsage() == diff --git a/extras/tests/JsonDocument/ElementProxy.cpp b/extras/tests/JsonDocument/ElementProxy.cpp index 484fc845..d896e3a1 100644 --- a/extras/tests/JsonDocument/ElementProxy.cpp +++ b/extras/tests/JsonDocument/ElementProxy.cpp @@ -9,7 +9,7 @@ typedef ArduinoJson::detail::ElementProxy ElementProxy; using ArduinoJson::detail::sizeofString; TEST_CASE("ElementProxy::add()") { - JsonDocument doc(4096); + JsonDocument doc; doc.add(); ElementProxy ep = doc[0]; @@ -35,7 +35,7 @@ TEST_CASE("ElementProxy::add()") { } TEST_CASE("ElementProxy::clear()") { - JsonDocument doc(4096); + JsonDocument doc; doc.add(); ElementProxy ep = doc[0]; @@ -55,7 +55,7 @@ TEST_CASE("ElementProxy::clear()") { } TEST_CASE("ElementProxy::operator==()") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("1 vs 1") { doc.add(1); @@ -95,7 +95,7 @@ TEST_CASE("ElementProxy::operator==()") { } TEST_CASE("ElementProxy::remove()") { - JsonDocument doc(4096); + JsonDocument doc; doc.add(); ElementProxy ep = doc[0]; @@ -143,7 +143,7 @@ TEST_CASE("ElementProxy::remove()") { } TEST_CASE("ElementProxy::set()") { - JsonDocument doc(4096); + JsonDocument doc; ElementProxy ep = doc[0]; SECTION("set(int)") { @@ -168,7 +168,7 @@ TEST_CASE("ElementProxy::set()") { } TEST_CASE("ElementProxy::size()") { - JsonDocument doc(4096); + JsonDocument doc; doc.add(); ElementProxy ep = doc[0]; @@ -190,7 +190,7 @@ TEST_CASE("ElementProxy::size()") { } TEST_CASE("ElementProxy::memoryUsage()") { - JsonDocument doc(4096); + JsonDocument doc; doc.add(); ElementProxy ep = doc[0]; @@ -205,7 +205,7 @@ TEST_CASE("ElementProxy::memoryUsage()") { } TEST_CASE("ElementProxy::operator[]") { - JsonDocument doc(4096); + JsonDocument doc; ElementProxy ep = doc[1]; SECTION("set member") { @@ -222,7 +222,7 @@ TEST_CASE("ElementProxy::operator[]") { } TEST_CASE("ElementProxy cast to JsonVariantConst") { - JsonDocument doc(4096); + JsonDocument doc; doc[0] = "world"; const ElementProxy ep = doc[0]; @@ -233,7 +233,7 @@ TEST_CASE("ElementProxy cast to JsonVariantConst") { } TEST_CASE("ElementProxy cast to JsonVariant") { - JsonDocument doc(4096); + JsonDocument doc; doc[0] = "world"; ElementProxy ep = doc[0]; diff --git a/extras/tests/JsonDocument/MemberProxy.cpp b/extras/tests/JsonDocument/MemberProxy.cpp index f1956b54..7294fd66 100644 --- a/extras/tests/JsonDocument/MemberProxy.cpp +++ b/extras/tests/JsonDocument/MemberProxy.cpp @@ -18,7 +18,7 @@ typedef ArduinoJson::detail::MemberProxy MemberProxy; TEST_CASE("MemberProxy::add()") { - JsonDocument doc(4096); + JsonDocument doc; MemberProxy mp = doc["hello"]; SECTION("add(int)") { @@ -35,7 +35,7 @@ TEST_CASE("MemberProxy::add()") { } TEST_CASE("MemberProxy::clear()") { - JsonDocument doc(4096); + JsonDocument doc; MemberProxy mp = doc["hello"]; SECTION("size goes back to zero") { @@ -54,7 +54,7 @@ TEST_CASE("MemberProxy::clear()") { } TEST_CASE("MemberProxy::operator==()") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("1 vs 1") { doc["a"] = 1; @@ -94,7 +94,7 @@ TEST_CASE("MemberProxy::operator==()") { } TEST_CASE("MemberProxy::containsKey()") { - JsonDocument doc(4096); + JsonDocument doc; MemberProxy mp = doc["hello"]; SECTION("containsKey(const char*)") { @@ -113,7 +113,7 @@ TEST_CASE("MemberProxy::containsKey()") { } TEST_CASE("MemberProxy::operator|()") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("const char*") { doc["a"] = "hello"; @@ -136,7 +136,7 @@ TEST_CASE("MemberProxy::operator|()") { JsonObject object = doc.to(); object["hello"] = "world"; - JsonDocument emptyDoc(0); + JsonDocument emptyDoc; JsonObject anotherObject = object["hello"] | emptyDoc.to(); REQUIRE(anotherObject.isNull() == false); @@ -145,7 +145,7 @@ TEST_CASE("MemberProxy::operator|()") { } TEST_CASE("MemberProxy::remove()") { - JsonDocument doc(4096); + JsonDocument doc; MemberProxy mp = doc["hello"]; SECTION("remove(int)") { @@ -192,7 +192,7 @@ TEST_CASE("MemberProxy::remove()") { } TEST_CASE("MemberProxy::set()") { - JsonDocument doc(4096); + JsonDocument doc; MemberProxy mp = doc["hello"]; SECTION("set(int)") { @@ -217,7 +217,7 @@ TEST_CASE("MemberProxy::set()") { } TEST_CASE("MemberProxy::size()") { - JsonDocument doc(4096); + JsonDocument doc; MemberProxy mp = doc["hello"]; SECTION("returns 0") { @@ -240,7 +240,7 @@ TEST_CASE("MemberProxy::size()") { } TEST_CASE("MemberProxy::memoryUsage()") { - JsonDocument doc(4096); + JsonDocument doc; MemberProxy mp = doc["hello"]; SECTION("returns 0 when null") { @@ -254,7 +254,7 @@ TEST_CASE("MemberProxy::memoryUsage()") { } TEST_CASE("MemberProxy::operator[]") { - JsonDocument doc(4096); + JsonDocument doc; MemberProxy mp = doc["hello"]; SECTION("set member") { @@ -271,7 +271,7 @@ TEST_CASE("MemberProxy::operator[]") { } TEST_CASE("MemberProxy cast to JsonVariantConst") { - JsonDocument doc(4096); + JsonDocument doc; doc["hello"] = "world"; const MemberProxy mp = doc["hello"]; @@ -282,7 +282,7 @@ TEST_CASE("MemberProxy cast to JsonVariantConst") { } TEST_CASE("MemberProxy cast to JsonVariant") { - JsonDocument doc(4096); + JsonDocument doc; doc["hello"] = "world"; MemberProxy mp = doc["hello"]; @@ -297,7 +297,7 @@ TEST_CASE("MemberProxy cast to JsonVariant") { } TEST_CASE("MemberProxy::createNestedArray()") { - JsonDocument doc(1024); + JsonDocument doc; JsonArray arr = doc["items"].createNestedArray(); arr.add(42); @@ -305,7 +305,7 @@ TEST_CASE("MemberProxy::createNestedArray()") { } TEST_CASE("MemberProxy::createNestedArray(key)") { - JsonDocument doc(1024); + JsonDocument doc; JsonArray arr = doc["weather"].createNestedArray("temp"); arr.add(42); @@ -313,7 +313,7 @@ TEST_CASE("MemberProxy::createNestedArray(key)") { } TEST_CASE("MemberProxy::createNestedObject()") { - JsonDocument doc(1024); + JsonDocument doc; JsonObject obj = doc["items"].createNestedObject(); obj["value"] = 42; @@ -321,7 +321,7 @@ TEST_CASE("MemberProxy::createNestedObject()") { } TEST_CASE("MemberProxy::createNestedObject(key)") { - JsonDocument doc(1024); + JsonDocument doc; JsonObject obj = doc["status"].createNestedObject("weather"); obj["temp"] = 42; @@ -329,7 +329,7 @@ TEST_CASE("MemberProxy::createNestedObject(key)") { } TEST_CASE("Deduplicate keys") { - JsonDocument doc(1024); + JsonDocument doc; SECTION("std::string") { doc[0][std::string("example")] = 1; @@ -383,7 +383,7 @@ TEST_CASE("Deduplicate keys") { TEST_CASE("MemberProxy under memory constraints") { ControllableAllocator allocator; - JsonDocument doc(4096, &allocator); + JsonDocument doc(&allocator); SECTION("key allocation fails") { allocator.disable(); diff --git a/extras/tests/JsonDocument/add.cpp b/extras/tests/JsonDocument/add.cpp index 98c082e3..6a628a25 100644 --- a/extras/tests/JsonDocument/add.cpp +++ b/extras/tests/JsonDocument/add.cpp @@ -12,7 +12,7 @@ using ArduinoJson::detail::sizeofArray; using ArduinoJson::detail::sizeofString; TEST_CASE("JsonDocument::add()") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("integer") { doc.add(42); diff --git a/extras/tests/JsonDocument/assignment.cpp b/extras/tests/JsonDocument/assignment.cpp index 58296509..2fd55951 100644 --- a/extras/tests/JsonDocument/assignment.cpp +++ b/extras/tests/JsonDocument/assignment.cpp @@ -7,17 +7,15 @@ #include "Allocators.hpp" -using ArduinoJson::detail::sizeofArray; -using ArduinoJson::detail::sizeofObject; using ArduinoJson::detail::sizeofString; TEST_CASE("JsonDocument assignment") { SpyingAllocator spyingAllocator; SECTION("Copy assignment same capacity") { - JsonDocument doc1(1024, &spyingAllocator); + JsonDocument doc1(&spyingAllocator); deserializeJson(doc1, "{\"hello\":\"world\"}"); - JsonDocument doc2(1024, &spyingAllocator); + JsonDocument doc2(&spyingAllocator); spyingAllocator.clearLog(); doc2 = doc1; @@ -33,10 +31,9 @@ TEST_CASE("JsonDocument assignment") { } SECTION("Copy assignment reallocates when capacity is smaller") { - const size_t capacity = 100 * sizeof(ArduinoJson::detail::VariantSlot); - JsonDocument doc1(capacity, &spyingAllocator); + JsonDocument doc1(&spyingAllocator); deserializeJson(doc1, "[{\"hello\":\"world\"}]"); - JsonDocument doc2(sizeofArray(1), &spyingAllocator); + JsonDocument doc2(&spyingAllocator); spyingAllocator.clearLog(); doc2 = doc1; @@ -51,10 +48,9 @@ TEST_CASE("JsonDocument assignment") { } SECTION("Copy assignment reallocates when capacity is larger") { - const size_t capacity1 = 100 * sizeof(ArduinoJson::detail::VariantSlot); - JsonDocument doc1(capacity1, &spyingAllocator); + JsonDocument doc1(&spyingAllocator); deserializeJson(doc1, "{\"hello\":\"world\"}"); - JsonDocument doc2(4096, &spyingAllocator); + JsonDocument doc2(&spyingAllocator); spyingAllocator.clearLog(); doc2 = doc1; @@ -70,9 +66,9 @@ TEST_CASE("JsonDocument assignment") { SECTION("Move assign") { { - JsonDocument doc1(4096, &spyingAllocator); + JsonDocument doc1(&spyingAllocator); doc1[std::string("hello")] = std::string("world"); - JsonDocument doc2(128, &spyingAllocator); + JsonDocument doc2(&spyingAllocator); doc2 = std::move(doc1); @@ -92,52 +88,52 @@ TEST_CASE("JsonDocument assignment") { } SECTION("Assign from JsonObject") { - JsonDocument doc1(200); + JsonDocument doc1; JsonObject obj = doc1.to(); obj["hello"] = "world"; - JsonDocument doc2(4096); + JsonDocument doc2; doc2 = obj; REQUIRE(doc2.as() == "{\"hello\":\"world\"}"); } SECTION("Assign from JsonArray") { - JsonDocument doc1(200); + JsonDocument doc1; JsonArray arr = doc1.to(); arr.add("hello"); - JsonDocument doc2(4096); + JsonDocument doc2; doc2 = arr; REQUIRE(doc2.as() == "[\"hello\"]"); } SECTION("Assign from JsonVariant") { - JsonDocument doc1(200); + JsonDocument doc1; deserializeJson(doc1, "42"); - JsonDocument doc2(4096); + JsonDocument doc2; doc2 = doc1.as(); REQUIRE(doc2.as() == "42"); } SECTION("Assign from MemberProxy") { - JsonDocument doc1(200); + JsonDocument doc1; doc1["value"] = 42; - JsonDocument doc2(4096); + JsonDocument doc2; doc2 = doc1["value"]; REQUIRE(doc2.as() == "42"); } SECTION("Assign from ElementProxy") { - JsonDocument doc1(200); + JsonDocument doc1; doc1[0] = 42; - JsonDocument doc2(4096); + JsonDocument doc2; doc2 = doc1[0]; REQUIRE(doc2.as() == "42"); diff --git a/extras/tests/JsonDocument/cast.cpp b/extras/tests/JsonDocument/cast.cpp index 1f9e45ec..02b9382d 100644 --- a/extras/tests/JsonDocument/cast.cpp +++ b/extras/tests/JsonDocument/cast.cpp @@ -8,7 +8,7 @@ #include TEST_CASE("Implicit cast to JsonVariant") { - JsonDocument doc(128); + JsonDocument doc; doc["hello"] = "world"; diff --git a/extras/tests/JsonDocument/compare.cpp b/extras/tests/JsonDocument/compare.cpp index fad64c2e..76e6187e 100644 --- a/extras/tests/JsonDocument/compare.cpp +++ b/extras/tests/JsonDocument/compare.cpp @@ -6,8 +6,8 @@ #include TEST_CASE("JsonDocument::operator==(const JsonDocument&)") { - JsonDocument doc1(4096); - JsonDocument doc2(4096); + JsonDocument doc1; + JsonDocument doc2; SECTION("Empty") { REQUIRE(doc1 == doc2); diff --git a/extras/tests/JsonDocument/constructor.cpp b/extras/tests/JsonDocument/constructor.cpp index 31db4ff4..a3f9a062 100644 --- a/extras/tests/JsonDocument/constructor.cpp +++ b/extras/tests/JsonDocument/constructor.cpp @@ -8,21 +8,19 @@ #include "Allocators.hpp" using ArduinoJson::detail::addPadding; -using ArduinoJson::detail::sizeofObject; using ArduinoJson::detail::sizeofString; TEST_CASE("JsonDocument constructor") { SpyingAllocator spyingAllocator; SECTION("JsonDocument(size_t)") { - { JsonDocument doc(4096, &spyingAllocator); } + { JsonDocument doc(&spyingAllocator); } REQUIRE(spyingAllocator.log() == AllocatorLog()); } SECTION("JsonDocument(const JsonDocument&)") { - const size_t capacity = 100 * sizeof(ArduinoJson::detail::VariantSlot); { - JsonDocument doc1(capacity, &spyingAllocator); + JsonDocument doc1(&spyingAllocator); doc1.set(std::string("The size of this string is 32!!")); JsonDocument doc2(doc1); @@ -39,7 +37,7 @@ TEST_CASE("JsonDocument constructor") { SECTION("JsonDocument(JsonDocument&&)") { { - JsonDocument doc1(4096, &spyingAllocator); + JsonDocument doc1(&spyingAllocator); doc1.set(std::string("The size of this string is 32!!")); JsonDocument doc2(std::move(doc1)); @@ -53,7 +51,7 @@ TEST_CASE("JsonDocument constructor") { } SECTION("JsonDocument(JsonObject)") { - JsonDocument doc1(200); + JsonDocument doc1; JsonObject obj = doc1.to(); obj["hello"] = "world"; @@ -66,7 +64,7 @@ TEST_CASE("JsonDocument constructor") { } SECTION("Construct from JsonArray") { - JsonDocument doc1(200); + JsonDocument doc1; JsonArray arr = doc1.to(); arr.add("hello"); @@ -79,7 +77,7 @@ TEST_CASE("JsonDocument constructor") { } SECTION("Construct from JsonVariant") { - JsonDocument doc1(200); + JsonDocument doc1; deserializeJson(doc1, "\"hello\""); JsonDocument doc2(doc1.as(), &spyingAllocator); diff --git a/extras/tests/JsonDocument/containsKey.cpp b/extras/tests/JsonDocument/containsKey.cpp index ef0452a8..80173c11 100644 --- a/extras/tests/JsonDocument/containsKey.cpp +++ b/extras/tests/JsonDocument/containsKey.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonDocument::containsKey()") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("returns true on object") { doc["hello"] = "world"; diff --git a/extras/tests/JsonDocument/createNested.cpp b/extras/tests/JsonDocument/createNested.cpp index 2ee2b178..a5f56585 100644 --- a/extras/tests/JsonDocument/createNested.cpp +++ b/extras/tests/JsonDocument/createNested.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonDocument::createNestedArray()") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("promotes to array") { doc.createNestedArray(); @@ -16,7 +16,7 @@ TEST_CASE("JsonDocument::createNestedArray()") { } TEST_CASE("JsonDocument::createNestedArray(key)") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("key is const char*") { SECTION("promotes to object") { @@ -36,7 +36,7 @@ TEST_CASE("JsonDocument::createNestedArray(key)") { } TEST_CASE("JsonDocument::createNestedObject()") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("promotes to array") { doc.createNestedObject(); @@ -46,7 +46,7 @@ TEST_CASE("JsonDocument::createNestedObject()") { } TEST_CASE("JsonDocument::createNestedObject(key)") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("key is const char*") { SECTION("promotes to object") { diff --git a/extras/tests/JsonDocument/garbageCollect.cpp b/extras/tests/JsonDocument/garbageCollect.cpp index 449b0b5c..6f274092 100644 --- a/extras/tests/JsonDocument/garbageCollect.cpp +++ b/extras/tests/JsonDocument/garbageCollect.cpp @@ -13,10 +13,9 @@ using ArduinoJson::detail::sizeofObject; using ArduinoJson::detail::sizeofString; TEST_CASE("JsonDocument::garbageCollect()") { - const size_t capacity = 100 * sizeof(ArduinoJson::detail::VariantSlot); ControllableAllocator controllableAllocator; SpyingAllocator spyingAllocator(&controllableAllocator); - JsonDocument doc(capacity, &spyingAllocator); + JsonDocument doc(&spyingAllocator); SECTION("when allocation succeeds") { deserializeJson(doc, "{\"blanket\":1,\"dancing\":2}"); diff --git a/extras/tests/JsonDocument/isNull.cpp b/extras/tests/JsonDocument/isNull.cpp index b68557f0..8913aaf4 100644 --- a/extras/tests/JsonDocument/isNull.cpp +++ b/extras/tests/JsonDocument/isNull.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonDocument::isNull()") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("returns true if uninitialized") { REQUIRE(doc.isNull() == true); diff --git a/extras/tests/JsonDocument/issue1120.cpp b/extras/tests/JsonDocument/issue1120.cpp index a6c28197..766ecead 100644 --- a/extras/tests/JsonDocument/issue1120.cpp +++ b/extras/tests/JsonDocument/issue1120.cpp @@ -3,7 +3,7 @@ #include TEST_CASE("Issue #1120") { - JsonDocument doc(500); + JsonDocument doc; constexpr char str[] = "{\"contents\":[{\"module\":\"Packet\"},{\"module\":\"Analog\"}]}"; deserializeJson(doc, str); diff --git a/extras/tests/JsonDocument/memoryUsage.cpp b/extras/tests/JsonDocument/memoryUsage.cpp index 41e0393b..e43d8c0d 100644 --- a/extras/tests/JsonDocument/memoryUsage.cpp +++ b/extras/tests/JsonDocument/memoryUsage.cpp @@ -9,7 +9,7 @@ using ArduinoJson::detail::sizeofArray; using ArduinoJson::detail::sizeofObject; TEST_CASE("JsonDocument::memoryUsage()") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("starts at zero") { REQUIRE(doc.memoryUsage() == 0); diff --git a/extras/tests/JsonDocument/nesting.cpp b/extras/tests/JsonDocument/nesting.cpp index 5884fbb8..2f5dd8b8 100644 --- a/extras/tests/JsonDocument/nesting.cpp +++ b/extras/tests/JsonDocument/nesting.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonDocument::nesting()") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("return 0 if uninitialized") { REQUIRE(doc.nesting() == 0); diff --git a/extras/tests/JsonDocument/overflowed.cpp b/extras/tests/JsonDocument/overflowed.cpp index d27dd49f..cd4c0eeb 100644 --- a/extras/tests/JsonDocument/overflowed.cpp +++ b/extras/tests/JsonDocument/overflowed.cpp @@ -7,11 +7,9 @@ #include "Allocators.hpp" -using ArduinoJson::detail::sizeofArray; - TEST_CASE("JsonDocument::overflowed()") { TimebombAllocator allocator(10); - JsonDocument doc(0, &allocator); + JsonDocument doc(&allocator); SECTION("returns false on a fresh object") { allocator.setCountdown(0); diff --git a/extras/tests/JsonDocument/remove.cpp b/extras/tests/JsonDocument/remove.cpp index fcfc7553..b62060a9 100644 --- a/extras/tests/JsonDocument/remove.cpp +++ b/extras/tests/JsonDocument/remove.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonDocument::remove()") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("remove(int)") { doc.add(1); diff --git a/extras/tests/JsonDocument/shrinkToFit.cpp b/extras/tests/JsonDocument/shrinkToFit.cpp index 670954ab..78a5bb42 100644 --- a/extras/tests/JsonDocument/shrinkToFit.cpp +++ b/extras/tests/JsonDocument/shrinkToFit.cpp @@ -42,7 +42,7 @@ class ArmoredAllocator : public Allocator { TEST_CASE("JsonDocument::shrinkToFit()") { ArmoredAllocator armoredAllocator; SpyingAllocator spyingAllocator(&armoredAllocator); - JsonDocument doc(4096, &spyingAllocator); + JsonDocument doc(&spyingAllocator); SECTION("null") { doc.shrinkToFit(); diff --git a/extras/tests/JsonDocument/size.cpp b/extras/tests/JsonDocument/size.cpp index affb0d97..6441bfdb 100644 --- a/extras/tests/JsonDocument/size.cpp +++ b/extras/tests/JsonDocument/size.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonDocument::size()") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("returns 0") { REQUIRE(doc.size() == 0); diff --git a/extras/tests/JsonDocument/subscript.cpp b/extras/tests/JsonDocument/subscript.cpp index 49685f96..4b05039f 100644 --- a/extras/tests/JsonDocument/subscript.cpp +++ b/extras/tests/JsonDocument/subscript.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonDocument::operator[]") { - JsonDocument doc(4096); + JsonDocument doc; const JsonDocument& cdoc = doc; SECTION("object") { @@ -37,7 +37,7 @@ TEST_CASE("JsonDocument::operator[]") { } TEST_CASE("JsonDocument automatically promotes to object") { - JsonDocument doc(4096); + JsonDocument doc; doc["one"]["two"]["three"] = 4; @@ -45,7 +45,7 @@ TEST_CASE("JsonDocument automatically promotes to object") { } TEST_CASE("JsonDocument automatically promotes to array") { - JsonDocument doc(4096); + JsonDocument doc; doc[2] = 2; diff --git a/extras/tests/JsonDocument/swap.cpp b/extras/tests/JsonDocument/swap.cpp index 6dd5af56..35383089 100644 --- a/extras/tests/JsonDocument/swap.cpp +++ b/extras/tests/JsonDocument/swap.cpp @@ -13,7 +13,7 @@ TEST_CASE("std::swap") { } SECTION("JsonDocument") { - JsonDocument doc1(0x10), doc2(0x20); + JsonDocument doc1, doc2; doc1.set("hello"); doc2.set("world"); diff --git a/extras/tests/JsonObject/clear.cpp b/extras/tests/JsonObject/clear.cpp index a207db65..4e337d75 100644 --- a/extras/tests/JsonObject/clear.cpp +++ b/extras/tests/JsonObject/clear.cpp @@ -14,7 +14,7 @@ TEST_CASE("JsonObject::clear()") { } SECTION("Removes all elements") { - JsonDocument doc(64); + JsonDocument doc; JsonObject obj = doc.to(); obj["hello"] = 1; obj["world"] = 2; diff --git a/extras/tests/JsonObject/compare.cpp b/extras/tests/JsonObject/compare.cpp index 9497df91..bb41c7d3 100644 --- a/extras/tests/JsonObject/compare.cpp +++ b/extras/tests/JsonObject/compare.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("Compare JsonObject with JsonObject") { - JsonDocument doc(512); + JsonDocument doc; SECTION("Compare with unbound") { JsonObject object = doc.to(); @@ -82,7 +82,7 @@ TEST_CASE("Compare JsonObject with JsonObject") { } TEST_CASE("Compare JsonObject with JsonVariant") { - JsonDocument doc(512); + JsonDocument doc; SECTION("Compare with self") { JsonObject object = doc.to(); @@ -153,7 +153,7 @@ TEST_CASE("Compare JsonObject with JsonVariant") { } TEST_CASE("Compare JsonObject with JsonVariantConst") { - JsonDocument doc(512); + JsonDocument doc; SECTION("Compare with unbound") { JsonObject object = doc.to(); @@ -247,7 +247,7 @@ TEST_CASE("Compare JsonObject with JsonVariantConst") { } TEST_CASE("Compare JsonObject with JsonObjectConst") { - JsonDocument doc(512); + JsonDocument doc; SECTION("Compare with unbound") { JsonObject object = doc.to(); @@ -347,7 +347,7 @@ TEST_CASE("Compare JsonObject with JsonObjectConst") { } TEST_CASE("Compare JsonObjectConst with JsonObjectConst") { - JsonDocument doc(512); + JsonDocument doc; SECTION("Compare with unbound") { JsonObject object = doc.to(); @@ -430,7 +430,7 @@ TEST_CASE("Compare JsonObjectConst with JsonObjectConst") { } TEST_CASE("Compare JsonObjectConst with JsonVariant") { - JsonDocument doc(512); + JsonDocument doc; SECTION("Compare with self") { JsonObject object = doc.to(); diff --git a/extras/tests/JsonObject/containsKey.cpp b/extras/tests/JsonObject/containsKey.cpp index 25c3d098..4177db7e 100644 --- a/extras/tests/JsonObject/containsKey.cpp +++ b/extras/tests/JsonObject/containsKey.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonObject::containsKey()") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); obj["hello"] = 42; diff --git a/extras/tests/JsonObject/copy.cpp b/extras/tests/JsonObject/copy.cpp index a62815aa..92aaf958 100644 --- a/extras/tests/JsonObject/copy.cpp +++ b/extras/tests/JsonObject/copy.cpp @@ -7,11 +7,9 @@ #include "Allocators.hpp" -using ArduinoJson::detail::sizeofObject; - TEST_CASE("JsonObject::set()") { - JsonDocument doc1(4096); - JsonDocument doc2(4096); + JsonDocument doc1; + JsonDocument doc2; JsonObject obj1 = doc1.to(); JsonObject obj2 = doc2.to(); @@ -77,7 +75,7 @@ TEST_CASE("JsonObject::set()") { SECTION("copy fails in the middle of an object") { TimebombAllocator allocator(3); - JsonDocument doc3(0, &allocator); + JsonDocument doc3(&allocator); JsonObject obj3 = doc3.to(); obj1[std::string("a")] = 1; @@ -91,7 +89,7 @@ TEST_CASE("JsonObject::set()") { SECTION("copy fails in the middle of an array") { TimebombAllocator allocator(2); - JsonDocument doc3(0, &allocator); + JsonDocument doc3(&allocator); JsonObject obj3 = doc3.to(); obj1["hello"][0] = std::string("world"); diff --git a/extras/tests/JsonObject/createNestedArray.cpp b/extras/tests/JsonObject/createNestedArray.cpp index 1a3d76c9..f167508f 100644 --- a/extras/tests/JsonObject/createNestedArray.cpp +++ b/extras/tests/JsonObject/createNestedArray.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonObject::createNestedArray()") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); SECTION("key is a const char*") { diff --git a/extras/tests/JsonObject/createNestedObject.cpp b/extras/tests/JsonObject/createNestedObject.cpp index 6429572b..85501e37 100644 --- a/extras/tests/JsonObject/createNestedObject.cpp +++ b/extras/tests/JsonObject/createNestedObject.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonObject::createNestedObject()") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); SECTION("key is a const char*") { diff --git a/extras/tests/JsonObject/equals.cpp b/extras/tests/JsonObject/equals.cpp index bac93711..5f34f606 100644 --- a/extras/tests/JsonObject/equals.cpp +++ b/extras/tests/JsonObject/equals.cpp @@ -6,11 +6,11 @@ #include TEST_CASE("JsonObject::operator==()") { - JsonDocument doc1(4096); + JsonDocument doc1; JsonObject obj1 = doc1.to(); JsonObjectConst obj1c = obj1; - JsonDocument doc2(4096); + JsonDocument doc2; JsonObject obj2 = doc2.to(); JsonObjectConst obj2c = obj2; diff --git a/extras/tests/JsonObject/isNull.cpp b/extras/tests/JsonObject/isNull.cpp index 8af19b29..2c1e1d21 100644 --- a/extras/tests/JsonObject/isNull.cpp +++ b/extras/tests/JsonObject/isNull.cpp @@ -12,7 +12,7 @@ TEST_CASE("JsonObject::isNull()") { } SECTION("returns false") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); REQUIRE(obj.isNull() == false); } @@ -25,7 +25,7 @@ TEST_CASE("JsonObjectConst::isNull()") { } SECTION("returns false") { - JsonDocument doc(4096); + JsonDocument doc; JsonObjectConst obj = doc.to(); REQUIRE(obj.isNull() == false); } @@ -38,7 +38,7 @@ TEST_CASE("JsonObject::operator bool()") { } SECTION("returns true") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); REQUIRE(static_cast(obj) == true); } @@ -51,7 +51,7 @@ TEST_CASE("JsonObjectConst::operator bool()") { } SECTION("returns true") { - JsonDocument doc(4096); + JsonDocument doc; JsonObjectConst obj = doc.to(); REQUIRE(static_cast(obj) == true); } diff --git a/extras/tests/JsonObject/iterator.cpp b/extras/tests/JsonObject/iterator.cpp index 8530caa0..af20aa57 100644 --- a/extras/tests/JsonObject/iterator.cpp +++ b/extras/tests/JsonObject/iterator.cpp @@ -6,10 +6,9 @@ #include using namespace Catch::Matchers; -using ArduinoJson::detail::sizeofObject; TEST_CASE("JsonObject::begin()/end()") { - JsonDocument doc(sizeofObject(2)); + JsonDocument doc; JsonObject obj = doc.to(); obj["ab"] = 12; obj["cd"] = 34; @@ -39,7 +38,7 @@ TEST_CASE("JsonObject::begin()/end()") { } TEST_CASE("JsonObjectConst::begin()/end()") { - JsonDocument doc(sizeofObject(2)); + JsonDocument doc; JsonObject obj = doc.to(); obj["ab"] = 12; obj["cd"] = 34; diff --git a/extras/tests/JsonObject/memoryUsage.cpp b/extras/tests/JsonObject/memoryUsage.cpp index 2462b85d..7633646f 100644 --- a/extras/tests/JsonObject/memoryUsage.cpp +++ b/extras/tests/JsonObject/memoryUsage.cpp @@ -11,7 +11,7 @@ using ArduinoJson::detail::sizeofObject; using ArduinoJson::detail::sizeofString; TEST_CASE("JsonObject::memoryUsage()") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); SECTION("return 0 if uninitialized") { diff --git a/extras/tests/JsonObject/nesting.cpp b/extras/tests/JsonObject/nesting.cpp index 97b360c4..9992b0a0 100644 --- a/extras/tests/JsonObject/nesting.cpp +++ b/extras/tests/JsonObject/nesting.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonObject::nesting()") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); SECTION("return 0 if uninitialized") { diff --git a/extras/tests/JsonObject/remove.cpp b/extras/tests/JsonObject/remove.cpp index fbd3e76a..3f857e3c 100644 --- a/extras/tests/JsonObject/remove.cpp +++ b/extras/tests/JsonObject/remove.cpp @@ -7,7 +7,7 @@ #include TEST_CASE("JsonObject::remove()") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); obj["a"] = 0; obj["b"] = 1; diff --git a/extras/tests/JsonObject/size.cpp b/extras/tests/JsonObject/size.cpp index 2b084efa..2cfdfdda 100644 --- a/extras/tests/JsonObject/size.cpp +++ b/extras/tests/JsonObject/size.cpp @@ -7,7 +7,7 @@ #include TEST_CASE("JsonObject::size()") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); SECTION("initial size is zero") { diff --git a/extras/tests/JsonObject/std_string.cpp b/extras/tests/JsonObject/std_string.cpp index e177725b..edab1191 100644 --- a/extras/tests/JsonObject/std_string.cpp +++ b/extras/tests/JsonObject/std_string.cpp @@ -12,7 +12,7 @@ static void eraseString(std::string& str) { } TEST_CASE("std::string") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("operator[]") { char json[] = "{\"key\":\"value\"}"; diff --git a/extras/tests/JsonObject/subscript.cpp b/extras/tests/JsonObject/subscript.cpp index 606d16b1..1e7d4214 100644 --- a/extras/tests/JsonObject/subscript.cpp +++ b/extras/tests/JsonObject/subscript.cpp @@ -9,7 +9,7 @@ using ArduinoJson::detail::sizeofObject; using ArduinoJson::detail::sizeofString; TEST_CASE("JsonObject::operator[]") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); SECTION("int") { @@ -54,7 +54,7 @@ TEST_CASE("JsonObject::operator[]") { } SECTION("array") { - JsonDocument doc2(4096); + JsonDocument doc2; JsonArray arr = doc2.to(); obj["hello"] = arr; @@ -65,7 +65,7 @@ TEST_CASE("JsonObject::operator[]") { } SECTION("object") { - JsonDocument doc2(4096); + JsonDocument doc2; JsonObject obj2 = doc2.to(); obj["hello"] = obj2; @@ -76,7 +76,7 @@ TEST_CASE("JsonObject::operator[]") { } SECTION("array subscript") { - JsonDocument doc2(4096); + JsonDocument doc2; JsonArray arr = doc2.to(); arr.add(42); @@ -86,7 +86,7 @@ TEST_CASE("JsonObject::operator[]") { } SECTION("object subscript") { - JsonDocument doc2(4096); + JsonDocument doc2; JsonObject obj2 = doc2.to(); obj2["x"] = 42; diff --git a/extras/tests/JsonSerializer/CustomWriter.cpp b/extras/tests/JsonSerializer/CustomWriter.cpp index ffd87ee2..85748896 100644 --- a/extras/tests/JsonSerializer/CustomWriter.cpp +++ b/extras/tests/JsonSerializer/CustomWriter.cpp @@ -30,7 +30,7 @@ class CustomWriter { }; TEST_CASE("CustomWriter") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); array.add(4); array.add(2); diff --git a/extras/tests/JsonSerializer/JsonArray.cpp b/extras/tests/JsonSerializer/JsonArray.cpp index dd1b8963..f5fa56e3 100644 --- a/extras/tests/JsonSerializer/JsonArray.cpp +++ b/extras/tests/JsonSerializer/JsonArray.cpp @@ -5,8 +5,6 @@ #include #include -using ArduinoJson::detail::sizeofArray; - static void check(JsonArray array, std::string expected) { std::string actual; size_t actualLen = serializeJson(array, actual); @@ -17,7 +15,7 @@ static void check(JsonArray array, std::string expected) { } TEST_CASE("serializeJson(JsonArray)") { - JsonDocument doc(sizeofArray(2)); + JsonDocument doc; JsonArray array = doc.to(); SECTION("Empty") { diff --git a/extras/tests/JsonSerializer/JsonArrayPretty.cpp b/extras/tests/JsonSerializer/JsonArrayPretty.cpp index ddabc76a..cb39943f 100644 --- a/extras/tests/JsonSerializer/JsonArrayPretty.cpp +++ b/extras/tests/JsonSerializer/JsonArrayPretty.cpp @@ -15,7 +15,7 @@ static void checkArray(JsonArray array, std::string expected) { } TEST_CASE("serializeJsonPretty(JsonArray)") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); SECTION("Empty") { diff --git a/extras/tests/JsonSerializer/JsonObject.cpp b/extras/tests/JsonSerializer/JsonObject.cpp index b49c2703..da8cfac9 100644 --- a/extras/tests/JsonSerializer/JsonObject.cpp +++ b/extras/tests/JsonSerializer/JsonObject.cpp @@ -20,7 +20,7 @@ static void checkObject(const JsonObject obj, const std::string& expected) { } TEST_CASE("serializeJson(JsonObject)") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); SECTION("EmptyObject") { @@ -96,8 +96,8 @@ TEST_CASE("serializeJson(JsonObject)") { } SECTION("ThreeNestedArrays") { - JsonDocument b(4096); - JsonDocument c(4096); + JsonDocument b; + JsonDocument c; obj.createNestedArray("a"); obj["b"] = b.to(); @@ -107,8 +107,8 @@ TEST_CASE("serializeJson(JsonObject)") { } SECTION("ThreeNestedObjects") { - JsonDocument b(4096); - JsonDocument c(4096); + JsonDocument b; + JsonDocument c; obj.createNestedObject("a"); obj["b"] = b.to(); diff --git a/extras/tests/JsonSerializer/JsonObjectPretty.cpp b/extras/tests/JsonSerializer/JsonObjectPretty.cpp index 3319137a..d63840e4 100644 --- a/extras/tests/JsonSerializer/JsonObjectPretty.cpp +++ b/extras/tests/JsonSerializer/JsonObjectPretty.cpp @@ -19,7 +19,7 @@ static void checkObjectPretty(const JsonObject obj, } TEST_CASE("serializeJsonPretty(JsonObject)") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); SECTION("EmptyObject") { diff --git a/extras/tests/JsonSerializer/JsonVariant.cpp b/extras/tests/JsonSerializer/JsonVariant.cpp index 8c07269c..80c01f78 100644 --- a/extras/tests/JsonSerializer/JsonVariant.cpp +++ b/extras/tests/JsonSerializer/JsonVariant.cpp @@ -8,7 +8,7 @@ template void check(T value, const std::string& expected) { - JsonDocument doc(4096); + JsonDocument doc; doc.to().set(value); char buffer[256] = ""; size_t returnValue = serializeJson(doc, buffer, sizeof(buffer)); diff --git a/extras/tests/JsonSerializer/misc.cpp b/extras/tests/JsonSerializer/misc.cpp index a0b01af1..46d7da5a 100644 --- a/extras/tests/JsonSerializer/misc.cpp +++ b/extras/tests/JsonSerializer/misc.cpp @@ -3,7 +3,7 @@ #include TEST_CASE("serializeJson(MemberProxy)") { - JsonDocument doc(4096); + JsonDocument doc; deserializeJson(doc, "{\"hello\":42}"); JsonObject obj = doc.as(); std::string result; @@ -14,7 +14,7 @@ TEST_CASE("serializeJson(MemberProxy)") { } TEST_CASE("serializeJson(ElementProxy)") { - JsonDocument doc(4096); + JsonDocument doc; deserializeJson(doc, "[42]"); JsonArray arr = doc.as(); std::string result; @@ -25,7 +25,7 @@ TEST_CASE("serializeJson(ElementProxy)") { } TEST_CASE("serializeJson(JsonVariantSubscript)") { - JsonDocument doc(4096); + JsonDocument doc; deserializeJson(doc, "[42]"); JsonVariant var = doc.as(); std::string result; diff --git a/extras/tests/JsonSerializer/std_stream.cpp b/extras/tests/JsonSerializer/std_stream.cpp index 5fb6a25e..f2540b24 100644 --- a/extras/tests/JsonSerializer/std_stream.cpp +++ b/extras/tests/JsonSerializer/std_stream.cpp @@ -7,7 +7,7 @@ #include TEST_CASE("operator<<(std::ostream)") { - JsonDocument doc(4096); + JsonDocument doc; std::ostringstream os; SECTION("JsonVariant containing false") { diff --git a/extras/tests/JsonSerializer/std_string.cpp b/extras/tests/JsonSerializer/std_string.cpp index bf452093..d669678d 100644 --- a/extras/tests/JsonSerializer/std_string.cpp +++ b/extras/tests/JsonSerializer/std_string.cpp @@ -8,7 +8,7 @@ using ArduinoJson::detail::sizeofString; TEST_CASE("serialize JsonArray to std::string") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray array = doc.to(); array.add(4); array.add(2); @@ -29,7 +29,7 @@ TEST_CASE("serialize JsonArray to std::string") { } TEST_CASE("serialize JsonObject to std::string") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); obj["key"] = "value"; @@ -49,7 +49,7 @@ TEST_CASE("serialize JsonObject to std::string") { } TEST_CASE("serialize an std::string containing a NUL") { - JsonDocument doc(256); + JsonDocument doc; doc.set(std::string("hello\0world", 11)); CHECK(doc.memoryUsage() == sizeofString(11)); diff --git a/extras/tests/JsonVariant/add.cpp b/extras/tests/JsonVariant/add.cpp index bda1d617..140784a8 100644 --- a/extras/tests/JsonVariant/add.cpp +++ b/extras/tests/JsonVariant/add.cpp @@ -7,7 +7,7 @@ #include TEST_CASE("JsonVariant::add()") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant var = doc.to(); SECTION("add integer to new variant") { diff --git a/extras/tests/JsonVariant/as.cpp b/extras/tests/JsonVariant/as.cpp index 0725d026..ad9b7988 100644 --- a/extras/tests/JsonVariant/as.cpp +++ b/extras/tests/JsonVariant/as.cpp @@ -15,7 +15,7 @@ enum MY_ENUM { ONE = 1, TWO = 2 }; TEST_CASE("JsonVariant::as()") { static const char* null = 0; - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc.to(); SECTION("not set") { diff --git a/extras/tests/JsonVariant/clear.cpp b/extras/tests/JsonVariant/clear.cpp index 02320a81..9549ae93 100644 --- a/extras/tests/JsonVariant/clear.cpp +++ b/extras/tests/JsonVariant/clear.cpp @@ -6,11 +6,10 @@ #include #include -using ArduinoJson::detail::sizeofArray; using ArduinoJson::detail::sizeofString; TEST_CASE("JsonVariant::clear()") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant var = doc.to(); SECTION("size goes back to zero") { diff --git a/extras/tests/JsonVariant/compare.cpp b/extras/tests/JsonVariant/compare.cpp index 28c2e89e..95c12191 100644 --- a/extras/tests/JsonVariant/compare.cpp +++ b/extras/tests/JsonVariant/compare.cpp @@ -9,7 +9,7 @@ // Here, we're just filling the holes TEST_CASE("Compare JsonVariant with value") { - JsonDocument doc(256); + JsonDocument doc; 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") { - JsonDocument doc(256); + JsonDocument doc; JsonVariant a = doc.add(); JsonVariant b = doc.add(); diff --git a/extras/tests/JsonVariant/containsKey.cpp b/extras/tests/JsonVariant/containsKey.cpp index 4f10287b..277ee271 100644 --- a/extras/tests/JsonVariant/containsKey.cpp +++ b/extras/tests/JsonVariant/containsKey.cpp @@ -7,7 +7,7 @@ #include TEST_CASE("JsonVariant::containsKey()") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant var = doc.to(); SECTION("containsKey(const char*)") { @@ -26,7 +26,7 @@ TEST_CASE("JsonVariant::containsKey()") { } TEST_CASE("JsonVariantConst::containsKey()") { - JsonDocument doc(4096); + JsonDocument doc; doc["hello"] = "world"; JsonVariantConst cvar = doc.as(); diff --git a/extras/tests/JsonVariant/converters.cpp b/extras/tests/JsonVariant/converters.cpp index 7603c421..fdbc44e4 100644 --- a/extras/tests/JsonVariant/converters.cpp +++ b/extras/tests/JsonVariant/converters.cpp @@ -32,7 +32,7 @@ bool canConvertFromJson(JsonVariantConst src, const Date&) { } // namespace TEST_CASE("Custom converter with overloading") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("convert JSON to Date") { doc["date"]["day"] = 2; @@ -107,7 +107,7 @@ struct Converter { } // namespace ArduinoJson TEST_CASE("Custom converter with specialization") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("convert JSON to Complex") { doc["value"]["real"] = 2; diff --git a/extras/tests/JsonVariant/copy.cpp b/extras/tests/JsonVariant/copy.cpp index 0cd253c4..ec6320e9 100644 --- a/extras/tests/JsonVariant/copy.cpp +++ b/extras/tests/JsonVariant/copy.cpp @@ -11,8 +11,8 @@ using ArduinoJson::detail::sizeofString; TEST_CASE("JsonVariant::set(JsonVariant)") { ControllableAllocator allocator; SpyingAllocator spyingAllocator(&allocator); - JsonDocument doc1(4096, &spyingAllocator); - JsonDocument doc2(4096, &spyingAllocator); + JsonDocument doc1(&spyingAllocator); + JsonDocument doc2(&spyingAllocator); JsonVariant var1 = doc1.to(); JsonVariant var2 = doc2.to(); diff --git a/extras/tests/JsonVariant/createNested.cpp b/extras/tests/JsonVariant/createNested.cpp index 0790be77..d45c1af3 100644 --- a/extras/tests/JsonVariant/createNested.cpp +++ b/extras/tests/JsonVariant/createNested.cpp @@ -7,7 +7,7 @@ #include TEST_CASE("JsonVariant::createNestedObject()") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc.to(); SECTION("promotes to array") { @@ -21,7 +21,7 @@ TEST_CASE("JsonVariant::createNestedObject()") { } TEST_CASE("JsonVariant::createNestedArray()") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc.to(); SECTION("promotes to array") { @@ -33,7 +33,7 @@ TEST_CASE("JsonVariant::createNestedArray()") { } TEST_CASE("JsonVariant::createNestedObject(key)") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc.to(); SECTION("promotes to object") { @@ -46,7 +46,7 @@ TEST_CASE("JsonVariant::createNestedObject(key)") { } TEST_CASE("JsonVariant::createNestedArray(key)") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc.to(); SECTION("promotes to object") { diff --git a/extras/tests/JsonVariant/is.cpp b/extras/tests/JsonVariant/is.cpp index 7ba0c86e..2c18fd59 100644 --- a/extras/tests/JsonVariant/is.cpp +++ b/extras/tests/JsonVariant/is.cpp @@ -8,7 +8,7 @@ enum MYENUM2 { ONE = 1, TWO = 2 }; TEST_CASE("JsonVariant::is()") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc.to(); SECTION("unbound") { @@ -164,7 +164,7 @@ TEST_CASE("JsonVariant::is()") { } TEST_CASE("JsonVariantConst::is()") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc.to(); JsonVariantConst cvariant = variant; diff --git a/extras/tests/JsonVariant/isnull.cpp b/extras/tests/JsonVariant/isnull.cpp index 20c17e3f..c0632348 100644 --- a/extras/tests/JsonVariant/isnull.cpp +++ b/extras/tests/JsonVariant/isnull.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonVariant::isNull()") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc.to(); SECTION("returns true when Undefined") { @@ -20,7 +20,7 @@ TEST_CASE("JsonVariant::isNull()") { } SECTION("returns false when EmptyArray") { - JsonDocument doc2(4096); + JsonDocument doc2; JsonArray array = doc2.to(); variant.set(array); @@ -28,7 +28,7 @@ TEST_CASE("JsonVariant::isNull()") { } SECTION("returns false when EmptyObject") { - JsonDocument doc2(4096); + JsonDocument doc2; JsonObject obj = doc2.to(); variant.set(obj); diff --git a/extras/tests/JsonVariant/memoryUsage.cpp b/extras/tests/JsonVariant/memoryUsage.cpp index 7d6529e4..67b7448d 100644 --- a/extras/tests/JsonVariant/memoryUsage.cpp +++ b/extras/tests/JsonVariant/memoryUsage.cpp @@ -11,7 +11,7 @@ using ArduinoJson::detail::sizeofObject; using ArduinoJson::detail::sizeofString; TEST_CASE("JsonVariant::memoryUsage()") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant var = doc.to(); SECTION("returns 0 if uninitialized") { diff --git a/extras/tests/JsonVariant/misc.cpp b/extras/tests/JsonVariant/misc.cpp index 2f61582f..cecafdd1 100644 --- a/extras/tests/JsonVariant/misc.cpp +++ b/extras/tests/JsonVariant/misc.cpp @@ -23,7 +23,7 @@ TEST_CASE("JsonVariant from JsonArray") { } SECTION("JsonArray is not null") { - JsonDocument doc(4096); + JsonDocument doc; JsonArray arr = doc.to(); arr.add(12); arr.add(34); @@ -45,7 +45,7 @@ TEST_CASE("JsonVariant from JsonObject") { } SECTION("JsonObject is not null") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); obj["a"] = 12; obj["b"] = 34; diff --git a/extras/tests/JsonVariant/nesting.cpp b/extras/tests/JsonVariant/nesting.cpp index ea791f64..11780339 100644 --- a/extras/tests/JsonVariant/nesting.cpp +++ b/extras/tests/JsonVariant/nesting.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonVariant::nesting()") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant var = doc.to(); SECTION("return 0 if uninitialized") { diff --git a/extras/tests/JsonVariant/nullptr.cpp b/extras/tests/JsonVariant/nullptr.cpp index ba829b92..434ba5c8 100644 --- a/extras/tests/JsonVariant/nullptr.cpp +++ b/extras/tests/JsonVariant/nullptr.cpp @@ -3,7 +3,7 @@ #include TEST_CASE("nullptr") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc.to(); SECTION("JsonVariant == nullptr") { diff --git a/extras/tests/JsonVariant/or.cpp b/extras/tests/JsonVariant/or.cpp index 55d40c31..85a8c0f5 100644 --- a/extras/tests/JsonVariant/or.cpp +++ b/extras/tests/JsonVariant/or.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonVariant::operator|()") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc["value"].to(); SECTION("null") { diff --git a/extras/tests/JsonVariant/overflow.cpp b/extras/tests/JsonVariant/overflow.cpp index 56e5fcae..6f4636f9 100644 --- a/extras/tests/JsonVariant/overflow.cpp +++ b/extras/tests/JsonVariant/overflow.cpp @@ -7,7 +7,7 @@ template void shouldBeOk(TIn value) { - JsonDocument doc(1); + JsonDocument doc; JsonVariant var = doc.to(); var.set(value); REQUIRE(var.as() == TOut(value)); @@ -15,7 +15,7 @@ void shouldBeOk(TIn value) { template void shouldOverflow(TIn value) { - JsonDocument doc(1); + JsonDocument doc; JsonVariant var = doc.to(); var.set(value); REQUIRE(var.as() == 0); diff --git a/extras/tests/JsonVariant/remove.cpp b/extras/tests/JsonVariant/remove.cpp index 785d3213..2658254f 100644 --- a/extras/tests/JsonVariant/remove.cpp +++ b/extras/tests/JsonVariant/remove.cpp @@ -10,7 +10,7 @@ using ArduinoJson::detail::sizeofArray; using ArduinoJson::detail::sizeofString; TEST_CASE("JsonVariant::remove(int)") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("release top level strings") { doc.add(std::string("hello")); @@ -48,7 +48,7 @@ TEST_CASE("JsonVariant::remove(int)") { } TEST_CASE("JsonVariant::remove(const char *)") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant var = doc.to(); var["a"] = 1; @@ -60,7 +60,7 @@ TEST_CASE("JsonVariant::remove(const char *)") { } TEST_CASE("JsonVariant::remove(std::string)") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant var = doc.to(); var["a"] = 1; diff --git a/extras/tests/JsonVariant/set.cpp b/extras/tests/JsonVariant/set.cpp index 4484760e..fd110475 100644 --- a/extras/tests/JsonVariant/set.cpp +++ b/extras/tests/JsonVariant/set.cpp @@ -13,7 +13,7 @@ using ArduinoJson::detail::sizeofString; enum ErrorCode { ERROR_01 = 1, ERROR_10 = 10 }; TEST_CASE("JsonVariant::set() when there is enough memory") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc.to(); SECTION("const char*") { @@ -133,7 +133,7 @@ TEST_CASE("JsonVariant::set() when there is enough memory") { } TEST_CASE("JsonVariant::set() with not enough memory") { - JsonDocument doc(1, FailingAllocator::instance()); + JsonDocument doc(FailingAllocator::instance()); JsonVariant v = doc.to(); @@ -161,10 +161,10 @@ TEST_CASE("JsonVariant::set() with not enough memory") { } TEST_CASE("JsonVariant::set(JsonDocument)") { - JsonDocument doc1(1024); + JsonDocument doc1; doc1["hello"] = "world"; - JsonDocument doc2(1024); + JsonDocument doc2; JsonVariant v = doc2.to(); // Should copy the doc @@ -177,7 +177,7 @@ TEST_CASE("JsonVariant::set(JsonDocument)") { } TEST_CASE("JsonVariant::set() releases the previous value") { - JsonDocument doc(1024); + JsonDocument doc; doc["hello"] = std::string("world"); REQUIRE(doc.memoryUsage() == sizeofObject(1) + sizeofString(5)); diff --git a/extras/tests/JsonVariant/size.cpp b/extras/tests/JsonVariant/size.cpp index 64c282b2..6ad49091 100644 --- a/extras/tests/JsonVariant/size.cpp +++ b/extras/tests/JsonVariant/size.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonVariant::size()") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc.to(); SECTION("unbound reference") { diff --git a/extras/tests/JsonVariant/stl_containers.cpp b/extras/tests/JsonVariant/stl_containers.cpp index 1bf67503..60eb254d 100644 --- a/extras/tests/JsonVariant/stl_containers.cpp +++ b/extras/tests/JsonVariant/stl_containers.cpp @@ -69,13 +69,13 @@ TEST_CASE("vector") { SECTION("toJson") { std::vector v = {1, 2}; - JsonDocument doc(128); + JsonDocument doc; doc.set(v); REQUIRE(doc.as() == "[1,2]"); } SECTION("fromJson") { - JsonDocument doc(128); + JsonDocument doc; doc.add(1); doc.add(2); @@ -86,7 +86,7 @@ TEST_CASE("vector") { } SECTION("checkJson") { - JsonDocument doc(128); + JsonDocument doc; CHECK(doc.is>() == false); doc.add(1); @@ -106,13 +106,13 @@ TEST_CASE("array") { v[0] = 1; v[1] = 2; - JsonDocument doc(128); + JsonDocument doc; doc.set(v); REQUIRE(doc.as() == "[1,2]"); } SECTION("fromJson") { - JsonDocument doc(128); + JsonDocument doc; doc.add(1); doc.add(2); @@ -123,7 +123,7 @@ TEST_CASE("array") { } SECTION("checkJson") { - JsonDocument doc(128); + JsonDocument doc; CHECK(doc.is() == false); doc.add(1); diff --git a/extras/tests/JsonVariant/subscript.cpp b/extras/tests/JsonVariant/subscript.cpp index f0396371..35bbc0b4 100644 --- a/extras/tests/JsonVariant/subscript.cpp +++ b/extras/tests/JsonVariant/subscript.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("JsonVariant::operator[]") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant var = doc.to(); SECTION("The JsonVariant is null") { @@ -132,7 +132,7 @@ TEST_CASE("JsonVariant::operator[]") { } TEST_CASE("JsonVariantConst::operator[]") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant var = doc.to(); JsonVariantConst cvar = var; diff --git a/extras/tests/JsonVariant/types.cpp b/extras/tests/JsonVariant/types.cpp index 852a9bba..c5a7d11c 100644 --- a/extras/tests/JsonVariant/types.cpp +++ b/extras/tests/JsonVariant/types.cpp @@ -9,7 +9,7 @@ template void checkValue(T expected) { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc.to(); variant.set(expected); @@ -24,7 +24,7 @@ void checkReference(T& expected) { template void checkNumericType() { - JsonDocument docMin(4096), docMax(4096); + JsonDocument docMin, docMax; JsonVariant variantMin = docMin.to(); JsonVariant variantMax = docMax.to(); @@ -129,7 +129,7 @@ TEST_CASE("JsonVariant set()/get()") { #endif SECTION("CanStoreObject") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject object = doc.to(); checkValue(object); @@ -137,7 +137,7 @@ TEST_CASE("JsonVariant set()/get()") { } TEST_CASE("volatile") { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc.to(); SECTION("volatile int") { diff --git a/extras/tests/Misc/StringWriter.cpp b/extras/tests/Misc/StringWriter.cpp index afc8cca8..4fc5c774 100644 --- a/extras/tests/Misc/StringWriter.cpp +++ b/extras/tests/Misc/StringWriter.cpp @@ -139,7 +139,7 @@ TEST_CASE("Writer") { } TEST_CASE("serializeJson(doc, String)") { - JsonDocument doc(1024); + JsonDocument doc; doc["hello"] = "world"; ::String output; diff --git a/extras/tests/Misc/Utf8.cpp b/extras/tests/Misc/Utf8.cpp index f845bc5b..bbbcfee4 100644 --- a/extras/tests/Misc/Utf8.cpp +++ b/extras/tests/Misc/Utf8.cpp @@ -10,7 +10,7 @@ using namespace ArduinoJson::detail; static void testCodepoint(uint32_t codepoint, std::string expected) { - ResourceManager resources(4096); + ResourceManager resources; StringBuilder str(&resources); str.startString(); diff --git a/extras/tests/Misc/printable.cpp b/extras/tests/Misc/printable.cpp index 7ea0f4b7..2bde9910 100644 --- a/extras/tests/Misc/printable.cpp +++ b/extras/tests/Misc/printable.cpp @@ -53,7 +53,7 @@ struct PrintableString : public Printable { TEST_CASE("Printable") { SECTION("Doesn't overflow") { - JsonDocument doc(8); + JsonDocument doc; const char* value = "example"; doc.set(666); // to make sure we override the value @@ -81,7 +81,7 @@ TEST_CASE("Printable") { SECTION("First allocation fails") { SpyingAllocator spyingAllocator(FailingAllocator::instance()); - JsonDocument doc(0, &spyingAllocator); + JsonDocument doc(&spyingAllocator); const char* value = "hello world"; doc.set(666); // to make sure we override the value @@ -118,7 +118,7 @@ TEST_CASE("Printable") { SECTION("Reallocation fails") { TimebombAllocator timebombAllocator(1); SpyingAllocator spyingAllocator(&timebombAllocator); - JsonDocument doc(0, &spyingAllocator); + JsonDocument doc(&spyingAllocator); const char* value = "Lorem ipsum dolor sit amet, cons"; // > 31 chars doc.set(666); // to make sure we override the value @@ -167,7 +167,7 @@ TEST_CASE("Printable") { } SECTION("String deduplication") { - JsonDocument doc(128); + JsonDocument doc; doc.add(PrintableString("Hello World!")); doc.add(PrintableString("Hello World!")); REQUIRE(doc.size() == 2); diff --git a/extras/tests/Misc/unsigned_char.cpp b/extras/tests/Misc/unsigned_char.cpp index a33abe88..abfcda54 100644 --- a/extras/tests/Misc/unsigned_char.cpp +++ b/extras/tests/Misc/unsigned_char.cpp @@ -9,13 +9,11 @@ # define CONFLICTS_WITH_BUILTIN_OPERATOR #endif -using ArduinoJson::detail::sizeofObject; - TEST_CASE("unsigned char[]") { SECTION("deserializeJson()") { unsigned char input[] = "{\"a\":42}"; - JsonDocument doc(sizeofObject(1)); + JsonDocument doc; DeserializationError err = deserializeJson(doc, input); REQUIRE(err == DeserializationError::Ok); @@ -24,7 +22,7 @@ TEST_CASE("unsigned char[]") { SECTION("deserializeMsgPack()") { unsigned char input[] = "\xDE\x00\x01\xA5Hello\xA5world"; - JsonDocument doc(sizeofObject(2)); + JsonDocument doc; DeserializationError err = deserializeMsgPack(doc, input); REQUIRE(err == DeserializationError::Ok); @@ -32,7 +30,7 @@ TEST_CASE("unsigned char[]") { SECTION("serializeMsgPack(unsigned char[])") { unsigned char buffer[32]; - JsonDocument doc(sizeofObject(2)); + JsonDocument doc; doc["hello"] = "world"; size_t n = serializeMsgPack(doc, buffer); @@ -43,7 +41,7 @@ TEST_CASE("unsigned char[]") { SECTION("serializeMsgPack(unsigned char*)") { unsigned char buffer[32]; - JsonDocument doc(sizeofObject(2)); + JsonDocument doc; doc["hello"] = "world"; size_t n = serializeMsgPack(doc, buffer, sizeof(buffer)); @@ -54,7 +52,7 @@ TEST_CASE("unsigned char[]") { SECTION("serializeJson(unsigned char[])") { unsigned char buffer[32]; - JsonDocument doc(sizeofObject(2)); + JsonDocument doc; doc["hello"] = "world"; size_t n = serializeJson(doc, buffer); @@ -65,7 +63,7 @@ TEST_CASE("unsigned char[]") { SECTION("serializeJson(unsigned char*)") { unsigned char buffer[32]; - JsonDocument doc(sizeofObject(2)); + JsonDocument doc; doc["hello"] = "world"; size_t n = serializeJson(doc, buffer, sizeof(buffer)); @@ -76,7 +74,7 @@ TEST_CASE("unsigned char[]") { SECTION("serializeJsonPretty(unsigned char[])") { unsigned char buffer[32]; - JsonDocument doc(sizeofObject(2)); + JsonDocument doc; doc["hello"] = "world"; size_t n = serializeJsonPretty(doc, buffer); @@ -86,7 +84,7 @@ TEST_CASE("unsigned char[]") { SECTION("serializeJsonPretty(unsigned char*)") { unsigned char buffer[32]; - JsonDocument doc(sizeofObject(2)); + JsonDocument doc; doc["hello"] = "world"; size_t n = serializeJsonPretty(doc, buffer, sizeof(buffer)); @@ -95,7 +93,7 @@ TEST_CASE("unsigned char[]") { } SECTION("JsonVariant") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("set") { unsigned char value[] = "42"; @@ -158,7 +156,7 @@ TEST_CASE("unsigned char[]") { SECTION("operator[]") { unsigned char key[] = "hello"; - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); obj[key] = "world"; @@ -168,7 +166,7 @@ TEST_CASE("unsigned char[]") { SECTION("JsonObject::operator[] const") { unsigned char key[] = "hello"; - JsonDocument doc(4096); + JsonDocument doc; deserializeJson(doc, "{\"hello\":\"world\"}"); JsonObject obj = doc.as(); @@ -179,7 +177,7 @@ TEST_CASE("unsigned char[]") { SECTION("containsKey()") { unsigned char key[] = "hello"; - JsonDocument doc(4096); + JsonDocument doc; deserializeJson(doc, "{\"hello\":\"world\"}"); JsonObject obj = doc.as(); REQUIRE(true == obj.containsKey(key)); @@ -188,7 +186,7 @@ TEST_CASE("unsigned char[]") { SECTION("remove()") { unsigned char key[] = "hello"; - JsonDocument doc(4096); + JsonDocument doc; deserializeJson(doc, "{\"hello\":\"world\"}"); JsonObject obj = doc.as(); obj.remove(key); @@ -199,7 +197,7 @@ TEST_CASE("unsigned char[]") { SECTION("createNestedArray()") { unsigned char key[] = "hello"; - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); obj.createNestedArray(key); } @@ -207,7 +205,7 @@ TEST_CASE("unsigned char[]") { SECTION("createNestedObject()") { unsigned char key[] = "hello"; - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); obj.createNestedObject(key); } @@ -217,7 +215,7 @@ TEST_CASE("unsigned char[]") { SECTION("operator=") { // issue #416 unsigned char value[] = "world"; - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); obj["hello"] = value; @@ -227,7 +225,7 @@ TEST_CASE("unsigned char[]") { SECTION("set()") { unsigned char value[] = "world"; - JsonDocument doc(4096); + JsonDocument doc; JsonObject obj = doc.to(); obj["hello"].set(value); @@ -239,7 +237,7 @@ TEST_CASE("unsigned char[]") { SECTION("add()") { unsigned char value[] = "world"; - JsonDocument doc(4096); + JsonDocument doc; JsonArray arr = doc.to(); arr.add(value); @@ -251,7 +249,7 @@ TEST_CASE("unsigned char[]") { SECTION("set()") { unsigned char value[] = "world"; - JsonDocument doc(4096); + JsonDocument doc; JsonArray arr = doc.to(); arr.add("hello"); arr[0].set(value); @@ -262,7 +260,7 @@ TEST_CASE("unsigned char[]") { SECTION("operator=") { unsigned char value[] = "world"; - JsonDocument doc(4096); + JsonDocument doc; JsonArray arr = doc.to(); arr.add("hello"); arr[0] = value; diff --git a/extras/tests/MixedConfiguration/decode_unicode_0.cpp b/extras/tests/MixedConfiguration/decode_unicode_0.cpp index 79dff54e..91b03bb8 100644 --- a/extras/tests/MixedConfiguration/decode_unicode_0.cpp +++ b/extras/tests/MixedConfiguration/decode_unicode_0.cpp @@ -4,7 +4,7 @@ #include TEST_CASE("ARDUINOJSON_DECODE_UNICODE == 0") { - JsonDocument doc(2048); + JsonDocument doc; DeserializationError err = deserializeJson(doc, "\"\\uD834\\uDD1E\""); REQUIRE(err == DeserializationError::Ok); diff --git a/extras/tests/MixedConfiguration/decode_unicode_1.cpp b/extras/tests/MixedConfiguration/decode_unicode_1.cpp index 74cf8981..0568ab53 100644 --- a/extras/tests/MixedConfiguration/decode_unicode_1.cpp +++ b/extras/tests/MixedConfiguration/decode_unicode_1.cpp @@ -4,7 +4,7 @@ #include TEST_CASE("ARDUINOJSON_DECODE_UNICODE == 1") { - JsonDocument doc(2048); + JsonDocument doc; DeserializationError err = deserializeJson(doc, "\"\\uD834\\uDD1E\""); REQUIRE(err == DeserializationError::Ok); diff --git a/extras/tests/MixedConfiguration/enable_comments_0.cpp b/extras/tests/MixedConfiguration/enable_comments_0.cpp index 8ccc60a0..7b5277d5 100644 --- a/extras/tests/MixedConfiguration/enable_comments_0.cpp +++ b/extras/tests/MixedConfiguration/enable_comments_0.cpp @@ -8,7 +8,7 @@ #include TEST_CASE("Comments should produce InvalidInput") { - JsonDocument doc(2048); + JsonDocument doc; const char* testCases[] = { "/*COMMENT*/ [\"hello\"]", diff --git a/extras/tests/MixedConfiguration/enable_comments_1.cpp b/extras/tests/MixedConfiguration/enable_comments_1.cpp index 1fac3b01..2ac3b2fd 100644 --- a/extras/tests/MixedConfiguration/enable_comments_1.cpp +++ b/extras/tests/MixedConfiguration/enable_comments_1.cpp @@ -8,7 +8,7 @@ #include TEST_CASE("Comments in arrays") { - JsonDocument doc(2048); + JsonDocument doc; SECTION("Block comments") { SECTION("Before opening bracket") { @@ -161,7 +161,7 @@ TEST_CASE("Comments in arrays") { } TEST_CASE("Comments in objects") { - JsonDocument doc(2048); + JsonDocument doc; SECTION("Block comments") { SECTION("Before opening brace") { @@ -371,7 +371,7 @@ TEST_CASE("Comments in objects") { } TEST_CASE("Comments alone") { - JsonDocument doc(2048); + JsonDocument doc; SECTION("Just a trailing comment with no line break") { DeserializationError err = deserializeJson(doc, "// comment"); diff --git a/extras/tests/MixedConfiguration/enable_infinity_0.cpp b/extras/tests/MixedConfiguration/enable_infinity_0.cpp index 618db830..41566e24 100644 --- a/extras/tests/MixedConfiguration/enable_infinity_0.cpp +++ b/extras/tests/MixedConfiguration/enable_infinity_0.cpp @@ -5,7 +5,7 @@ #include static void assertParseFails(const char* json) { - JsonDocument doc(4096); + JsonDocument doc; DeserializationError err = deserializeJson(doc, json); REQUIRE(err == DeserializationError::InvalidInput); @@ -20,7 +20,7 @@ static void assertJsonEquals(const JsonDocument& doc, TEST_CASE("ARDUINOJSON_ENABLE_INFINITY == 0") { SECTION("serializeJson()") { - JsonDocument doc(4096); + JsonDocument doc; doc.add(std::numeric_limits::infinity()); doc.add(-std::numeric_limits::infinity()); diff --git a/extras/tests/MixedConfiguration/enable_infinity_1.cpp b/extras/tests/MixedConfiguration/enable_infinity_1.cpp index 6322697f..99ab3fe7 100644 --- a/extras/tests/MixedConfiguration/enable_infinity_1.cpp +++ b/extras/tests/MixedConfiguration/enable_infinity_1.cpp @@ -9,7 +9,7 @@ using ArduinoJson::detail::isinf; } // namespace my TEST_CASE("ARDUINOJSON_ENABLE_INFINITY == 1") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("serializeJson()") { doc.add(std::numeric_limits::infinity()); diff --git a/extras/tests/MixedConfiguration/enable_nan_0.cpp b/extras/tests/MixedConfiguration/enable_nan_0.cpp index 26a8d4f5..7491e4a3 100644 --- a/extras/tests/MixedConfiguration/enable_nan_0.cpp +++ b/extras/tests/MixedConfiguration/enable_nan_0.cpp @@ -5,7 +5,7 @@ #include TEST_CASE("ARDUINOJSON_ENABLE_NAN == 0") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject root = doc.to(); SECTION("serializeJson()") { diff --git a/extras/tests/MixedConfiguration/enable_nan_1.cpp b/extras/tests/MixedConfiguration/enable_nan_1.cpp index 4968370b..20d0874e 100644 --- a/extras/tests/MixedConfiguration/enable_nan_1.cpp +++ b/extras/tests/MixedConfiguration/enable_nan_1.cpp @@ -9,7 +9,7 @@ using ArduinoJson::detail::isnan; } // namespace my TEST_CASE("ARDUINOJSON_ENABLE_NAN == 1") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject root = doc.to(); SECTION("serializeJson()") { diff --git a/extras/tests/MixedConfiguration/enable_progmem_1.cpp b/extras/tests/MixedConfiguration/enable_progmem_1.cpp index cbec2028..61f2ec26 100644 --- a/extras/tests/MixedConfiguration/enable_progmem_1.cpp +++ b/extras/tests/MixedConfiguration/enable_progmem_1.cpp @@ -8,7 +8,7 @@ #include TEST_CASE("Flash strings") { - JsonDocument doc(2048); + JsonDocument doc; SECTION("deserializeJson()") { DeserializationError err = deserializeJson(doc, F("{'hello':'world'}")); diff --git a/extras/tests/MixedConfiguration/issue1707.cpp b/extras/tests/MixedConfiguration/issue1707.cpp index 94838634..94891c55 100644 --- a/extras/tests/MixedConfiguration/issue1707.cpp +++ b/extras/tests/MixedConfiguration/issue1707.cpp @@ -10,7 +10,7 @@ #include TEST_CASE("Issue1707") { - JsonDocument doc(128); + JsonDocument doc; DeserializationError err = deserializeJson(doc, F("{\"hello\":12}")); REQUIRE(err == DeserializationError::Ok); diff --git a/extras/tests/MixedConfiguration/use_double_0.cpp b/extras/tests/MixedConfiguration/use_double_0.cpp index c2378953..8752890d 100644 --- a/extras/tests/MixedConfiguration/use_double_0.cpp +++ b/extras/tests/MixedConfiguration/use_double_0.cpp @@ -4,7 +4,7 @@ #include TEST_CASE("ARDUINOJSON_USE_DOUBLE == 0") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject root = doc.to(); root["pi"] = 3.14; diff --git a/extras/tests/MixedConfiguration/use_double_1.cpp b/extras/tests/MixedConfiguration/use_double_1.cpp index 5eb02584..15c4849c 100644 --- a/extras/tests/MixedConfiguration/use_double_1.cpp +++ b/extras/tests/MixedConfiguration/use_double_1.cpp @@ -4,7 +4,7 @@ #include TEST_CASE("ARDUINOJSON_USE_DOUBLE == 1") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject root = doc.to(); root["pi"] = 3.14; diff --git a/extras/tests/MixedConfiguration/use_long_long_0.cpp b/extras/tests/MixedConfiguration/use_long_long_0.cpp index a5f57005..4c7f0ade 100644 --- a/extras/tests/MixedConfiguration/use_long_long_0.cpp +++ b/extras/tests/MixedConfiguration/use_long_long_0.cpp @@ -4,7 +4,7 @@ #include TEST_CASE("ARDUINOJSON_USE_LONG_LONG == 0") { - JsonDocument doc(4096); + JsonDocument doc; doc["A"] = 42; doc["B"] = 84; diff --git a/extras/tests/MixedConfiguration/use_long_long_1.cpp b/extras/tests/MixedConfiguration/use_long_long_1.cpp index b43df5d7..a2c4fd8e 100644 --- a/extras/tests/MixedConfiguration/use_long_long_1.cpp +++ b/extras/tests/MixedConfiguration/use_long_long_1.cpp @@ -4,7 +4,7 @@ #include TEST_CASE("ARDUINOJSON_USE_LONG_LONG == 1") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject root = doc.to(); root["A"] = 123456789123456789; diff --git a/extras/tests/MsgPackDeserializer/deserializeArray.cpp b/extras/tests/MsgPackDeserializer/deserializeArray.cpp index 4807eee7..d71b6b58 100644 --- a/extras/tests/MsgPackDeserializer/deserializeArray.cpp +++ b/extras/tests/MsgPackDeserializer/deserializeArray.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("deserialize MsgPack array") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("fixarray") { SECTION("empty") { diff --git a/extras/tests/MsgPackDeserializer/deserializeObject.cpp b/extras/tests/MsgPackDeserializer/deserializeObject.cpp index f126ceb5..8ee56d7b 100644 --- a/extras/tests/MsgPackDeserializer/deserializeObject.cpp +++ b/extras/tests/MsgPackDeserializer/deserializeObject.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("deserialize MsgPack object") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("fixmap") { SECTION("empty") { diff --git a/extras/tests/MsgPackDeserializer/deserializeVariant.cpp b/extras/tests/MsgPackDeserializer/deserializeVariant.cpp index 57787718..bd6c4979 100644 --- a/extras/tests/MsgPackDeserializer/deserializeVariant.cpp +++ b/extras/tests/MsgPackDeserializer/deserializeVariant.cpp @@ -7,13 +7,9 @@ #include "Allocators.hpp" -using ArduinoJson::detail::sizeofArray; -using ArduinoJson::detail::sizeofObject; -using ArduinoJson::detail::sizeofString; - template static void checkValue(const char* input, T expected) { - JsonDocument doc(4096); + JsonDocument doc; DeserializationError error = deserializeMsgPack(doc, input); @@ -22,10 +18,10 @@ static void checkValue(const char* input, T expected) { REQUIRE(doc.as() == expected); } -static void checkError(size_t capacity, size_t timebombCountDown, - const char* input, DeserializationError expected) { +static void checkError(size_t timebombCountDown, const char* input, + DeserializationError expected) { TimebombAllocator timebombAllocator(timebombCountDown); - JsonDocument doc(capacity, &timebombAllocator); + JsonDocument doc(&timebombAllocator); DeserializationError error = deserializeMsgPack(doc, input); @@ -147,121 +143,102 @@ TEST_CASE("deserialize MsgPack value") { TEST_CASE("deserializeMsgPack() under memory constaints") { SECTION("single values always fit") { - checkError(0, 0, "\xc0", DeserializationError::Ok); // nil - checkError(0, 0, "\xc2", DeserializationError::Ok); // false - checkError(0, 0, "\xc3", DeserializationError::Ok); // true - checkError(0, 0, "\xcc\x00", DeserializationError::Ok); // uint 8 - checkError(0, 0, "\xcd\x30\x39", DeserializationError::Ok); // uint 16 - checkError(0, 0, "\xCE\x12\x34\x56\x78", + checkError(0, "\xc0", DeserializationError::Ok); // nil + checkError(0, "\xc2", DeserializationError::Ok); // false + checkError(0, "\xc3", DeserializationError::Ok); // true + checkError(0, "\xcc\x00", DeserializationError::Ok); // uint 8 + checkError(0, "\xcd\x30\x39", DeserializationError::Ok); // uint 16 + checkError(0, "\xCE\x12\x34\x56\x78", DeserializationError::Ok); // uint 32 } SECTION("fixstr") { - checkError(0, 2, "\xA7ZZZZZZZ", DeserializationError::Ok); - checkError(0, 0, "\xA7ZZZZZZZ", DeserializationError::NoMemory); + checkError(2, "\xA7ZZZZZZZ", DeserializationError::Ok); + checkError(0, "\xA7ZZZZZZZ", DeserializationError::NoMemory); } SECTION("str 8") { - checkError(0, 2, "\xD9\x07ZZZZZZZ", DeserializationError::Ok); - checkError(0, 0, "\xD9\x07ZZZZZZZ", DeserializationError::NoMemory); + checkError(2, "\xD9\x07ZZZZZZZ", DeserializationError::Ok); + checkError(0, "\xD9\x07ZZZZZZZ", DeserializationError::NoMemory); } SECTION("str 16") { - checkError(0, 2, "\xDA\x00\x07ZZZZZZZ", DeserializationError::Ok); - checkError(0, 0, "\xDA\x00\x07ZZZZZZZ", DeserializationError::NoMemory); + checkError(2, "\xDA\x00\x07ZZZZZZZ", DeserializationError::Ok); + checkError(0, "\xDA\x00\x07ZZZZZZZ", DeserializationError::NoMemory); } SECTION("str 32") { - checkError(0, 2, "\xDB\x00\x00\x00\x07ZZZZZZZ", DeserializationError::Ok); - checkError(0, 0, "\xDB\x00\x00\x00\x07ZZZZZZZ", + checkError(2, "\xDB\x00\x00\x00\x07ZZZZZZZ", DeserializationError::Ok); + checkError(0, "\xDB\x00\x00\x00\x07ZZZZZZZ", DeserializationError::NoMemory); } SECTION("fixarray") { - checkError(sizeofArray(0), 0, "\x90", DeserializationError::Ok); // [] - checkError(sizeofArray(0), 0, "\x91\x01", + checkError(0, "\x90", DeserializationError::Ok); // [] + checkError(0, "\x91\x01", DeserializationError::NoMemory); // [1] - checkError(sizeofArray(0), 1, "\x91\x01", + checkError(1, "\x91\x01", DeserializationError::NoMemory); // [1] - checkError(sizeofArray(1), 2, "\x91\x01", + checkError(2, "\x91\x01", DeserializationError::Ok); // [1] } SECTION("array 16") { - checkError(sizeofArray(0), 0, "\xDC\x00\x00", DeserializationError::Ok); - checkError(sizeofArray(0), 0, "\xDC\x00\x01\x01", - DeserializationError::NoMemory); - checkError(sizeofArray(0), 1, "\xDC\x00\x01\x01", - DeserializationError::NoMemory); - checkError(sizeofArray(1), 2, "\xDC\x00\x01\x01", DeserializationError::Ok); + checkError(0, "\xDC\x00\x00", DeserializationError::Ok); + checkError(0, "\xDC\x00\x01\x01", DeserializationError::NoMemory); + checkError(1, "\xDC\x00\x01\x01", DeserializationError::NoMemory); + checkError(2, "\xDC\x00\x01\x01", DeserializationError::Ok); } SECTION("array 32") { - checkError(sizeofArray(0), 0, "\xDD\x00\x00\x00\x00", - DeserializationError::Ok); - checkError(sizeofArray(0), 0, "\xDD\x00\x00\x00\x01\x01", - DeserializationError::NoMemory); - checkError(sizeofArray(1), 1, "\xDD\x00\x00\x00\x01\x01", - DeserializationError::NoMemory); - checkError(sizeofArray(1), 2, "\xDD\x00\x00\x00\x01\x01", - DeserializationError::Ok); + checkError(0, "\xDD\x00\x00\x00\x00", DeserializationError::Ok); + checkError(0, "\xDD\x00\x00\x00\x01\x01", DeserializationError::NoMemory); + checkError(1, "\xDD\x00\x00\x00\x01\x01", DeserializationError::NoMemory); + checkError(2, "\xDD\x00\x00\x00\x01\x01", DeserializationError::Ok); } SECTION("fixmap") { SECTION("{}") { - checkError(sizeofObject(0), 0, "\x80", DeserializationError::Ok); + checkError(0, "\x80", DeserializationError::Ok); } SECTION("{H:1}") { - checkError(sizeofObject(0), 0, "\x81\xA1H\x01", - DeserializationError::NoMemory); - checkError(sizeofObject(1) + sizeofString(2), 4, "\x81\xA1H\x01", - DeserializationError::Ok); + checkError(0, "\x81\xA1H\x01", DeserializationError::NoMemory); + checkError(4, "\x81\xA1H\x01", DeserializationError::Ok); } SECTION("{H:1,W:2}") { - checkError(sizeofObject(1) + sizeofString(2), 4, "\x82\xA1H\x01\xA1W\x02", - DeserializationError::NoMemory); - checkError(sizeofObject(2) + 2 * sizeofString(2), 6, - "\x82\xA1H\x01\xA1W\x02", DeserializationError::Ok); + checkError(4, "\x82\xA1H\x01\xA1W\x02", DeserializationError::NoMemory); + checkError(6, "\x82\xA1H\x01\xA1W\x02", DeserializationError::Ok); } } SECTION("map 16") { SECTION("{}") { - checkError(sizeofObject(0), 0, "\xDE\x00\x00", DeserializationError::Ok); + checkError(0, "\xDE\x00\x00", DeserializationError::Ok); } SECTION("{H:1}") { - checkError(sizeofObject(1) + sizeofString(2), 2, "\xDE\x00\x01\xA1H\x01", - DeserializationError::NoMemory); - checkError(sizeofObject(1) + sizeofString(2), 4, "\xDE\x00\x01\xA1H\x01", - DeserializationError::Ok); + checkError(2, "\xDE\x00\x01\xA1H\x01", DeserializationError::NoMemory); + checkError(4, "\xDE\x00\x01\xA1H\x01", DeserializationError::Ok); } SECTION("{H:1,W:2}") { - checkError(sizeofObject(1) + sizeofString(2), 4, - "\xDE\x00\x02\xA1H\x01\xA1W\x02", + checkError(4, "\xDE\x00\x02\xA1H\x01\xA1W\x02", DeserializationError::NoMemory); - checkError(sizeofObject(2) + 2 * sizeofObject(1), 6, - "\xDE\x00\x02\xA1H\x01\xA1W\x02", DeserializationError::Ok); + checkError(6, "\xDE\x00\x02\xA1H\x01\xA1W\x02", DeserializationError::Ok); } } SECTION("map 32") { SECTION("{}") { - checkError(sizeofObject(0), 0, "\xDF\x00\x00\x00\x00", - DeserializationError::Ok); + checkError(0, "\xDF\x00\x00\x00\x00", DeserializationError::Ok); } SECTION("{H:1}") { - checkError(sizeofObject(1) + sizeofString(2), 2, - "\xDF\x00\x00\x00\x01\xA1H\x01", + checkError(2, "\xDF\x00\x00\x00\x01\xA1H\x01", DeserializationError::NoMemory); - checkError(sizeofObject(1) + sizeofString(2), 4, - "\xDF\x00\x00\x00\x01\xA1H\x01", DeserializationError::Ok); + checkError(4, "\xDF\x00\x00\x00\x01\xA1H\x01", DeserializationError::Ok); } SECTION("{H:1,W:2}") { - checkError(sizeofObject(1) + 2 * sizeofString(2), 4, - "\xDF\x00\x00\x00\x02\xA1H\x01\xA1W\x02", + checkError(4, "\xDF\x00\x00\x00\x02\xA1H\x01\xA1W\x02", DeserializationError::NoMemory); - checkError(sizeofObject(2) + 2 * sizeofObject(1), 6, - "\xDF\x00\x00\x00\x02\xA1H\x01\xA1W\x02", + checkError(6, "\xDF\x00\x00\x00\x02\xA1H\x01\xA1W\x02", DeserializationError::Ok); } } diff --git a/extras/tests/MsgPackDeserializer/filter.cpp b/extras/tests/MsgPackDeserializer/filter.cpp index ee49b1a8..f12a5bcc 100644 --- a/extras/tests/MsgPackDeserializer/filter.cpp +++ b/extras/tests/MsgPackDeserializer/filter.cpp @@ -10,10 +10,10 @@ using namespace ArduinoJson::detail; TEST_CASE("deserializeMsgPack() filter") { - JsonDocument doc(4096); + JsonDocument doc; DeserializationError error; - JsonDocument filter(200); + JsonDocument filter; DeserializationOption::Filter filterOpt(filter); SECTION("root is fixmap") { @@ -1032,10 +1032,10 @@ TEST_CASE("deserializeMsgPack() filter") { TEST_CASE("Zero-copy mode") { // issue #1697 char input[] = "\x82\xA7include\x01\xA6ignore\x02"; - JsonDocument filter(256); + JsonDocument filter; filter["include"] = true; - JsonDocument doc(256); + JsonDocument doc; DeserializationError err = deserializeMsgPack(doc, input, 18, DeserializationOption::Filter(filter)); @@ -1044,8 +1044,8 @@ TEST_CASE("Zero-copy mode") { // issue #1697 } TEST_CASE("Overloads") { - JsonDocument doc(256); - JsonDocument filter(256); + JsonDocument doc; + JsonDocument filter; using namespace DeserializationOption; diff --git a/extras/tests/MsgPackDeserializer/incompleteInput.cpp b/extras/tests/MsgPackDeserializer/incompleteInput.cpp index d94b60a2..939d1488 100644 --- a/extras/tests/MsgPackDeserializer/incompleteInput.cpp +++ b/extras/tests/MsgPackDeserializer/incompleteInput.cpp @@ -6,7 +6,7 @@ #include DeserializationError deserialize(const char* input, size_t len) { - JsonDocument doc(4096); + JsonDocument doc; return deserializeMsgPack(doc, input, len); } diff --git a/extras/tests/MsgPackDeserializer/input_types.cpp b/extras/tests/MsgPackDeserializer/input_types.cpp index 4f6d1fea..a30670d0 100644 --- a/extras/tests/MsgPackDeserializer/input_types.cpp +++ b/extras/tests/MsgPackDeserializer/input_types.cpp @@ -10,7 +10,7 @@ using ArduinoJson::detail::sizeofObject; TEST_CASE("deserializeMsgPack(const std::string&)") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("should accept const string") { const std::string input("\x92\x01\x02"); @@ -50,7 +50,7 @@ TEST_CASE("deserializeMsgPack(const std::string&)") { } TEST_CASE("deserializeMsgPack(std::istream&)") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("should accept a zero in input") { std::istringstream input(std::string("\x92\x00\x02", 3)); @@ -78,7 +78,7 @@ TEST_CASE("deserializeMsgPack(VLA)") { char vla[i]; memcpy(vla, "\xDE\x00\x01\xA5Hello\xA5world", 15); - JsonDocument doc(sizeofObject(1)); + JsonDocument doc; DeserializationError err = deserializeMsgPack(doc, vla); REQUIRE(err == DeserializationError::Ok); @@ -86,7 +86,7 @@ TEST_CASE("deserializeMsgPack(VLA)") { #endif TEST_CASE("deserializeMsgPack(CustomReader)") { - JsonDocument doc(4096); + JsonDocument doc; CustomReader reader("\x92\xA5Hello\xA5world"); DeserializationError err = deserializeMsgPack(doc, reader); diff --git a/extras/tests/MsgPackDeserializer/misc.cpp b/extras/tests/MsgPackDeserializer/misc.cpp index 05c9c98e..57d975ee 100644 --- a/extras/tests/MsgPackDeserializer/misc.cpp +++ b/extras/tests/MsgPackDeserializer/misc.cpp @@ -8,7 +8,7 @@ #include TEST_CASE("deserializeMsgPack() returns EmptyInput") { - JsonDocument doc(100); + JsonDocument doc; SECTION("from sized buffer") { DeserializationError err = deserializeMsgPack(doc, "", 0); diff --git a/extras/tests/MsgPackDeserializer/nestingLimit.cpp b/extras/tests/MsgPackDeserializer/nestingLimit.cpp index 78ce9b9e..d53482a7 100644 --- a/extras/tests/MsgPackDeserializer/nestingLimit.cpp +++ b/extras/tests/MsgPackDeserializer/nestingLimit.cpp @@ -12,7 +12,7 @@ REQUIRE(DeserializationError::TooDeep == expression); TEST_CASE("JsonDeserializer nesting") { - JsonDocument doc(4096); + JsonDocument doc; SECTION("Input = const char*") { SECTION("limit = 0") { diff --git a/extras/tests/MsgPackDeserializer/notSupported.cpp b/extras/tests/MsgPackDeserializer/notSupported.cpp index 08b952bc..60489364 100644 --- a/extras/tests/MsgPackDeserializer/notSupported.cpp +++ b/extras/tests/MsgPackDeserializer/notSupported.cpp @@ -7,7 +7,7 @@ static void checkMsgPackDocument(const char* input, size_t inputSize, const char* expectedJson) { - JsonDocument doc(4096); + JsonDocument doc; DeserializationError error = deserializeMsgPack(doc, input, inputSize); @@ -19,7 +19,7 @@ static void checkMsgPackDocument(const char* input, size_t inputSize, static void checkMsgPackError(const char* input, size_t inputSize, DeserializationError expectedError) { - JsonDocument doc(4096); + JsonDocument doc; DeserializationError error = deserializeMsgPack(doc, input, inputSize); diff --git a/extras/tests/MsgPackSerializer/destination_types.cpp b/extras/tests/MsgPackSerializer/destination_types.cpp index bd551ca7..3d163b3d 100644 --- a/extras/tests/MsgPackSerializer/destination_types.cpp +++ b/extras/tests/MsgPackSerializer/destination_types.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("serialize MsgPack to various destination types") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject object = doc.to(); object["hello"] = "world"; const char* expected_result = "\x81\xA5hello\xA5world"; diff --git a/extras/tests/MsgPackSerializer/measure.cpp b/extras/tests/MsgPackSerializer/measure.cpp index a99c8dd5..a12f3976 100644 --- a/extras/tests/MsgPackSerializer/measure.cpp +++ b/extras/tests/MsgPackSerializer/measure.cpp @@ -6,7 +6,7 @@ #include TEST_CASE("measureMsgPack()") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject object = doc.to(); object["hello"] = "world"; diff --git a/extras/tests/MsgPackSerializer/misc.cpp b/extras/tests/MsgPackSerializer/misc.cpp index 9d1df91a..bea9b242 100644 --- a/extras/tests/MsgPackSerializer/misc.cpp +++ b/extras/tests/MsgPackSerializer/misc.cpp @@ -4,7 +4,7 @@ template void check(T value, const std::string& expected) { - JsonDocument doc(4096); + JsonDocument doc; 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(MemberProxy)") { - JsonDocument doc(4096); + JsonDocument doc; deserializeJson(doc, "{\"hello\":42}"); JsonObject obj = doc.as(); std::string result; @@ -24,7 +24,7 @@ TEST_CASE("serializeMsgPack(MemberProxy)") { } TEST_CASE("serializeMsgPack(ElementProxy)") { - JsonDocument doc(4096); + JsonDocument doc; deserializeJson(doc, "[42]"); JsonArray arr = doc.as(); std::string result; @@ -35,7 +35,7 @@ TEST_CASE("serializeMsgPack(ElementProxy)") { } TEST_CASE("serializeMsgPack(JsonVariantSubscript)") { - JsonDocument doc(4096); + JsonDocument doc; deserializeJson(doc, "[42]"); JsonVariant var = doc.as(); std::string result; diff --git a/extras/tests/MsgPackSerializer/serializeArray.cpp b/extras/tests/MsgPackSerializer/serializeArray.cpp index d2a0f18f..106f0259 100644 --- a/extras/tests/MsgPackSerializer/serializeArray.cpp +++ b/extras/tests/MsgPackSerializer/serializeArray.cpp @@ -7,8 +7,6 @@ #include #include -using ArduinoJson::detail::sizeofArray; - static void check(const JsonArray array, const char* expected_data, size_t expected_len) { std::string expected(expected_data, expected_data + expected_len); @@ -30,7 +28,7 @@ static void check(const JsonArray array, const std::string& expected) { } TEST_CASE("serialize MsgPack array") { - JsonDocument doc(sizeofArray(65536)); + JsonDocument doc; JsonArray array = doc.to(); SECTION("empty") { diff --git a/extras/tests/MsgPackSerializer/serializeObject.cpp b/extras/tests/MsgPackSerializer/serializeObject.cpp index 65acf057..f3b7384a 100644 --- a/extras/tests/MsgPackSerializer/serializeObject.cpp +++ b/extras/tests/MsgPackSerializer/serializeObject.cpp @@ -28,7 +28,7 @@ static void check(const JsonObject object, const char (&expected_data)[N]) { //} TEST_CASE("serialize MsgPack object") { - JsonDocument doc(4096); + JsonDocument doc; JsonObject object = doc.to(); SECTION("empty") { diff --git a/extras/tests/MsgPackSerializer/serializeVariant.cpp b/extras/tests/MsgPackSerializer/serializeVariant.cpp index 1fafe3d0..0a9e6436 100644 --- a/extras/tests/MsgPackSerializer/serializeVariant.cpp +++ b/extras/tests/MsgPackSerializer/serializeVariant.cpp @@ -8,7 +8,7 @@ template static void checkVariant(T value, const char* expected_data, size_t expected_len) { - JsonDocument doc(4096); + JsonDocument doc; JsonVariant variant = doc.to(); variant.set(value); std::string expected(expected_data, expected_data + expected_len); diff --git a/extras/tests/ResourceManager/StringBuilder.cpp b/extras/tests/ResourceManager/StringBuilder.cpp index 74712b28..d0a893a4 100644 --- a/extras/tests/ResourceManager/StringBuilder.cpp +++ b/extras/tests/ResourceManager/StringBuilder.cpp @@ -12,7 +12,7 @@ using namespace ArduinoJson::detail; TEST_CASE("StringBuilder") { ControllableAllocator controllableAllocator; SpyingAllocator spyingAllocator(&controllableAllocator); - ResourceManager resources(0, &spyingAllocator); + ResourceManager resources(&spyingAllocator); SECTION("Empty string") { StringBuilder str(&resources); @@ -101,7 +101,7 @@ static StringNode* addStringToPool(ResourceManager& resources, const char* s) { } TEST_CASE("StringBuilder::save() deduplicates strings") { - ResourceManager resources(4096); + ResourceManager resources; SECTION("Basic") { auto s1 = addStringToPool(resources, "hello"); diff --git a/extras/tests/ResourceManager/allocVariant.cpp b/extras/tests/ResourceManager/allocVariant.cpp index 80e308ef..99d55d46 100644 --- a/extras/tests/ResourceManager/allocVariant.cpp +++ b/extras/tests/ResourceManager/allocVariant.cpp @@ -13,7 +13,7 @@ using namespace ArduinoJson::detail; TEST_CASE("ResourceManager::allocSlot()") { SECTION("Returns different pointer") { - ResourceManager resources(4096); + ResourceManager resources; VariantSlot* s1 = resources.allocSlot(); REQUIRE(s1 != 0); @@ -24,14 +24,14 @@ TEST_CASE("ResourceManager::allocSlot()") { } SECTION("Returns aligned pointers") { - ResourceManager resources(4096); + ResourceManager resources; REQUIRE(isAligned(resources.allocSlot().operator VariantSlot*())); REQUIRE(isAligned(resources.allocSlot().operator VariantSlot*())); } SECTION("Returns null if pool list allocation fails") { - ResourceManager resources(4096, FailingAllocator::instance()); + ResourceManager resources(FailingAllocator::instance()); auto variant = resources.allocSlot(); REQUIRE(variant.id() == NULL_SLOT); @@ -40,7 +40,7 @@ TEST_CASE("ResourceManager::allocSlot()") { SECTION("Returns null if pool allocation fails") { TimebombAllocator allocator(1); - ResourceManager resources(4096, &allocator); + ResourceManager resources(&allocator); resources.allocSlot(); diff --git a/extras/tests/ResourceManager/clear.cpp b/extras/tests/ResourceManager/clear.cpp index 8276217f..9efecfe0 100644 --- a/extras/tests/ResourceManager/clear.cpp +++ b/extras/tests/ResourceManager/clear.cpp @@ -9,10 +9,8 @@ using namespace ArduinoJson::detail; -static const size_t poolCapacity = 512; - TEST_CASE("ResourceManager::clear()") { - ResourceManager resources(poolCapacity); + ResourceManager resources; SECTION("Discards allocated variants") { resources.allocSlot(); diff --git a/extras/tests/ResourceManager/saveString.cpp b/extras/tests/ResourceManager/saveString.cpp index ff599512..d64c9147 100644 --- a/extras/tests/ResourceManager/saveString.cpp +++ b/extras/tests/ResourceManager/saveString.cpp @@ -20,7 +20,7 @@ static StringNode* saveString(ResourceManager& resources, const char* s, } TEST_CASE("ResourceManager::saveString()") { - ResourceManager resources(32); + ResourceManager resources; SECTION("Duplicates different strings") { auto a = saveString(resources, "hello"); @@ -63,7 +63,7 @@ TEST_CASE("ResourceManager::saveString()") { } SECTION("Returns NULL when allocation fails") { - ResourceManager pool2(32, FailingAllocator::instance()); + ResourceManager pool2(FailingAllocator::instance()); REQUIRE(saveString(pool2, "a") == nullptr); } } diff --git a/extras/tests/ResourceManager/size.cpp b/extras/tests/ResourceManager/size.cpp index af83ea06..aecb733e 100644 --- a/extras/tests/ResourceManager/size.cpp +++ b/extras/tests/ResourceManager/size.cpp @@ -12,7 +12,7 @@ using namespace ArduinoJson::detail; TEST_CASE("ResourceManager::size()") { TimebombAllocator allocator(0); - ResourceManager resources(4096, &allocator); + ResourceManager resources(&allocator); SECTION("Initial size is 0") { REQUIRE(0 == resources.size()); diff --git a/src/ArduinoJson/Document/JsonDocument.hpp b/src/ArduinoJson/Document/JsonDocument.hpp index 08ee82e1..15684ce5 100644 --- a/src/ArduinoJson/Document/JsonDocument.hpp +++ b/src/ArduinoJson/Document/JsonDocument.hpp @@ -21,18 +21,16 @@ class JsonDocument : public detail::VariantOperators { friend class detail::VariantAttorney; public: - explicit JsonDocument(size_t capa, - Allocator* alloc = detail::DefaultAllocator::instance()) - : resources_(capa, alloc) {} + explicit JsonDocument(Allocator* alloc = detail::DefaultAllocator::instance()) + : resources_(alloc) {} // Copy-constructor - JsonDocument(const JsonDocument& src) - : JsonDocument(src.resources_.capacity(), src.allocator()) { + JsonDocument(const JsonDocument& src) : JsonDocument(src.allocator()) { set(src); } // Move-constructor - JsonDocument(JsonDocument&& src) : resources_(0, src.allocator()) { + JsonDocument(JsonDocument&& src) : resources_(src.allocator()) { // TODO: use the copy and swap idiom moveAssignFrom(src); } @@ -48,13 +46,13 @@ class JsonDocument : public detail::VariantOperators { detail::is_same::value || detail::is_same::value || detail::is_same::value>::type* = 0) - : JsonDocument(src.memoryUsage(), alloc) { + : JsonDocument(alloc) { set(src); } // disambiguate // TODO: still needed? - JsonDocument(JsonVariant src) : JsonDocument(src.memoryUsage()) { + JsonDocument(JsonVariant src) { set(src); } @@ -72,9 +70,6 @@ class JsonDocument : public detail::VariantOperators { template JsonDocument& operator=(const T& src) { - size_t requiredSize = src.memoryUsage(); - if (requiredSize > resources_.capacity()) - resources_.reallocPool(requiredSize); set(src); return *this; } @@ -361,7 +356,6 @@ class JsonDocument : public detail::VariantOperators { } void copyAssignFrom(const JsonDocument& src) { - resources_.reallocPool(src.resources_.capacity()); set(src); } diff --git a/src/ArduinoJson/Memory/ResourceManager.hpp b/src/ArduinoJson/Memory/ResourceManager.hpp index cb47374c..953df339 100644 --- a/src/ArduinoJson/Memory/ResourceManager.hpp +++ b/src/ArduinoJson/Memory/ResourceManager.hpp @@ -18,8 +18,7 @@ class VariantPool; class ResourceManager { public: - ResourceManager(size_t /*capa*/, - Allocator* allocator = DefaultAllocator::instance()) + ResourceManager(Allocator* allocator = DefaultAllocator::instance()) : allocator_(allocator), overflowed_(false) {} ~ResourceManager() { @@ -44,13 +43,6 @@ class ResourceManager { return allocator_; } - void reallocPool(size_t requiredSize) { - size_t capa = VariantPool::bytesToSlots(requiredSize); - if (capa == variantPools_.capacity()) - return; - variantPools_.clear(allocator_); - } - // Gets the capacity of the memoryPool in bytes size_t capacity() const { return VariantPool::slotsToBytes(variantPools_.capacity());