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

Fixed JsonContainer::operator==

Browse Source
This commit is contained in:
Benoit Blanchon
2014-10-13 21:01:11 +02:00
parent 3ae90b66c6
commit 88aed98447
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
srcs/Internals/JsonNode.h
View File

@ -147,6 +147,11 @@ public:
return type == JSON_KEY_VALUE ? content.asKey.value : 0; return type == JSON_KEY_VALUE ? content.asKey.value : 0;
} }
JsonNode* getProxyTarget()
{
return type == JSON_PROXY ? content.asProxy.target : this;
}
void addChild(JsonNode* childToAdd); void addChild(JsonNode* childToAdd);
void removeChild(JsonNode* childToRemove); void removeChild(JsonNode* childToRemove);

4
srcs/JsonContainer.cpp
View File

@ -51,7 +51,9 @@ JsonNode* JsonContainer::createNode()
bool JsonContainer::operator==(const JsonContainer & other) const bool JsonContainer::operator==(const JsonContainer & other) const
{ {
return _node->getContainerChild() == other._node->getContainerChild(); if (_node == other._node) return true;
if (!_node || !other._node) return false;
return _node->getProxyTarget() == other._node->getProxyTarget();
} }
void JsonContainer::addChild(JsonNode* childToAdd) void JsonContainer::addChild(JsonNode* childToAdd)

6
tests/JsonArray_Container_Tests.cpp
View File

@ -132,10 +132,10 @@ TEST_F(JsonArray_Container_Tests, CanCreateNestedArrays)
JsonArray innerarray2 = array.createNestedArray(); JsonArray innerarray2 = array.createNestedArray();
firstElementMustBe(innerarray1); firstElementMustBe(innerarray1);
secondElementMustBe(innerarray1); secondElementMustBe(innerarray2);
nodeCountMustBe(1 + 1 + 1); nodeCountMustBe(1 + 1 + 1);
} }
/*
TEST_F(JsonArray_Container_Tests, CanCreateNestedObjects) TEST_F(JsonArray_Container_Tests, CanCreateNestedObjects)
{ {
JsonObject innerObject1 = json.createObject(); JsonObject innerObject1 = json.createObject();
@ -144,4 +144,4 @@ TEST_F(JsonArray_Container_Tests, CanCreateNestedObjects)
firstElementMustBe(innerObject1); firstElementMustBe(innerObject1);
secondElementMustBe(innerObject2); secondElementMustBe(innerObject2);
nodeCountMustBe(3); nodeCountMustBe(3);
} }*/