feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Removed JsonArray::is<T>(i) and JsonArray::set(i,v)

Browse Source 
Removed `JsonObject::is<T>(k)` and `JsonObject::set(k,v)`
Replaced `T JsonArray::get<T>(i)` with `JsonVariant JsonArray::get(i)`
Replaced `T JsonObject::get<T>(k)` with `JsonVariant JsonObject::get(k)`
This commit is contained in:
Benoit Blanchon
2018-10-18 14:51:02 +02:00
parent 4eee8e8bdf
commit 1a4515c0b9
20 changed files with 38 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/JsonSerializer/JsonObject.cpp
View File

@ -26,7 +26,7 @@ TEST_CASE("serializeJson(JsonObject)") {
SECTION("TwoStrings") {
obj["key1"] = "value1";
obj.set("key2", "value2");
obj["key2"] = "value2";
check(obj, "{\"key1\":\"value1\",\"key2\":\"value2\"}");
}
@ -64,31 +64,31 @@ TEST_CASE("serializeJson(JsonObject)") {
SECTION("TwoIntegers") {
obj["a"] = 1;
obj.set("b", 2);
obj["b"] = 2;
check(obj, "{\"a\":1,\"b\":2}");
}
SECTION("serialized(const char*)") {
obj["a"] = serialized("[1,2]");
obj.set("b", serialized("[4,5]"));
obj["b"] = serialized("[4,5]");
check(obj, "{\"a\":[1,2],\"b\":[4,5]}");
}
SECTION("Two doubles") {
obj["a"] = 12.34;
obj.set("b", 56.78);
obj["b"] = 56.78;
check(obj, "{\"a\":12.34,\"b\":56.78}");
}
SECTION("TwoNull") {
obj["a"] = static_cast<char *>(0);
obj.set("b", static_cast<char *>(0));
obj["b"] = static_cast<char *>(0);
check(obj, "{\"a\":null,\"b\":null}");
}
SECTION("TwoBooleans") {
obj["a"] = true;
obj.set("b", false);
obj["b"] = false;
check(obj, "{\"a\":true,\"b\":false}");
}
@ -98,7 +98,7 @@ TEST_CASE("serializeJson(JsonObject)") {
obj.createNestedArray("a");
obj["b"] = b.to<JsonArray>();
obj.set("c", c.to<JsonArray>());
obj["c"] = c.to<JsonArray>();
check(obj, "{\"a\":[],\"b\":[],\"c\":[]}");
}
@ -109,7 +109,7 @@ TEST_CASE("serializeJson(JsonObject)") {
obj.createNestedObject("a");
obj["b"] = b.to<JsonObject>();
obj.set("c", c.to<JsonObject>());
obj["c"] = c.to<JsonObject>();
check(obj, "{\"a\":{},\"b\":{},\"c\":{}}");
}