ArduinoJSON 7.4.1

2025-04-15 21:24:24 +02:00
parent ec5a05d6c9
commit 7c7dd8a7a9
365 changed files with 780 additions and 490 deletions
--- a/lib/ArduinoJson/extras/tests/MsgPackDeserializer/CMakeLists.txt
+++ b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 add_executable(MsgPackDeserializerTests
--- a/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeArray.cpp
+++ b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeArray.cpp
@@ -1,12 +1,15 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
 #include <catch.hpp>

+#include "Allocators.hpp"
+
 TEST_CASE("deserialize MsgPack array") {
-  JsonDocument doc;
+  SpyingAllocator spy;
+  JsonDocument doc(&spy);

  SECTION("fixarray") {
    SECTION("empty") {
@@ -30,6 +33,24 @@ TEST_CASE("deserialize MsgPack array") {
      REQUIRE(array[0] == 1);
      REQUIRE(array[1] == 2);
    }
+
+    SECTION("tiny strings") {
+      DeserializationError error =
+          deserializeMsgPack(doc, "\x92\xA3xxx\xA3yyy");
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonArray>());
+      REQUIRE(doc.size() == 2);
+      REQUIRE(doc[0] == "xxx");
+      REQUIRE(doc[1] == "yyy");
+      REQUIRE(spy.log() == AllocatorLog{
+                               Allocate(sizeofPool()),
+                               Allocate(sizeofString("xxx")),
+                               // Buffer is reused for the next string
+                               Deallocate(sizeofString("xxx")),
+                               Reallocate(sizeofPool(), sizeofPool(2)),
+                           });
+    }
  }

  SECTION("array 16") {
--- a/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeObject.cpp
+++ b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeObject.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeVariant.cpp
+++ b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeVariant.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
@@ -348,13 +348,14 @@ TEST_CASE("deserializeMsgPack() under memory constaints") {
    SECTION("{}") {
      checkError(0, "\x80", DeserializationError::Ok);
    }
-    SECTION("{H:1}") {
-      checkError(1, "\x81\xA1H\x01", DeserializationError::NoMemory);
-      checkError(2, "\x81\xA1H\x01", DeserializationError::Ok);
+    SECTION("{Hello:1}") {
+      checkError(1, "\x81\xA5Hello\x01", DeserializationError::NoMemory);
+      checkError(2, "\x81\xA5Hello\x01", DeserializationError::Ok);
    }
-    SECTION("{H:1,W:2}") {
-      checkError(2, "\x82\xA1H\x01\xA1W\x02", DeserializationError::NoMemory);
-      checkError(3, "\x82\xA1H\x01\xA1W\x02", DeserializationError::Ok);
+    SECTION("{Hello:1,World:2}") {
+      checkError(2, "\x82\xA5Hello\x01\xA5World\x02",
+                 DeserializationError::NoMemory);
+      checkError(3, "\x82\xA5Hello\x01\xA5World\x02", DeserializationError::Ok);
    }
  }

@@ -362,14 +363,16 @@ TEST_CASE("deserializeMsgPack() under memory constaints") {
    SECTION("{}") {
      checkError(0, "\xDE\x00\x00", DeserializationError::Ok);
    }
-    SECTION("{H:1}") {
-      checkError(1, "\xDE\x00\x01\xA1H\x01", DeserializationError::NoMemory);
-      checkError(2, "\xDE\x00\x01\xA1H\x01", DeserializationError::Ok);
-    }
-    SECTION("{H:1,W:2}") {
-      checkError(2, "\xDE\x00\x02\xA1H\x01\xA1W\x02",
+    SECTION("{Hello:1}") {
+      checkError(1, "\xDE\x00\x01\xA5Hello\x01",
                 DeserializationError::NoMemory);
-      checkError(3, "\xDE\x00\x02\xA1H\x01\xA1W\x02", DeserializationError::Ok);
+      checkError(2, "\xDE\x00\x01\xA5Hello\x01", DeserializationError::Ok);
+    }
+    SECTION("{Hello:1,World:2}") {
+      checkError(2, "\xDE\x00\x02\xA5Hello\x01\xA5World\x02",
+                 DeserializationError::NoMemory);
+      checkError(3, "\xDE\x00\x02\xA5Hello\x01\xA5World\x02",
+                 DeserializationError::Ok);
    }
  }

@@ -382,8 +385,8 @@ TEST_CASE("deserializeMsgPack() under memory constaints") {
                 DeserializationError::NoMemory);
      checkError(2, "\xDF\x00\x00\x00\x01\xA1H\x01", DeserializationError::Ok);
    }
-    SECTION("{H:1,W:2}") {
-      checkError(2, "\xDF\x00\x00\x00\x02\xA1H\x01\xA1W\x02",
+    SECTION("{Hello:1,World:2}") {
+      checkError(2, "\xDF\x00\x00\x00\x02\xA5Hello\x01\xA5World\x02",
                 DeserializationError::NoMemory);
      checkError(3, "\xDF\x00\x00\x00\x02\xA1H\x01\xA1W\x02",
                 DeserializationError::Ok);
--- a/lib/ArduinoJson/extras/tests/MsgPackDeserializer/destination_types.cpp
+++ b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/destination_types.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/lib/ArduinoJson/extras/tests/MsgPackDeserializer/doubleToFloat.cpp
+++ b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/doubleToFloat.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/lib/ArduinoJson/extras/tests/MsgPackDeserializer/errors.cpp
+++ b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/errors.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/lib/ArduinoJson/extras/tests/MsgPackDeserializer/filter.cpp
+++ b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/filter.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/lib/ArduinoJson/extras/tests/MsgPackDeserializer/input_types.cpp
+++ b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/input_types.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/lib/ArduinoJson/extras/tests/MsgPackDeserializer/nestingLimit.cpp
+++ b/lib/ArduinoJson/extras/tests/MsgPackDeserializer/nestingLimit.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>