bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-16 12:02:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove BasicJsonDocument

Browse Source
This commit is contained in:
Benoit Blanchon
2023-03-20 14:49:08 +01:00
parent 24aaab6e3e
commit db9258bcd7
6 changed files with 178 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/tests/JsonDocument/CMakeLists.txt
View File

@ -4,7 +4,7 @@
add_executable(JsonDocumentTests
add.cpp
BasicJsonDocument.cpp
allocator.cpp
cast.cpp
compare.cpp
containsKey.cpp

30
extras/tests/JsonDocument/BasicJsonDocument.cpp → extras/tests/JsonDocument/allocator.cpp
View File

@ -60,21 +60,21 @@ class ControllableAllocator : public Allocator {
bool _enabled;
};
TEST_CASE("BasicJsonDocument") {
TEST_CASE("DynamicJsonDocument's allocator") {
SpyingAllocator spyingAllocator;
ControllableAllocator controllableAllocator;
SECTION("Construct/Destruct") {
{ BasicJsonDocument doc(4096, &spyingAllocator); }
{ DynamicJsonDocument doc(4096, &spyingAllocator); }
REQUIRE(spyingAllocator.log() == "A4096F");
}
SECTION("Copy construct") {
{
BasicJsonDocument doc1(4096, &spyingAllocator);
DynamicJsonDocument doc1(4096, &spyingAllocator);
doc1.set(std::string("The size of this string is 32!!"));
BasicJsonDocument doc2(doc1);
DynamicJsonDocument doc2(doc1);
REQUIRE(doc1.as<std::string>() == "The size of this string is 32!!");
REQUIRE(doc2.as<std::string>() == "The size of this string is 32!!");
@ -85,10 +85,10 @@ TEST_CASE("BasicJsonDocument") {
SECTION("Move construct") {
{
BasicJsonDocument doc1(4096, &spyingAllocator);
DynamicJsonDocument doc1(4096, &spyingAllocator);
doc1.set(std::string("The size of this string is 32!!"));
BasicJsonDocument doc2(std::move(doc1));
DynamicJsonDocument doc2(std::move(doc1));
REQUIRE(doc2.as<std::string>() == "The size of this string is 32!!");
REQUIRE(doc1.as<std::string>() == "null");
@ -100,9 +100,9 @@ TEST_CASE("BasicJsonDocument") {
SECTION("Copy assign larger") {
{
BasicJsonDocument doc1(4096, &spyingAllocator);
DynamicJsonDocument doc1(4096, &spyingAllocator);
doc1.set(std::string("The size of this string is 32!!"));
BasicJsonDocument doc2(8, &spyingAllocator);
DynamicJsonDocument doc2(8, &spyingAllocator);
doc2 = doc1;
@ -115,9 +115,9 @@ TEST_CASE("BasicJsonDocument") {
SECTION("Copy assign smaller") {
{
BasicJsonDocument doc1(1024, &spyingAllocator);
DynamicJsonDocument doc1(1024, &spyingAllocator);
doc1.set(std::string("The size of this string is 32!!"));
BasicJsonDocument doc2(4096, &spyingAllocator);
DynamicJsonDocument doc2(4096, &spyingAllocator);
doc2 = doc1;
@ -130,9 +130,9 @@ TEST_CASE("BasicJsonDocument") {
SECTION("Copy assign same size") {
{
BasicJsonDocument doc1(1024, &spyingAllocator);
DynamicJsonDocument doc1(1024, &spyingAllocator);
doc1.set(std::string("The size of this string is 32!!"));
BasicJsonDocument doc2(1024, &spyingAllocator);
DynamicJsonDocument doc2(1024, &spyingAllocator);
doc2 = doc1;
@ -145,9 +145,9 @@ TEST_CASE("BasicJsonDocument") {
SECTION("Move assign") {
{
BasicJsonDocument doc1(4096, &spyingAllocator);
DynamicJsonDocument doc1(4096, &spyingAllocator);
doc1.set(std::string("The size of this string is 32!!"));
BasicJsonDocument doc2(8, &spyingAllocator);
DynamicJsonDocument doc2(8, &spyingAllocator);
doc2 = std::move(doc1);
@ -160,7 +160,7 @@ TEST_CASE("BasicJsonDocument") {
}
SECTION("garbageCollect()") {
BasicJsonDocument doc(4096, &controllableAllocator);
DynamicJsonDocument doc(4096, &controllableAllocator);
SECTION("when allocation succeeds") {
deserializeJson(doc, "{\"blanket\":1,\"dancing\":2}");

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

@ -58,7 +58,7 @@ void testShrinkToFit(DynamicJsonDocument& doc, std::string expected_json,
}
}
TEST_CASE("BasicJsonDocument::shrinkToFit()") {
TEST_CASE("DynamicJsonDocument::shrinkToFit()") {
ArmoredAllocator armoredAllocator;
DynamicJsonDocument doc(4096, &armoredAllocator);
@ -138,15 +138,3 @@ TEST_CASE("BasicJsonDocument::shrinkToFit()") {
REQUIRE(doc[0] == "?");
}
}
TEST_CASE("DynamicJsonDocument::shrinkToFit()") {
DynamicJsonDocument doc(4096);
deserializeJson(doc, "{\"hello\":[\"world\"]");
doc.shrinkToFit();
std::string json;
serializeJson(doc, json);
REQUIRE(json == "{\"hello\":[\"world\"]}");
}