Restored the monotonic allocator

test/JsonVariant/CMakeLists.txt

@@ -13,7 +13,6 @@ add_executable(JsonVariantTests
 	or.cpp
 	set.cpp
 	subscript.cpp
-	to.cpp
 	undefined.cpp
 )
 

test/JsonVariant/copy.cpp

@@ -83,23 +83,4 @@ TEST_CASE("JsonVariant::set(JsonVariant)") {
     REQUIRE(doc1.memoryUsage() == JSON_STRING_SIZE(8));
     REQUIRE(doc2.memoryUsage() == JSON_STRING_SIZE(8));
   }
-
-  SECTION("releases string memory when replacing with null") {
-    var1.set(std::string("hello"));
-    REQUIRE(doc1.memoryUsage() == JSON_STRING_SIZE(6));
-
-    var1.set(JsonVariant());
-
-    REQUIRE(doc1.memoryUsage() == 0);
-  }
-
-  SECTION("releases string memory when replacing with iteger") {
-    var1.set(std::string("hello"));
-    REQUIRE(doc1.memoryUsage() == JSON_STRING_SIZE(6));
-
-    var2.set(42);
-    var1.set(var2);
-
-    REQUIRE(doc1.memoryUsage() == 0);
-  }
 }

test/JsonVariant/set.cpp

@@ -73,62 +73,6 @@ TEST_CASE("JsonVariant and strings") {
   }
 }
 
-TEST_CASE("JsonVariant::set() should release string memory") {
-  DynamicJsonDocument doc;
-  JsonVariant variant = doc.to<JsonVariant>();
-
-  variant.set(std::string("hello"));
-  REQUIRE(doc.memoryUsage() == JSON_STRING_SIZE(6));
-
-  SECTION("int") {
-    variant.set(-42);
-    REQUIRE(doc.memoryUsage() == 0);
-  }
-
-  SECTION("unsigned int") {
-    variant.set(42U);
-    REQUIRE(doc.memoryUsage() == 0);
-  }
-
-  SECTION("bool") {
-    variant.set(true);
-    REQUIRE(doc.memoryUsage() == 0);
-  }
-
-  SECTION("float") {
-    variant.set(3.14);
-    REQUIRE(doc.memoryUsage() == 0);
-  }
-
-  SECTION("const char*") {
-    variant.set("hello");
-    REQUIRE(doc.memoryUsage() == 0);
-  }
-
-  SECTION("std::string") {
-    variant.set(std::string("X"));
-    REQUIRE(doc.memoryUsage() == JSON_STRING_SIZE(2));
-  }
-
-  SECTION("SerializedValue<const char*>") {
-    variant.set(serialized("[42]"));
-    REQUIRE(doc.memoryUsage() == 0);
-  }
-
-  SECTION("SerializedValue<std::string>") {
-    variant.set(serialized(std::string("42")));
-    REQUIRE(doc.memoryUsage() == JSON_STRING_SIZE(2));
-  }
-
-  SECTION("StringInMemoryPool") {
-    DeserializationError err =
-        deserializeJson(doc, std::string("{\"A\":\"hello\",\"A\":\"B\"}"));
-    REQUIRE(err == DeserializationError::Ok);
-    // it stores the key twice, but should release "hello"
-    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 3 * JSON_STRING_SIZE(2));
-  }
-}
-
 TEST_CASE("JsonVariant with not enough memory") {
   StaticJsonDocument<1> doc;
 

test/JsonVariant/to.cpp

@@ -1,32 +0,0 @@
-// ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2018
-// MIT License
-
-#include <ArduinoJson.h>
-#include <stdint.h>
-#include <catch.hpp>
-
-static const char* null = 0;
-
-TEST_CASE("JsonVariant::to<T>() releases string memory") {
-  DynamicJsonDocument doc;
-  JsonVariant variant = doc.to<JsonVariant>();
-
-  variant.set(std::string("hello"));
-  REQUIRE(doc.memoryUsage() == JSON_STRING_SIZE(6));
-
-  SECTION("JsonVariant") {
-    variant.to<JsonVariant>();
-    REQUIRE(doc.memoryUsage() == 0);
-  }
-
-  SECTION("JsonArray") {
-    variant.to<JsonArray>();
-    REQUIRE(doc.memoryUsage() == 0);
-  }
-
-  SECTION("JsonObject") {
-    variant.to<JsonObject>();
-    REQUIRE(doc.memoryUsage() == 0);
-  }
-}