ROMSDEV
diff --git a/‎src/ArduinoJson/DynamicJsonArray.hpp
Lines changed: 11 additions & 2 deletions b/‎src/ArduinoJson/DynamicJsonArray.hpp
Lines changed: 11 additions & 2 deletions
diff --git a/‎src/ArduinoJson/StaticJsonArray.hpp
Lines changed: 12 additions & 0 deletions b/‎src/ArduinoJson/StaticJsonArray.hpp
Lines changed: 12 additions & 0 deletions
diff --git a/‎test/JsonArray/copy.cpp
Lines changed: 23 additions & 2 deletions b/‎test/JsonArray/copy.cpp
Lines changed: 23 additions & 2 deletions
@@ -26,13 +26,22 @@ class DynamicJsonArray : public JsonArray {
     JsonArray::operator=(other);
   }
 
-  using JsonArray::operator=;
-
   DynamicJsonArray& operator=(const DynamicJsonArray& other) {
+    _buffer.clear();
     JsonArray::operator=(other);
     return *this;
   }
 
+  DynamicJsonArray& operator=(const JsonArray& other) {
+    _buffer.clear();
+    JsonArray::operator=(other);
+    return *this;
+  }
+
+  size_t memoryUsage() const {
+    return _buffer.size() + sizeof(JsonArray);
+  }
+
   Internals::DynamicJsonBuffer& buffer() {
     return _buffer;
   }
 
@@ -24,6 +24,18 @@ class StaticJsonArray : public JsonArray {
     JsonArray::operator=(other);
   }
 
+  StaticJsonArray<CAPACITY>& operator=(const StaticJsonArray<CAPACITY>& other) {
+    _buffer.clear();
+    JsonArray::operator=(other);
+    return *this;
+  }
+
+  StaticJsonArray<CAPACITY>& operator=(const JsonArray& other) {
+    _buffer.clear();
+    JsonArray::operator=(other);
+    return *this;
+  }
+
   size_t memoryUsage() const {
     return _buffer.size() + sizeof(JsonArray);
   }
 
@@ -16,11 +16,15 @@ TArray buildArray() {
   return array;
 }
 
-void validateArray(JsonArray& array) {
+template <typename TArray>
+void validateArray(TArray& array) {
   CHECK(array.size() == 2);
   REQUIRE(array[0] == 42);
-  REQUIRE(array[1].is<JsonObject>());
+  REQUIRE(array[1].template is<JsonObject>());
   REQUIRE(array[1]["hello"] == std::string("world"));
+
+  const int expectedSize = JSON_ARRAY_SIZE(2) + JSON_OBJECT_SIZE(1);
+  REQUIRE(expectedSize == array.memoryUsage());
 }
 
 TEST_CASE("DynamicJsonArray::operator=()") {
@@ -39,3 +43,20 @@ TEST_CASE("DynamicJsonArray::operator=()") {
     validateArray(array);
   }
 }
+
+TEST_CASE("StaticJsonArray::operator=()") {
+  const size_t SIZE = JSON_ARRAY_SIZE(2) + JSON_OBJECT_SIZE(1);
+  StaticJsonArray<SIZE> array;
+  array.add(666);
+  array.add(666);
+
+  SECTION("operator=(const DynamicJsonArray&)") {
+    array = buildArray<DynamicJsonArray>();
+    validateArray(array);
+  }
+
+  SECTION("operator=(const StaticJsonArray<N>&)") {
+    array = buildArray<StaticJsonArray<SIZE> >();
+    validateArray(array);
+  }
+}