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

Don't use JsonBuffer to create or parse objects and arrays.

Browse Source 
* Added DynamicJsonArray and StaticJsonArray
* Added DynamicJsonObject and StaticJsonObject
* Added DynamicJsonVariant and StaticJsonVariant
* Added deserializeJson()
* Removed JsonBuffer::parseArray(), parseObject() and parse()
* Removed JsonBuffer::createArray() and createObject()
This commit is contained in:
Benoit Blanchon
2018-02-26 16:05:16 +01:00
parent baf5adcf33
commit 7a2a64803a
89 changed files with 1612 additions and 1691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/IntegrationTests/gbathree.cpp
View File

@ -6,9 +6,10 @@
#include <catch.hpp>
TEST_CASE("Gbathree") {
DynamicJsonBuffer _buffer;
DynamicJsonObject _object;
const JsonObject& _object = _buffer.parseObject(
bool success = deserializeJson(
_object,
"{\"protocol_name\":\"fluorescence\",\"repeats\":1,\"wait\":0,"
"\"averages\":1,\"measurements\":3,\"meas2_light\":15,\"meas1_"
"baseline\":0,\"act_light\":20,\"pulsesize\":25,\"pulsedistance\":"
@ -21,7 +22,7 @@ TEST_CASE("Gbathree") {
"[15,15,15,15]],\"altc\":[2,2,2,2],\"altd\":[2,2,2,2]}");
SECTION("Success") {
REQUIRE(_object.success());
REQUIRE(success == true);
}
SECTION("ProtocolName") {

8
test/IntegrationTests/round_trip.cpp
View File

@ -6,13 +6,15 @@
#include <catch.hpp>
void check(std::string originalJson) {
DynamicJsonBuffer jb;
DynamicJsonObject obj;
std::string prettyJson;
jb.parseObject(originalJson).prettyPrintTo(prettyJson);
deserializeJson(obj, originalJson);
obj.prettyPrintTo(prettyJson);
std::string finalJson;
jb.parseObject(prettyJson).printTo(finalJson);
deserializeJson(obj, originalJson);
obj.printTo(finalJson);
REQUIRE(originalJson == finalJson);
}