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

Merged MsgPackError and JsonError into DeserializationError.

Browse Source 
Return NotSupported if the JSON input contains "\u".
This commit is contained in:
Benoit Blanchon
2018-05-15 18:23:09 +02:00
parent ccb54136a2
commit 4592f23260
38 changed files with 574 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/Misc/unsigned_char.cpp
View File

@ -14,18 +14,18 @@ TEST_CASE("unsigned char[]") {
unsigned char input[] = "{\"a\":42}";
StaticJsonDocument<JSON_OBJECT_SIZE(1)> doc;
JsonError err = deserializeJson(doc, input);
DeserializationError err = deserializeJson(doc, input);
REQUIRE(err == JsonError::Ok);
REQUIRE(err == DeserializationError::Ok);
}
SECTION("deserializeMsgPack()") {
unsigned char input[] = "\xDE\x00\x01\xA5Hello\xA5world";
StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
MsgPackError err = deserializeMsgPack(doc, input);
DeserializationError err = deserializeMsgPack(doc, input);
REQUIRE(err == MsgPackError::Ok);
REQUIRE(err == DeserializationError::Ok);
}
SECTION("JsonVariant") {

8
test/Misc/vla.cpp
View File

@ -23,9 +23,9 @@ TEST_CASE("Variable Length Array") {
strcpy(vla, "{\"a\":42}");
StaticJsonDocument<JSON_OBJECT_SIZE(1)> doc;
JsonError err = deserializeJson(doc, vla);
DeserializationError err = deserializeJson(doc, vla);
REQUIRE(err == JsonError::Ok);
REQUIRE(err == DeserializationError::Ok);
}
SECTION("deserializeMsgPack()") {
@ -34,9 +34,9 @@ TEST_CASE("Variable Length Array") {
memcpy(vla, "\xDE\x00\x01\xA5Hello\xA5world", 15);
StaticJsonDocument<JSON_OBJECT_SIZE(1)> doc;
MsgPackError err = deserializeMsgPack(doc, vla);
DeserializationError err = deserializeMsgPack(doc, vla);
REQUIRE(err == MsgPackError::Ok);
REQUIRE(err == DeserializationError::Ok);
}
SECTION("JsonVariant") {