Update to ArduinoJson 7.0.4

lib/ArduinoJson/extras/tests/JsonVariant/remove.cpp

@@ -1,40 +1,83 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <stdint.h>
 #include <catch.hpp>
 
-TEST_CASE("JsonVariant::remove()") {
-  DynamicJsonDocument doc(4096);
-  JsonVariant var = doc.to<JsonVariant>();
+#include "Allocators.hpp"
 
-  SECTION("remove(int)") {
-    var.add(1);
-    var.add(2);
-    var.add(3);
+using ArduinoJson::detail::sizeofArray;
 
+TEST_CASE("JsonVariant::remove(int)") {
+  SpyingAllocator spy;
+  JsonDocument doc(&spy);
+
+  SECTION("release top level strings") {
+    doc.add(std::string("hello"));
+    doc.add(std::string("hello"));
+    doc.add(std::string("world"));
+
+    JsonVariant var = doc.as<JsonVariant>();
+    REQUIRE(var.as<std::string>() == "[\"hello\",\"hello\",\"world\"]");
+
+    spy.clearLog();
     var.remove(1);
+    REQUIRE(var.as<std::string>() == "[\"hello\",\"world\"]");
+    REQUIRE(spy.log() == AllocatorLog{});
 
-    REQUIRE(var.as<std::string>() == "[1,3]");
+    spy.clearLog();
+    var.remove(1);
+    REQUIRE(var.as<std::string>() == "[\"hello\"]");
+    REQUIRE(spy.log() == AllocatorLog{
+                             Deallocate(sizeofString("world")),
+                         });
+
+    spy.clearLog();
+    var.remove(0);
+    REQUIRE(var.as<std::string>() == "[]");
+    REQUIRE(spy.log() == AllocatorLog{
+                             Deallocate(sizeofString("hello")),
+                         });
   }
 
-  SECTION("remove(const char *)") {
-    var["a"] = 1;
-    var["b"] = 2;
+  SECTION("release strings in nested array") {
+    doc[0][0] = std::string("hello");
 
-    var.remove("a");
+    JsonVariant var = doc.as<JsonVariant>();
+    REQUIRE(var.as<std::string>() == "[[\"hello\"]]");
 
-    REQUIRE(var.as<std::string>() == "{\"b\":2}");
-  }
+    spy.clearLog();
+    var.remove(0);
 
-  SECTION("remove(std::string)") {
-    var["a"] = 1;
-    var["b"] = 2;
-
-    var.remove(std::string("b"));
-
-    REQUIRE(var.as<std::string>() == "{\"a\":1}");
+    REQUIRE(var.as<std::string>() == "[]");
+    REQUIRE(spy.log() == AllocatorLog{
+                             Deallocate(sizeofString("hello")),
+                         });
   }
 }
+
+TEST_CASE("JsonVariant::remove(const char *)") {
+  JsonDocument doc;
+  JsonVariant var = doc.to<JsonVariant>();
+
+  var["a"] = 1;
+  var["b"] = 2;
+
+  var.remove("a");
+
+  REQUIRE(var.as<std::string>() == "{\"b\":2}");
+}
+
+TEST_CASE("JsonVariant::remove(std::string)") {
+  JsonDocument doc;
+  JsonVariant var = doc.to<JsonVariant>();
+
+  var["a"] = 1;
+  var["b"] = 2;
+
+  var.remove(std::string("b"));
+
+  REQUIRE(var.as<std::string>() == "{\"a\":1}");
+}