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

Always store serialized("string") by copy (#1915)

Browse Source
This commit is contained in:
Benoit Blanchon
2023-05-02 09:36:40 +02:00
parent 95f5d9d134
commit 806fa907ab
10 changed files with 11 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extras/tests/JsonArray/add.cpp
View File

@ -115,9 +115,9 @@ TEST_CASE("JsonArray::add()") {
REQUIRE(expectedSize == doc.memoryUsage());
}
SECTION("should not duplicate serialized(const char*)") {
SECTION("should duplicate serialized(const char*)") {
array.add(serialized("{}"));
const size_t expectedSize = sizeofArray(1);
const size_t expectedSize = sizeofArray(1) + sizeofString(2);
REQUIRE(expectedSize == doc.memoryUsage());
}

11
extras/tests/JsonDocument/shrinkToFit.cpp
View File

@ -97,17 +97,6 @@ TEST_CASE("JsonDocument::shrinkToFit()") {
<< AllocatorLog::Reallocate(4096, 0));
}
SECTION("linked raw") {
doc.set(serialized("[{},123]"));
doc.shrinkToFit();
REQUIRE(doc.as<std::string>() == "[{},123]");
REQUIRE(spyingAllocator.log() == AllocatorLog()
<< AllocatorLog::Allocate(4096)
<< AllocatorLog::Reallocate(4096, 0));
}
SECTION("owned raw") {
doc.set(serialized(std::string("[{},12]")));

11
extras/tests/JsonVariant/copy.cpp
View File

@ -89,15 +89,16 @@ TEST_CASE("JsonVariant::set(JsonVariant)") {
AllocatorLog() << AllocatorLog::Allocate(sizeofString((7))));
}
SECTION("stores Serialized<const char*> by reference") {
var1.set(serialized("hello!!", 8));
SECTION("stores Serialized<const char*> by copy") {
var1.set(serialized("hello!!", 7));
spyingAllocator.clearLog();
var2.set(var1);
REQUIRE(doc1.memoryUsage() == 0);
REQUIRE(doc2.memoryUsage() == 0);
REQUIRE(spyingAllocator.log() == AllocatorLog());
REQUIRE(doc1.memoryUsage() == sizeofString(7));
REQUIRE(doc2.memoryUsage() == sizeofString(7));
REQUIRE(spyingAllocator.log() ==
AllocatorLog() << AllocatorLog::Allocate(sizeofString((7))));
}
SECTION("stores Serialized<char*> by copy") {

2
extras/tests/JsonVariant/set.cpp
View File

@ -205,6 +205,6 @@ TEST_CASE("JsonVariant::set() releases the previous value") {
SECTION("Serialized<const char*>") {
v.set(serialized("[]"));
REQUIRE(doc.memoryUsage() == sizeofObject(1));
REQUIRE(doc.memoryUsage() == sizeofObject(1) + sizeofString(2));
}
}