Merge DynamicJsonDocument with JsonDocument

extras/tests/FailingBuilds/CMakeLists.txt

@@ -23,18 +23,12 @@ endmacro()
 add_executable(Issue978 Issue978.cpp)
 build_should_fail(Issue978)
 
-add_executable(Issue1189 Issue1189.cpp)
-build_should_fail(Issue1189)
-
 add_executable(read_long_long read_long_long.cpp)
 build_should_fail(read_long_long)
 
 add_executable(write_long_long write_long_long.cpp)
 build_should_fail(write_long_long)
 
-add_executable(delete_jsondocument delete_jsondocument.cpp)
-build_should_fail(delete_jsondocument)
-
 add_executable(variant_as_char variant_as_char.cpp)
 build_should_fail(variant_as_char)
 

extras/tests/FailingBuilds/Issue1189.cpp

@@ -1,13 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.h>
-
-// a function should not be able to get a JsonDocument by value
-void f(JsonDocument) {}
-
-int main() {
-  DynamicJsonDocument doc(1024);
-  f(doc);
-}

extras/tests/FailingBuilds/Issue978.cpp

@@ -8,6 +8,6 @@ struct Stream {};
 
 int main() {
   Stream* stream = 0;
-  DynamicJsonDocument doc(1024);
+  JsonDocument doc(1024);
   deserializeJson(doc, stream);
 }

extras/tests/FailingBuilds/assign_char.cpp

@@ -7,6 +7,6 @@
 // See issue #1498
 
 int main() {
-  DynamicJsonDocument doc(1024);
+  JsonDocument doc(1024);
   doc["dummy"] = 'A';
 }

extras/tests/FailingBuilds/delete_jsondocument.cpp

@@ -1,12 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#include <ArduinoJson.h>
-
-struct Stream {};
-
-int main() {
-  JsonDocument* doc = new DynamicJsonDocument(42);
-  delete doc;
-}

extras/tests/FailingBuilds/read_long_long.cpp

@@ -11,6 +11,6 @@
 
 ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(long long)
 int main() {
-  DynamicJsonDocument doc(1024);
+  JsonDocument doc(1024);
   doc["dummy"].as<long long>();
 }

extras/tests/FailingBuilds/variant_as_char.cpp

@@ -7,6 +7,6 @@
 // See issue #1498
 
 int main() {
-  DynamicJsonDocument doc(1024);
+  JsonDocument doc(1024);
   doc["dummy"].as<char>();
 }

extras/tests/FailingBuilds/write_long_long.cpp

@@ -10,6 +10,6 @@
 #endif
 
 int main() {
-  DynamicJsonDocument doc(1024);
+  JsonDocument doc(1024);
   doc["dummy"] = static_cast<long long>(42);
 }