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

Return JsonArray and JsonObject by value (closes #309)

Browse Source
This commit is contained in:
Benoit Blanchon
2018-07-02 09:35:21 +02:00
parent 4fe2b1100e
commit b105e6f7c4
93 changed files with 983 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
test/JsonObject/subscript.cpp
View File

@ -7,7 +7,7 @@
TEST_CASE("JsonObject::operator[]") {
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
SECTION("int") {
obj["hello"] = 123;
@ -53,41 +53,37 @@ TEST_CASE("JsonObject::operator[]") {
SECTION("array") {
DynamicJsonDocument doc2;
JsonArray& arr = doc2.to<JsonArray>();
JsonArray arr = doc2.to<JsonArray>();
obj["hello"] = arr;
REQUIRE(&arr == &obj["hello"].as<JsonArray&>());
REQUIRE(&arr == &obj["hello"].as<JsonArray>()); // <- short hand
REQUIRE(&arr == &obj["hello"].as<const JsonArray&>());
REQUIRE(&arr == &obj["hello"].as<const JsonArray>()); // <- short hand
REQUIRE(true == obj["hello"].is<JsonArray&>());
REQUIRE(arr == obj["hello"].as<JsonArray>());
REQUIRE(arr == obj["hello"].as<JsonArray>()); // <- short hand
// REQUIRE(arr == obj["hello"].as<const JsonArray>());
// REQUIRE(arr == obj["hello"].as<const JsonArray>()); // <- short hand
REQUIRE(true == obj["hello"].is<JsonArray>());
REQUIRE(true == obj["hello"].is<JsonArray>());
REQUIRE(true == obj["hello"].is<const JsonArray&>());
REQUIRE(true == obj["hello"].is<const JsonArray>());
REQUIRE(false == obj["hello"].is<JsonObject&>());
REQUIRE(true == obj["hello"].is<const JsonArray>());
REQUIRE(false == obj["hello"].is<JsonObject>());
}
SECTION("object") {
DynamicJsonDocument doc2;
JsonObject& obj2 = doc2.to<JsonObject>();
JsonObject obj2 = doc2.to<JsonObject>();
obj["hello"] = obj2;
REQUIRE(&obj2 == &obj["hello"].as<JsonObject&>());
REQUIRE(&obj2 == &obj["hello"].as<JsonObject>()); // <- short hand
REQUIRE(&obj2 == &obj["hello"].as<const JsonObject&>());
REQUIRE(&obj2 == &obj["hello"].as<const JsonObject>()); // <- short hand
REQUIRE(true == obj["hello"].is<JsonObject&>());
REQUIRE(obj2 == obj["hello"].as<JsonObject>());
REQUIRE(obj2 == obj["hello"].as<const JsonObject>());
REQUIRE(true == obj["hello"].is<JsonObject>());
REQUIRE(true == obj["hello"].is<const JsonObject&>());
REQUIRE(true == obj["hello"].is<const JsonObject>());
REQUIRE(false == obj["hello"].is<JsonArray&>());
REQUIRE(false == obj["hello"].is<JsonArray>());
}
SECTION("array subscript") {
DynamicJsonDocument doc2;
JsonArray& arr = doc2.to<JsonArray>();
JsonArray arr = doc2.to<JsonArray>();
arr.add(42);
obj["a"] = arr[0];
@ -97,7 +93,7 @@ TEST_CASE("JsonObject::operator[]") {
SECTION("object subscript") {
DynamicJsonDocument doc2;
JsonObject& obj2 = doc2.to<JsonObject>();
JsonObject obj2 = doc2.to<JsonObject>();
obj2.set("x", 42);
obj["a"] = obj2["x"];