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

Allow mixed configuration in compilation units (issue #809)

Browse Source
This commit is contained in:
Benoit Blanchon
2018-10-02 16:54:05 +02:00
parent 29e71cbb16
commit 527dc19794
122 changed files with 580 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/MsgPackDeserializer/deserializeVariant.cpp
View File

@ -63,7 +63,7 @@ TEST_CASE("deserialize MsgPack value") {
}
SECTION("uint 64") {
#if ARDUINOJSON_USE_LONG_LONG || ARDUINOJSON_USE_INT64
#if ARDUINOJSON_USE_LONG_LONG
check<uint64_t>("\xCF\x00\x00\x00\x00\x00\x00\x00\x00", 0U);
check<uint64_t>("\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF",
0xFFFFFFFFFFFFFFFFU);
@ -94,7 +94,7 @@ TEST_CASE("deserialize MsgPack value") {
}
SECTION("int 64") {
#if ARDUINOJSON_USE_LONG_LONG || ARDUINOJSON_USE_INT64
#if ARDUINOJSON_USE_LONG_LONG
check<uint64_t>("\xD3\x00\x00\x00\x00\x00\x00\x00\x00", 0U);
check<uint64_t>("\xD3\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF",
0xFFFFFFFFFFFFFFFFU);

4
test/MsgPackDeserializer/doubleToFloat.cpp
View File

@ -5,7 +5,7 @@
#include <ArduinoJson.h>
#include <catch.hpp>
using namespace ArduinoJson::Internals;
using namespace ARDUINOJSON_NAMESPACE;
template <typename T>
static void check(const char* input, T expected) {
@ -17,7 +17,7 @@ static void check(const char* input, T expected) {
CHECK(actual == expected);
}
TEST_CASE("Internals::doubleToFloat()") {
TEST_CASE("doubleToFloat()") {
check("\x40\x09\x21\xCA\xC0\x83\x12\x6F", 3.1415f);
check("\x00\x00\x00\x00\x00\x00\x00\x00", 0.0f);
check("\x80\x00\x00\x00\x00\x00\x00\x00", -0.0f);