github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 00:38:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix size()

Browse Source
This commit is contained in:
Benoit Blanchon
2022-03-10 14:54:34 +01:00
parent a2b5fbab19
commit a673f14943
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
extras/tests/JsonVariant/link.cpp
View File

@@ -51,3 +51,24 @@ TEST_CASE("JsonVariant::link()") {
CHECK(variant.as<std::string>() == "{\"hello\":\"WORLD!\"}"); CHECK(variant.as<std::string>() == "{\"hello\":\"WORLD!\"}");
} }
} }
TEST_CASE("Linked document") {
StaticJsonDocument<1024> doc1, doc2;
JsonVariant variant = doc1.to<JsonVariant>();
doc2["hello"] = "world";
variant.link(doc2);
// TODO: move in size.cpp
SECTION("size()") {
CHECK(doc1.size() == 1);
}
SECTION("is<T>()") {
CHECK(doc1.is<JsonObject>() == true);
CHECK(doc1.is<JsonArray>() == false);
}
SECTION("get member") {
CHECK(doc1["hello"].as<std::string>() == "world");
}
}

8
src/ArduinoJson/Variant/VariantData.hpp
View File

@@ -117,6 +117,10 @@ class VariantData {
return (_flags & COLLECTION_MASK) != 0; return (_flags & COLLECTION_MASK) != 0;
} }
bool isPointer() const {
return type() == VALUE_IS_POINTER;
}
template <typename T> template <typename T>
bool isInteger() const { bool isInteger() const {
switch (type()) { switch (type()) {
@@ -259,7 +263,9 @@ class VariantData {
} }
size_t size() const { size_t size() const {
return isCollection() ? _content.asCollection.size() : 0; return isPointer() ? _content.asPointer->size()
: isCollection() ? _content.asCollection.size()
: 0;
} }
VariantData *addElement(MemoryPool *pool) { VariantData *addElement(MemoryPool *pool) {