feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests 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

6
test/JsonObject/basics.cpp
View File

@ -7,9 +7,9 @@
TEST_CASE("JsonObject basics") {
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
SECTION("SuccessIsTrue") {
REQUIRE(obj.success());
SECTION("isNull()") {
REQUIRE(obj.isNull() == false);
}
}

2
test/JsonObject/containsKey.cpp
View File

@ -7,7 +7,7 @@
TEST_CASE("JsonObject::containsKey()") {
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
SECTION("ContainsKeyReturnsFalseForNonExistingKey") {
obj.set("hello", 42);

2
test/JsonObject/get.cpp
View File

@ -9,7 +9,7 @@ using namespace Catch::Matchers;
TEST_CASE("JsonObject::get()") {
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
SECTION("GetConstCharPointer_GivenStringLiteral") {
obj.set("hello", "world");

12
test/JsonObject/invalid.cpp
View File

@ -8,10 +8,10 @@
using namespace Catch::Matchers;
TEST_CASE("JsonObject::invalid()") {
JsonObject& obj = JsonObject::invalid();
JsonObject obj;
SECTION("SubscriptFails") {
REQUIRE_FALSE(obj["key"].success());
REQUIRE(obj["key"].isNull());
}
SECTION("AddFails") {
@ -20,16 +20,16 @@ TEST_CASE("JsonObject::invalid()") {
}
SECTION("CreateNestedArrayFails") {
REQUIRE_FALSE(obj.createNestedArray("hello").success());
REQUIRE(obj.createNestedArray("hello").isNull());
}
SECTION("CreateNestedObjectFails") {
REQUIRE_FALSE(obj.createNestedObject("world").success());
REQUIRE(obj.createNestedObject("world").isNull());
}
SECTION("PrintToWritesBraces") {
SECTION("serialize to 'null'") {
char buffer[32];
serializeJson(obj, buffer, sizeof(buffer));
REQUIRE_THAT(buffer, Equals("{}"));
REQUIRE_THAT(buffer, Equals("null"));
}
}

4
test/JsonObject/iterator.cpp
View File

@ -9,7 +9,7 @@ using namespace Catch::Matchers;
TEST_CASE("JsonObject::begin()/end()") {
StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj["ab"] = 12;
obj["cd"] = 34;
@ -35,7 +35,7 @@ TEST_CASE("JsonObject::begin()/end()") {
}
SECTION("ConstIterator") {
const JsonObject& const_object = obj;
const JsonObject const_object = obj;
JsonObject::const_iterator it = const_object.begin();
REQUIRE(const_object.end() != it);

2
test/JsonObject/remove.cpp
View File

@ -8,7 +8,7 @@
TEST_CASE("JsonObject::remove()") {
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
SECTION("SizeDecreased_WhenValuesAreRemoved") {
obj["hello"] = 1;

26
test/JsonObject/set.cpp
View File

@ -8,7 +8,7 @@
TEST_CASE("JsonObject::set()") {
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
SECTION("int") {
obj.set("hello", 123);
@ -44,29 +44,29 @@ TEST_CASE("JsonObject::set()") {
SECTION("nested array") {
DynamicJsonDocument doc2;
JsonArray& arr = doc2.to<JsonArray>();
JsonArray arr = doc2.to<JsonArray>();
obj.set("hello", arr);
REQUIRE(&arr == &obj["hello"].as<JsonArray>());
REQUIRE(obj["hello"].is<JsonArray&>());
REQUIRE_FALSE(obj["hello"].is<JsonObject&>());
REQUIRE(arr == obj["hello"].as<JsonArray>());
REQUIRE(obj["hello"].is<JsonArray>());
REQUIRE_FALSE(obj["hello"].is<JsonObject>());
}
SECTION("nested object") {
DynamicJsonDocument doc2;
JsonObject& obj2 = doc2.to<JsonObject>();
JsonObject obj2 = doc2.to<JsonObject>();
obj.set("hello", obj2);
REQUIRE(&obj2 == &obj["hello"].as<JsonObject>());
REQUIRE(obj["hello"].is<JsonObject&>());
REQUIRE_FALSE(obj["hello"].is<JsonArray&>());
REQUIRE(obj2 == obj["hello"].as<JsonObject>());
REQUIRE(obj["hello"].is<JsonObject>());
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.set("a", arr[0]);
@ -76,7 +76,7 @@ TEST_CASE("JsonObject::set()") {
SECTION("object subscript") {
DynamicJsonDocument doc2;
JsonObject& obj2 = doc2.to<JsonObject>();
JsonObject obj2 = doc2.to<JsonObject>();
obj2.set("x", 42);
obj.set("a", obj2["x"]);
@ -86,14 +86,14 @@ TEST_CASE("JsonObject::set()") {
SECTION("returns true when allocation succeeds") {
StaticJsonDocument<JSON_OBJECT_SIZE(1) + 15> doc2;
JsonObject& obj2 = doc2.to<JsonObject>();
JsonObject obj2 = doc2.to<JsonObject>();
REQUIRE(true == obj2.set(std::string("hello"), std::string("world")));
}
SECTION("returns false when allocation fails") {
StaticJsonDocument<JSON_OBJECT_SIZE(1) + 10> doc2;
JsonObject& obj2 = doc2.to<JsonObject>();
JsonObject obj2 = doc2.to<JsonObject>();
REQUIRE(false == obj2.set(std::string("hello"), std::string("world")));
}

2
test/JsonObject/size.cpp
View File

@ -8,7 +8,7 @@
TEST_CASE("JsonObject::size()") {
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
SECTION("initial size is zero") {
REQUIRE(0 == obj.size());

38
test/JsonObject/std_string.cpp
View File

@ -17,7 +17,7 @@ TEST_CASE("std::string") {
char json[] = "{\"key\":\"value\"}";
deserializeJson(doc, json);
JsonObject &obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
REQUIRE(std::string("value") == obj[std::string("key")]);
}
@ -26,13 +26,13 @@ TEST_CASE("std::string") {
char json[] = "{\"key\":\"value\"}";
deserializeJson(doc, json);
JsonObject &obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
REQUIRE(std::string("value") == obj[std::string("key")]);
}
SECTION("set(key)") {
JsonObject &obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
std::string key("hello");
obj.set(key, "world");
eraseString(key);
@ -40,7 +40,7 @@ TEST_CASE("std::string") {
}
SECTION("set(value)") {
JsonObject &obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
std::string value("world");
obj.set("hello", value);
eraseString(value);
@ -48,7 +48,7 @@ TEST_CASE("std::string") {
}
SECTION("set(key,value)") {
JsonObject &obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
std::string key("hello");
std::string value("world");
obj.set(key, value);
@ -58,9 +58,9 @@ TEST_CASE("std::string") {
}
SECTION("set(JsonArraySubscript)") {
JsonObject &obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
DynamicJsonDocument doc2;
JsonArray &arr = doc2.to<JsonArray>();
JsonArray arr = doc2.to<JsonArray>();
arr.add("world");
obj.set(std::string("hello"), arr[0]);
@ -69,9 +69,9 @@ TEST_CASE("std::string") {
}
SECTION("set(JsonObjectSubscript)") {
JsonObject &obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
DynamicJsonDocument doc2;
JsonObject &obj2 = doc2.to<JsonObject>();
JsonObject obj2 = doc2.to<JsonObject>();
obj2.set("x", "world");
obj.set(std::string("hello"), obj2["x"]);
@ -82,7 +82,7 @@ TEST_CASE("std::string") {
SECTION("get<T>()") {
char json[] = "{\"key\":\"value\"}";
deserializeJson(doc, json);
JsonObject &obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
REQUIRE(std::string("value") == obj.get<const char *>(std::string("key")));
}
@ -90,13 +90,13 @@ TEST_CASE("std::string") {
SECTION("is<T>()") {
char json[] = "{\"key\":\"value\"}";
deserializeJson(doc, json);
JsonObject &obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
REQUIRE(true == obj.is<const char *>(std::string("key")));
}
SECTION("createNestedObject()") {
JsonObject &obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
std::string key = "key";
char json[64];
obj.createNestedObject(key);
@ -106,7 +106,7 @@ TEST_CASE("std::string") {
}
SECTION("createNestedArray()") {
JsonObject &obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
std::string key = "key";
char json[64];
obj.createNestedArray(key);
@ -118,12 +118,12 @@ TEST_CASE("std::string") {
SECTION("containsKey()") {
char json[] = "{\"key\":\"value\"}";
deserializeJson(doc, json);
JsonObject &obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
REQUIRE(true == obj.containsKey(std::string("key")));
}
SECTION("remove()") {
JsonObject &obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj["key"] = "value";
obj.remove(std::string("key"));
@ -133,7 +133,7 @@ TEST_CASE("std::string") {
SECTION("operator[], set key") {
std::string key("hello");
JsonObject &obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj[key] = "world";
eraseString(key);
REQUIRE(std::string("world") == obj["hello"]);
@ -141,7 +141,7 @@ TEST_CASE("std::string") {
SECTION("operator[], set value") {
std::string value("world");
JsonObject &obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj["hello"] = value;
eraseString(value);
REQUIRE(std::string("world") == obj["hello"]);
@ -149,7 +149,7 @@ TEST_CASE("std::string") {
SECTION("memoryUsage() increases when adding a new key") {
std::string key1("hello"), key2("world");
JsonObject &obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj[key1] = 1;
size_t sizeBefore = doc.memoryUsage();
@ -161,7 +161,7 @@ TEST_CASE("std::string") {
SECTION("memoryUsage() remains when adding the same key") {
std::string key("hello");
JsonObject &obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj[key] = 1;
size_t sizeBefore = doc.memoryUsage();

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"];