bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-29 02:07:32 +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/Misc/unsigned_char.cpp
View File

@ -101,7 +101,7 @@ TEST_CASE("unsigned char[]") {
unsigned char key[] = "hello";
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj[key] = "world";
REQUIRE(std::string("world") == obj["hello"]);
@ -113,7 +113,7 @@ TEST_CASE("unsigned char[]") {
DynamicJsonDocument doc;
deserializeJson(doc, "{\"hello\":\"world\"}");
JsonObject& obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
REQUIRE(std::string("world") == obj[key]);
}
#endif
@ -123,7 +123,7 @@ TEST_CASE("unsigned char[]") {
DynamicJsonDocument doc;
deserializeJson(doc, "{\"hello\":\"world\"}");
JsonObject& obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
REQUIRE(std::string("world") == obj.get<char*>(key));
}
@ -131,7 +131,7 @@ TEST_CASE("unsigned char[]") {
unsigned char key[] = "hello";
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj.set(key, "world");
REQUIRE(std::string("world") == obj["hello"]);
@ -141,7 +141,7 @@ TEST_CASE("unsigned char[]") {
unsigned char value[] = "world";
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj.set("hello", value);
REQUIRE(std::string("world") == obj["hello"]);
@ -151,7 +151,7 @@ TEST_CASE("unsigned char[]") {
unsigned char key[] = "world";
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj.set(key, key);
REQUIRE(std::string("world") == obj["world"]);
@ -162,7 +162,7 @@ TEST_CASE("unsigned char[]") {
DynamicJsonDocument doc;
deserializeJson(doc, "{\"hello\":\"world\"}");
JsonObject& obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
REQUIRE(true == obj.containsKey(key));
}
@ -171,7 +171,7 @@ TEST_CASE("unsigned char[]") {
DynamicJsonDocument doc;
deserializeJson(doc, "{\"hello\":\"world\"}");
JsonObject& obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
obj.remove(key);
REQUIRE(0 == obj.size());
@ -182,7 +182,7 @@ TEST_CASE("unsigned char[]") {
DynamicJsonDocument doc;
deserializeJson(doc, "{\"hello\":42}");
JsonObject& obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
REQUIRE(true == obj.is<int>(key));
}
@ -191,7 +191,7 @@ TEST_CASE("unsigned char[]") {
unsigned char key[] = "hello";
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj.createNestedArray(key);
}
@ -199,7 +199,7 @@ TEST_CASE("unsigned char[]") {
unsigned char key[] = "hello";
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj.createNestedObject(key);
}
}
@ -209,7 +209,7 @@ TEST_CASE("unsigned char[]") {
unsigned char value[] = "world";
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj["hello"] = value;
REQUIRE(std::string("world") == obj["hello"]);
@ -219,7 +219,7 @@ TEST_CASE("unsigned char[]") {
unsigned char value[] = "world";
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj["hello"].set(value);
REQUIRE(std::string("world") == obj["hello"]);
@ -231,7 +231,7 @@ TEST_CASE("unsigned char[]") {
unsigned char value[] = "world";
DynamicJsonDocument doc;
JsonArray& arr = doc.to<JsonArray>();
JsonArray arr = doc.to<JsonArray>();
arr.add(value);
REQUIRE(std::string("world") == arr[0]);
@ -241,7 +241,7 @@ TEST_CASE("unsigned char[]") {
unsigned char value[] = "world";
DynamicJsonDocument doc;
JsonArray& arr = doc.to<JsonArray>();
JsonArray arr = doc.to<JsonArray>();
arr.add("hello");
arr.set(0, value);
@ -254,7 +254,7 @@ TEST_CASE("unsigned char[]") {
unsigned char value[] = "world";
DynamicJsonDocument doc;
JsonArray& arr = doc.to<JsonArray>();
JsonArray arr = doc.to<JsonArray>();
arr.add("hello");
arr[0].set(value);
@ -265,7 +265,7 @@ TEST_CASE("unsigned char[]") {
unsigned char value[] = "world";
DynamicJsonDocument doc;
JsonArray& arr = doc.to<JsonArray>();
JsonArray arr = doc.to<JsonArray>();
arr.add("hello");
arr[0] = value;

34
test/Misc/vla.cpp
View File

@ -126,7 +126,7 @@ TEST_CASE("Variable Length Array") {
strcpy(vla, "hello");
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj[vla] = "world";
REQUIRE(std::string("world") == obj["hello"]);
@ -142,7 +142,7 @@ TEST_CASE("Variable Length Array") {
DynamicJsonDocument doc;
deserializeJson(doc, "{\"hello\":\"world\"}");
JsonObject& obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
REQUIRE(std::string("world") == obj[vla]);
}
#endif
@ -155,7 +155,7 @@ TEST_CASE("Variable Length Array") {
DynamicJsonDocument doc;
deserializeJson(doc, "{\"hello\":\"world\"}");
JsonObject& obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
REQUIRE(std::string("world") == obj.get<char*>(vla));
}
@ -165,7 +165,7 @@ TEST_CASE("Variable Length Array") {
strcpy(vla, "hello");
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj.set(vla, "world");
REQUIRE(std::string("world") == obj["hello"]);
@ -177,7 +177,7 @@ TEST_CASE("Variable Length Array") {
strcpy(vla, "world");
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj.set("hello", vla);
REQUIRE(std::string("world") == obj["hello"]);
@ -189,7 +189,7 @@ TEST_CASE("Variable Length Array") {
strcpy(vla, "world");
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj.set(vla, vla);
REQUIRE(std::string("world") == obj["world"]);
@ -203,7 +203,7 @@ TEST_CASE("Variable Length Array") {
DynamicJsonDocument doc;
deserializeJson(doc, "{\"hello\":\"world\"}");
JsonObject& obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
REQUIRE(true == obj.containsKey(vla));
}
@ -214,7 +214,7 @@ TEST_CASE("Variable Length Array") {
DynamicJsonDocument doc;
deserializeJson(doc, "{\"hello\":\"world\"}");
JsonObject& obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
obj.remove(vla);
REQUIRE(0 == obj.size());
@ -227,7 +227,7 @@ TEST_CASE("Variable Length Array") {
DynamicJsonDocument doc;
deserializeJson(doc, "{\"hello\":42}");
JsonObject& obj = doc.as<JsonObject>();
JsonObject obj = doc.as<JsonObject>();
REQUIRE(true == obj.is<int>(vla));
}
@ -238,7 +238,7 @@ TEST_CASE("Variable Length Array") {
strcpy(vla, "hello");
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj.createNestedArray(vla);
}
@ -248,7 +248,7 @@ TEST_CASE("Variable Length Array") {
strcpy(vla, "hello");
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj.createNestedObject(vla);
}
}
@ -260,7 +260,7 @@ TEST_CASE("Variable Length Array") {
strcpy(vla, "world");
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj["hello"] = vla;
REQUIRE(std::string("world") == obj["hello"].as<char*>());
@ -272,7 +272,7 @@ TEST_CASE("Variable Length Array") {
strcpy(vla, "world");
DynamicJsonDocument doc;
JsonObject& obj = doc.to<JsonObject>();
JsonObject obj = doc.to<JsonObject>();
obj["hello"].set(vla);
REQUIRE(std::string("world") == obj["hello"].as<char*>());
@ -286,7 +286,7 @@ TEST_CASE("Variable Length Array") {
strcpy(vla, "world");
DynamicJsonDocument doc;
JsonArray& arr = doc.to<JsonArray>();
JsonArray arr = doc.to<JsonArray>();
arr.add(vla);
REQUIRE(std::string("world") == arr[0]);
@ -298,7 +298,7 @@ TEST_CASE("Variable Length Array") {
strcpy(vla, "world");
DynamicJsonDocument doc;
JsonArray& arr = doc.to<JsonArray>();
JsonArray arr = doc.to<JsonArray>();
arr.add("hello");
arr.set(0, vla);
@ -313,7 +313,7 @@ TEST_CASE("Variable Length Array") {
strcpy(vla, "world");
DynamicJsonDocument doc;
JsonArray& arr = doc.to<JsonArray>();
JsonArray arr = doc.to<JsonArray>();
arr.add("hello");
arr[0].set(vla);
@ -326,7 +326,7 @@ TEST_CASE("Variable Length Array") {
strcpy(vla, "world");
DynamicJsonDocument doc;
JsonArray& arr = doc.to<JsonArray>();
JsonArray arr = doc.to<JsonArray>();
arr.add("hello");
arr[0] = vla;