github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 16:14:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added a test for issue #808

Browse Source
This commit is contained in:
Benoit Blanchon
2018-09-11 16:16:20 +02:00
parent b106b1ed14
commit 98c8e8e35a
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ArduinoJson/Data/JsonVariantData.hpp
View File

@@ -30,13 +30,6 @@ struct JsonVariantData {
content.asFloat = value; content.asFloat = value;
} }
void setInteger(JsonInteger value) {
if (value > 0)
setPostiveInteger(static_cast<JsonUInt>(value));
else
setNegativeInteger(static_cast<JsonUInt>(-value));
}
void setNegativeInteger(JsonUInt value) { void setNegativeInteger(JsonUInt value) {
type = JSON_NEGATIVE_INTEGER; type = JSON_NEGATIVE_INTEGER;
content.asInteger = value; content.asInteger = value;

8
test/JsonDeserializer/deserializeJsonValue.cpp
View File

@@ -87,6 +87,14 @@ TEST_CASE("deserializeJson(DynamicJsonDocument&)") {
REQUIRE(doc.as<bool>() == false); REQUIRE(doc.as<bool>() == false);
} }
SECTION("0") {
DeserializationError err = deserializeJson(doc, "0");
REQUIRE(err == DeserializationError::Ok);
REQUIRE(doc.is<int>() == true);
REQUIRE(doc.as<int>() == 0);
REQUIRE(doc.as<std::string>() == "0"); // issue #808
}
SECTION("NaN") { SECTION("NaN") {
DeserializationError err = deserializeJson(doc, "NaN"); DeserializationError err = deserializeJson(doc, "NaN");
REQUIRE(err == DeserializationError::Ok); REQUIRE(err == DeserializationError::Ok);

4
test/JsonSerializer/JsonVariant.cpp
View File

@@ -45,6 +45,10 @@ TEST_CASE("serializeJson(JsonVariant)") {
check(3.1415927, "3.1415927"); check(3.1415927, "3.1415927");
} }
SECTION("Zero") {
check(0, "0");
}
SECTION("Integer") { SECTION("Integer") {
check(42, "42"); check(42, "42");
} }