feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Replacing a value now releases the memory

Browse Source
This commit is contained in:
Benoit Blanchon
2018-11-12 18:28:34 +01:00
parent f375459d53
commit 720e6548c7
18 changed files with 335 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/JsonObject/createNestedObject.cpp
View File

@ -22,4 +22,17 @@ TEST_CASE("JsonObject::createNestedObject()") {
obj.createNestedObject(vla);
}
#endif
SECTION("releases memory from nested object") {
obj.createNestedObject(std::string("a"))
.createNestedObject(std::string("b"))
.set(std::string("c"))
.set(1);
// {"a":{"b":{"c":1}}}
REQUIRE(doc.memoryUsage() ==
3 * JSON_OBJECT_SIZE(1) + 3 * JSON_STRING_SIZE(2));
obj.createNestedObject(std::string("a"));
REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(2));
}
}

16
test/JsonObject/subscript.cpp
View File

@ -141,6 +141,22 @@ TEST_CASE("JsonObject::operator[]") {
REQUIRE(expectedSize <= doc.memoryUsage());
}
SECTION("should release string memory when overiding value") {
obj["hello"] = std::string("world");
REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(6));
obj["hello"] = 42;
REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1));
}
SECTION("should release nested array memory when overiding value") {
obj.createNestedArray("hello").add("world");
REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + JSON_ARRAY_SIZE(1));
obj["hello"] = 42;
REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1));
}
SECTION("should ignore null key") {
// object must have a value to make a call to strcmp()
obj["dummy"] = 42;