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

Extract VariantImpl

Browse Source
This commit is contained in:
Benoit Blanchon
2025-06-26 14:59:10 +02:00
parent 48dec78781
commit 31a729d35c
35 changed files with 506 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
extras/tests/ResourceManager/StringBuilder.cpp
View File

@ -26,7 +26,7 @@ TEST_CASE("StringBuilder") {
REQUIRE(spyingAllocator.log() == AllocatorLog{
Allocate(sizeofStringBuffer()),
});
REQUIRE(data.type() == VariantType::TinyString);
REQUIRE(data.type == VariantType::TinyString);
}
SECTION("Tiny string") {
@ -45,8 +45,8 @@ TEST_CASE("StringBuilder") {
str.save(&data);
REQUIRE(resources.overflowed() == false);
REQUIRE(data.type() == VariantType::TinyString);
REQUIRE(data.asString(&resources) == "url");
REQUIRE(data.type == VariantType::TinyString);
REQUIRE(VariantImpl(&data, &resources).asString() == "url");
}
SECTION("Short string fits in first allocation") {
@ -134,10 +134,10 @@ TEST_CASE("StringBuilder::save() deduplicates strings") {
auto s2 = saveString(builder, "world");
auto s3 = saveString(builder, "hello");
REQUIRE(s1.asString(&resources) == "hello");
REQUIRE(s2.asString(&resources) == "world");
REQUIRE(+s1.asString(&resources).c_str() ==
+s3.asString(&resources).c_str()); // same address
REQUIRE(VariantImpl(&s1, &resources).asString() == "hello");
REQUIRE(VariantImpl(&s2, &resources).asString() == "world");
REQUIRE(+VariantImpl(&s1, &resources).asString().c_str() ==
+VariantImpl(&s3, &resources).asString().c_str()); // same address
REQUIRE(spy.log() ==
AllocatorLog{
@ -153,10 +153,11 @@ TEST_CASE("StringBuilder::save() deduplicates strings") {
auto s1 = saveString(builder, "hello world");
auto s2 = saveString(builder, "hello");
REQUIRE(s1.asString(&resources) == "hello world");
REQUIRE(s2.asString(&resources) == "hello");
REQUIRE(+s2.asString(&resources).c_str() !=
+s1.asString(&resources).c_str()); // different address
REQUIRE(VariantImpl(&s1, &resources).asString() == "hello world");
REQUIRE(VariantImpl(&s2, &resources).asString() == "hello");
REQUIRE(
+VariantImpl(&s1, &resources).asString().c_str() !=
+VariantImpl(&s2, &resources).asString().c_str()); // different address
REQUIRE(spy.log() ==
AllocatorLog{
@ -171,10 +172,11 @@ TEST_CASE("StringBuilder::save() deduplicates strings") {
auto s1 = saveString(builder, "hello world");
auto s2 = saveString(builder, "worl");
REQUIRE(s1.asString(&resources) == "hello world");
REQUIRE(s2.asString(&resources) == "worl");
REQUIRE(s2.asString(&resources).c_str() !=
s1.asString(&resources).c_str()); // different address
REQUIRE(VariantImpl(&s1, &resources).asString() == "hello world");
REQUIRE(VariantImpl(&s2, &resources).asString() == "worl");
REQUIRE(
VariantImpl(&s1, &resources).asString().c_str() !=
VariantImpl(&s2, &resources).asString().c_str()); // different address
REQUIRE(spy.log() ==
AllocatorLog{