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

Fixed JsonVariant::as<unsigned>() (fixes #1601)

Browse Source
This commit is contained in:
Benoit Blanchon
2021-06-30 09:17:28 +02:00
parent fc4f175300
commit ef7579394b
5 changed files with 105 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extras/tests/JsonVariant/as.cpp
View File

@@ -61,6 +61,16 @@ TEST_CASE("JsonVariant::as()") {
REQUIRE(variant.as<std::string>() == "true");
}
SECTION("set(42)") {
variant.set(42);
REQUIRE(variant.as<bool>() == true);
REQUIRE(variant.as<double>() == 42.0);
REQUIRE(variant.as<int>() == 42);
REQUIRE(variant.as<unsigned int>() == 42U); // issue #1601
REQUIRE(variant.as<std::string>() == "42");
}
SECTION("set(42L)") {
variant.set(42L);

1
extras/tests/Numbers/CMakeLists.txt
View File

@@ -3,6 +3,7 @@
# MIT License
add_executable(NumbersTests
convertNumber.cpp
parseFloat.cpp
parseDouble.cpp
parseInteger.cpp

78
extras/tests/Numbers/convertNumber.cpp Normal file
View File

@@ -0,0 +1,78 @@
// ArduinoJson - https://arduinojson.org
// Copyright Benoit Blanchon 2014-2021
// MIT License
#include <stdint.h>
#include <ArduinoJson.hpp>
#include <catch.hpp>
using namespace ARDUINOJSON_NAMESPACE;
TEST_CASE("canConvertNumber<TOut, TIn>()") {
SECTION("int8_t -> int8_t") {
CHECK((canConvertNumber<int8_t, int8_t>(0)) == true);
CHECK((canConvertNumber<int8_t, int8_t>(127)) == true);
CHECK((canConvertNumber<int8_t, int8_t>(-128)) == true);
}
SECTION("int8_t -> int16_t") {
CHECK((canConvertNumber<int16_t, int8_t>(0)) == true);
CHECK((canConvertNumber<int16_t, int8_t>(127)) == true);
CHECK((canConvertNumber<int16_t, int8_t>(-128)) == true);
}
SECTION("int8_t -> uint8_t") {
CHECK((canConvertNumber<uint8_t, int8_t>(0)) == true);
CHECK((canConvertNumber<uint8_t, int8_t>(127)) == true);
CHECK((canConvertNumber<uint8_t, int8_t>(-128)) == false);
}
SECTION("int8_t -> uint16_t") {
CHECK((canConvertNumber<uint16_t, int8_t>(0)) == true);
CHECK((canConvertNumber<uint16_t, int8_t>(127)) == true);
CHECK((canConvertNumber<uint16_t, int8_t>(-128)) == false);
}
SECTION("int16_t -> int8_t") {
CHECK((canConvertNumber<int8_t, int16_t>(0)) == true);
CHECK((canConvertNumber<int8_t, int16_t>(127)) == true);
CHECK((canConvertNumber<int8_t, int16_t>(128)) == false);
CHECK((canConvertNumber<int8_t, int16_t>(-128)) == true);
CHECK((canConvertNumber<int8_t, int16_t>(-129)) == false);
}
SECTION("int16_t -> uint8_t") {
CHECK((canConvertNumber<uint8_t, int16_t>(0)) == true);
CHECK((canConvertNumber<uint8_t, int16_t>(255)) == true);
CHECK((canConvertNumber<uint8_t, int16_t>(256)) == false);
CHECK((canConvertNumber<uint8_t, int16_t>(-1)) == false);
}
SECTION("uint8_t -> int8_t") {
CHECK((canConvertNumber<int8_t, uint8_t>(0)) == true);
CHECK((canConvertNumber<int8_t, uint8_t>(127)) == true);
CHECK((canConvertNumber<int8_t, uint8_t>(128)) == false);
CHECK((canConvertNumber<int8_t, uint8_t>(255)) == false);
}
SECTION("uint8_t -> int16_t") {
CHECK((canConvertNumber<int16_t, uint8_t>(0)) == true);
CHECK((canConvertNumber<int16_t, uint8_t>(127)) == true);
CHECK((canConvertNumber<int16_t, uint8_t>(128)) == true);
CHECK((canConvertNumber<int16_t, uint8_t>(255)) == true);
}
SECTION("uint8_t -> uint8_t") {
CHECK((canConvertNumber<uint8_t, uint8_t>(0)) == true);
CHECK((canConvertNumber<uint8_t, uint8_t>(127)) == true);
CHECK((canConvertNumber<uint8_t, uint8_t>(128)) == true);
CHECK((canConvertNumber<uint8_t, uint8_t>(255)) == true);
}
SECTION("uint8_t -> uint16_t") {
CHECK((canConvertNumber<uint16_t, uint8_t>(0)) == true);
CHECK((canConvertNumber<uint16_t, uint8_t>(127)) == true);
CHECK((canConvertNumber<uint16_t, uint8_t>(128)) == true);
CHECK((canConvertNumber<uint16_t, uint8_t>(255)) == true);
}
}