Set version to 6.15.2

Fixed publish script
Break build if using 64-bit integers with ARDUINOJSON_USE_LONG_LONG==0
2020-05-15 09:26:25 +02:00 · 2020-05-15 09:26:06 +02:00 · 2020-05-14 10:25:10 +02:00 · 2020-05-12 18:11:55 +02:00 · 2020-05-05 13:16:32 +02:00 · 2020-05-04 11:13:06 +02:00
342 changed files with 5601 additions and 1920 deletions
--- a/.clang-format
+++ b/.clang-format
@ -3,3 +3,6 @@
 BasedOnStyle: Google
 Standard: Cpp03
 AllowShortFunctionsOnASingleLine: Empty
+
+# Always break after if to get accurate coverage
+AllowShortIfStatementsOnASingleLine: false
--- a/.github/lock.yml
+++ b/.github/lock.yml
@ -0,0 +1,7 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 30
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: false
--- a/.travis.yml
+++ b/.travis.yml
@ -47,6 +47,11 @@ matrix:
          sources: ['ubuntu-toolchain-r-test']
          packages: ['g++-8']
      env: SCRIPT=test _CC=gcc-8 _CXX=g++-8
+    - addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-9']
+      env: SCRIPT=test _CC=gcc-9 _CXX=g++-9
    - addons:
        apt:
          packages: ['g++-arm-linux-gnueabihf']
--- a/ArduinoJson.h
+++ b/ArduinoJson.h
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include "src/ArduinoJson.h"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,118 @@
 ArduinoJson: change log
 =======================

+v6.15.2 (2020-05-15)
+-------
+
+* CMake: don't build tests when imported in another project
+* CMake: made project arch-independent
+* Visual Studio: fixed error C2766 with flag `/Zc:__cplusplus` (issue #1250)
+* Added support for `JsonDocument` to `copyArray()` (issue #1255)
+* Added support for `enum`s in `as<T>()` and `is<T>()`  (issue #1256)
+* Added `JsonVariant` as an input type for `deserializeXxx()`  
+  For example, you can do: `deserializeJson(doc2, doc1["payload"])`
+* Break the build if using 64-bit integers with ARDUINOJSON_USE_LONG_LONG==0
+
+v6.15.1 (2020-04-08)
+-------
+
+* Fixed "maybe-uninitialized" warning (issue #1217)
+* Fixed "statement is unreachable" warning on IAR (issue #1233)
+* Fixed "pointless integer comparison" warning on IAR (issue #1233)
+* Added CMake "install" target (issue #1209)
+* Disabled alignment on AVR (issue #1231)
+
+v6.15.0 (2020-03-22)
+-------
+
+* Added `DeserializationOption::Filter` (issue #959)
+* Added example `JsonFilterExample.ino`
+* Changed the array subscript operator to automatically add missing elements
+* Fixed "deprecated-copy" warning on GCC 9 (fixes #1184)
+* Fixed `MemberProxy::set(char[])` not duplicating the string (issue #1191)
+* Fixed enums serialized as booleans (issue #1197)
+* Fixed incorrect string comparison on some platforms (issue #1198)
+* Added move-constructor and move-assignment to `BasicJsonDocument`
+* Added `BasicJsonDocument::garbageCollect()` (issue #1195)
+* Added `StaticJsonDocument::garbageCollect()`
+* Changed copy-constructor of `BasicJsonDocument` to preserve the capacity of the source.
+* Removed copy-constructor of `JsonDocument` (issue #1189)
+
+> ### BREAKING CHANGES
+> 
+> #### Copy-constructor of `BasicJsonDocument`
+>
+> In previous versions, the copy constructor of `BasicJsonDocument` looked at the source's `memoryUsage()` to choose its capacity.
+> Now, the copy constructor of `BasicJsonDocument` uses the same capacity as the source.
+>
+> Example:
+>
+> ```c++
+> DynamicJsonDocument doc1(64);
+> doc1.set(String("example"));
+>
+> DynamicJsonDocument doc2 = doc1;
+> Serial.print(doc2.capacity());  // 8 with ArduinoJson 6.14
+>                                 // 64 with ArduinoJson 6.15
+> ```
+>
+> I made this change to get consistent results between copy-constructor and move-constructor, and whether RVO applies or not.
+>
+> If you use the copy-constructor to optimize your documents, you can use `garbageCollect()` or `shrinkToFit()` instead.
+>
+> #### Copy-constructor of `JsonDocument`
+>
+> In previous versions, it was possible to create a function that take a `JsonDocument` by value.
+>
+> ```c++
+> void myFunction(JsonDocument doc) {}
+> ```
+>
+> This function gives the wrong clues because it doesn't receive a copy of the `JsonDocument`, only a sliced version.
+> It worked because the copy constructor copied the internal pointers, but it was an accident.
+>
+> From now, if you need to pass a `JsonDocument` to a function, you must use a reference:
+>
+> ```c++
+> void myFunction(JsonDocument& doc) {}
+> ```
+
+v6.14.1 (2020-01-27)
+-------
+
+* Fixed regression in UTF16 decoding (issue #1173)
+* Fixed `containsKey()` on `JsonVariantConst`
+* Added `getElement()` and `getMember()` to `JsonVariantConst`
+
+v6.14.0 (2020-01-16)
+-------
+
+* Added `BasicJsonDocument::shrinkToFit()`
+* Added support of `uint8_t` for `serializeJson()`, `serializeJsonPretty()`, and `serializeMsgPack()` (issue #1142)
+* Added `ARDUINOJSON_ENABLE_COMMENTS` to enable support for comments (defaults to 0)
+* Auto enable support for `std::string` and `std::stream` on modern compilers (issue #1156)
+  (No need to define `ARDUINOJSON_ENABLE_STD_STRING` and `ARDUINOJSON_ENABLE_STD_STREAM` anymore)
+* Improved decoding of UTF-16 surrogate pairs (PR #1157 by @kaysievers)
+  (ArduinoJson now produces standard UTF-8 instead of CESU-8)
+* Added `measureJson`, `measureJsonPretty`, and `measureMsgPack` to `keywords.txt`
+  (This file is used for syntax highlighting in the Arduino IDE) 
+* Fixed `variant.is<nullptr_t>()`
+* Fixed value returned by `serializeJson()`, `serializeJsonPretty()`, and `serializeMsgPack()` when writing to a `String`
+* Improved speed of `serializeJson()`, `serializeJsonPretty()`, and `serializeMsgPack()` when writing to a `String`
+
+> ### BREAKING CHANGES
+> 
+> #### Comments
+> 
+> Support for comments in input is now optional and disabled by default.
+>
+> If you need support for comments, you must defined `ARDUINOJSON_ENABLE_COMMENTS` to `1`; otherwise, you'll receive `InvalidInput` errors.
+>
+> ```c++
+> #define ARDUINOJSON_ENABLE_COMMENTS 1
+> #include <ArduinoJson.h>
+> ```
+
 v6.13.0 (2019-11-01)
 -------

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,21 +1,19 @@
 # ArduinoJson - arduinojson.org
-# Copyright Benoit Blanchon 2014-2019
+# Copyright Benoit Blanchon 2014-2020
 # MIT License

 cmake_minimum_required(VERSION 3.0)
-project(ArduinoJson)

-enable_testing()
+project(ArduinoJson VERSION 6.15.1)

-add_definitions(-DARDUINOJSON_DEBUG)
-if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
-	add_compile_options(-g -O0)
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    include(CTest)
 endif()

-if(${COVERAGE})
-	set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage")
-endif()
+add_subdirectory(src)

-include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
-add_subdirectory(extras/tests)
-add_subdirectory(extras/fuzzing)
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+	include(extras/CompileOptions.cmake)
+	add_subdirectory(extras/tests)
+	add_subdirectory(extras/fuzzing)
+endif()
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,7 +1,7 @@
 The MIT License (MIT)
 ---------------------

-Copyright © 2014-2019 Benoit BLANCHON
+Copyright © 2014-2020 Benoit BLANCHON

 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@

 ---

-[![arduino-library-badge](https://www.ardu-badge.com/badge/ArduinoJson.svg?version=6.13.0)](https://www.ardu-badge.com/ArduinoJson/6.13.0)
+[![arduino-library-badge](https://www.ardu-badge.com/badge/ArduinoJson.svg?version=6.15.2)](https://www.ardu-badge.com/ArduinoJson/6.15.2)
 [![Build Status](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/6.x?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x)
 [![Build Status](https://travis-ci.org/bblanchon/ArduinoJson.svg?branch=6.x)](https://travis-ci.org/bblanchon/ArduinoJson)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/arduinojson.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
@ -13,48 +13,81 @@ ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).

 ## Features

-* JSON decoding (comments are supported)
-* JSON encoding (with optional indentation)
-* MessagePack
-* Elegant API, easy to use
-* Fixed memory allocation (zero malloc)
-* No data duplication (zero copy)
-* Portable (written in C++98, can be used in any C++ project)
-* Self-contained (no external dependency)
-* Small footprint
-* Input and output streams
-* [100% code coverage](https://coveralls.io/github/bblanchon/ArduinoJson)
-* [Header-only library](https://en.wikipedia.org/wiki/Header-only)
-* [MIT License](https://en.wikipedia.org/wiki/MIT_License)
-* [Comprehensive documentation](https://arduinojson.org?utm_source=github&utm_medium=readme)
-
-## Compatibility
-
-ArduinoJson works on the following hardware:
-
-* <img src="https://www.arduino.cc/favicon.ico" height="16" width="16"> Arduino boards: [Uno](https://www.arduino.cc/en/Main/ArduinoBoardUno), [Due](https://www.arduino.cc/en/Main/ArduinoBoardDue), [Mini](https://www.arduino.cc/en/Main/ArduinoBoardMini), [Micro](https://www.arduino.cc/en/Main/ArduinoBoardMicro), [Yun](https://www.arduino.cc/en/Main/ArduinoBoardYun)...
-* <img src="http://espressif.com/sites/all/themes/espressif/favicon.ico" height="16" width="16"> Espressif chips: [ESP8266](https://en.wikipedia.org/wiki/ESP8266), [ESP32](https://en.wikipedia.org/wiki/ESP32)
-* <img src="https://www.wemos.cc/themes/martin-materialize-parallax/assets/favicon.ico" height="16" width="16"> WeMos boards: [D1](https://wiki.wemos.cc/products:d1:d1), [D1 mini](https://wiki.wemos.cc/products:d1:d1_mini),  ...
-* <img src="http://redbearlab.com/favicon.ico" height="16" width="16"> RedBearLab boards: [BLE Nano](http://redbearlab.com/blenano/), [BLE Mini](http://redbearlab.com/blemini/), [WiFi Micro](https://redbear.cc/product/wifi/wifi-micro.html), [LOLIN32](https://wiki.wemos.cc/products:lolin32:lolin32)...
-* <img src="https://www.pjrc.com/favicon.ico" height="16" width="16"> [Teensy](https://www.pjrc.com/teensy/) boards
-* <img src="https://software.intel.com/sites/all/themes/zero/favicon.ico" height="16" width="16"> Intel boards: Edison, Galileo...
-* <img src="https://www-assets.particle.io/images/favicon.png"  height="16" width="16"> Particle boards: [Photon](https://www.particle.io/products/hardware/photon-wifi-dev-kit), [Electron](https://www.particle.io/products/hardware/electron-cellular-dev-kit)...
-* <img src="http://www.ti.com/favicon.ico" height="16" width="16"> Texas Instruments boards: [MSP430](http://www.ti.com/microcontrollers/msp430-ultra-low-power-mcus/overview/overview.html)...
-
-ArduinoJson compiles with zero warning on the following compilers, IDEs, and platforms:
-
-* <img src="https://www.arduino.cc/favicon.ico" height="16" width="16"> [Arduino IDE](https://www.arduino.cc/en/Main/Software)
-* <img src="http://cdn.platformio.org/favicon.ico" height="16" width="16"> [PlatformIO](http://platformio.org/)
-* <img src="http://energia.nu/img/favicon.ico" height="16" width="16"> [Energia](http://energia.nu/)
-* <img src="http://www.visualmicro.com/pics/arduino-visual-studio-ld.png" height="16" width="16"> [Visual Micro](http://www.visualmicro.com/)
-* <img src="http://www.atmel.com/Images/favicon.ico" height="16" width="16"> [Atmel Studio](http://www.atmel.com/microsite/atmel-studio/)
-* <img src="https://www.iar.com/favicon.ico" height="16" width="16"> [IAR Embedded Workbench](https://www.iar.com/iar-embedded-workbench/)
-* <img src="http://www.st.com/etc/clientlibs/st-site/media/app/images/favicon.png" height="16" width="16"> [Atollic TrueSTUDIO](https://atollic.com/truestudio/)
-* <img src="http://www.keil.com/favicon.ico" height="16" width="16"> [Keil uVision](http://www.keil.com/)
-* <img src="http://www.microchip.com/favicon.ico" height="16" width="16"> [MPLAB X IDE](http://www.microchip.com/mplab/mplab-x-ide)
-* <img src="https://gcc.gnu.org/favicon.ico" height="16" width="16"> [GCC](https://gcc.gnu.org/)
-* <img src="https://clang.llvm.org/favicon.ico" height="16" width="16"> [Clang](https://clang.llvm.org/)
-* <img src="https://www.visualstudio.com/favicon.ico" height="16" width="16"> [Visual Studio](https://www.visualstudio.com/)
+* [JSON deserialization](https://arduinojson.org/v6/api/json/deserializejson/?utm_source=github&utm_medium=readme)
+    * [Optionally decodes UTF-16 escape sequences to UTF-8](https://arduinojson.org/v6/api/config/decode_unicode/?utm_source=github&utm_medium=readme)
+    * [Optionally stores links to the input buffer (zero-copy)](https://arduinojson.org/v6/api/json/deserializejson/?utm_source=github&utm_medium=readme)
+    * [Optionally supports comments in the input](https://arduinojson.org/v6/api/config/enable_comments/?utm_source=github&utm_medium=readme)
+    * [Optionally filters the input to keep only desired values](https://arduinojson.org/v6/api/json/deserializejson/?utm_source=github&utm_medium=readme#filtering)
+    * Supports single quotes as a string delimiter
+    * Compatible with NDJSON and JSON Lines
+* [JSON serialization](https://arduinojson.org/v6/api/json/serializejson/?utm_source=github&utm_medium=readme)
+    * [Can write to a buffer or a stream](https://arduinojson.org/v6/api/json/serializejson/?utm_source=github&utm_medium=readme)
+    * [Optionally indents the document (prettified JSON)](https://arduinojson.org/v6/api/json/serializejsonpretty/?utm_source=github&utm_medium=readme)
+* [MessagePack serialization](https://arduinojson.org/v6/api/msgpack/serializemsgpack/?utm_source=github&utm_medium=readme)
+* [MessagePack deserialization](https://arduinojson.org/v6/api/msgpack/deserializemsgpack/?utm_source=github&utm_medium=readme)
+* Efficient
+    * [Twice smaller than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/?utm_source=github&utm_medium=readme)
+    * [Almost 10% faster than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/?utm_source=github&utm_medium=readme)
+    * [Consumes roughly 10% less RAM than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/?utm_source=github&utm_medium=readme)
+    * [Fixed memory allocation, no heap fragmentation](https://arduinojson.org/v6/api/jsondocument/?utm_source=github&utm_medium=readme)
+    * [Optionally works without heap memory (zero malloc)](https://arduinojson.org/v6/api/staticjsondocument/?utm_source=github&utm_medium=readme)
+* Versatile
+    * [Supports custom allocators (to use external RAM chip, for example)](https://arduinojson.org/v6/how-to/use-external-ram-on-esp32/?utm_source=github&utm_medium=readme)
+    * Supports [Arduino's `String`](https://arduinojson.org/v6/api/config/enable_arduino_string/) and [STL's `std::string`](https://arduinojson.org/v6/api/config/enable_std_string/?utm_source=github&utm_medium=readme)
+    * Supports Arduino's `Stream` and [STL's `std::istream`/`std::ostream`](https://arduinojson.org/v6/api/config/enable_std_stream/?utm_source=github&utm_medium=readme)
+    * [Supports Flash strings](https://arduinojson.org/v6/api/config/enable_progmem/?utm_source=github&utm_medium=readme)
+    * Supports [custom readers](https://arduinojson.org/v6/api/json/deserializejson/?utm_source=github&utm_medium=readme#custom-reader) and [custom writers](https://arduinojson.org/v6/api/json/serializejson/?utm_source=github&utm_medium=readme#custom-writer)
+* Portable
+    * Usable on any C++ project (not limited to Arduino)
+    * Compatible with C++98
+    * Zero warnings with `-Wall -Wextra -pedantic` and `/W4`
+    * [Header-only library](https://en.wikipedia.org/wiki/Header-only)
+    * Works with virtually any board
+        * Arduino boards: [Uno](https://amzn.to/38aL2ik), [Due](https://amzn.to/36YkWi2), [Micro](https://amzn.to/35WkdwG), [Nano](https://amzn.to/2QTvwRX), [Mega](https://amzn.to/36XWhuf), [Yun](https://amzn.to/30odURc), [Leonardo](https://amzn.to/36XWjlR)...
+        * Espressif chips: [ESP8266](https://amzn.to/36YluV8), [ESP32](https://amzn.to/2G4pRCB)
+        * Lolin (WeMos) boards: [D1 mini](https://amzn.to/2QUpz7q), [D1 Mini Pro](https://amzn.to/36UsGSs)...
+        * Teensy boards: [4.0](https://amzn.to/30ljXGq), [3.2](https://amzn.to/2FT0EuC), [2.0](https://amzn.to/2QXUMXj) 
+        * Particle boards: [Argon](https://amzn.to/2FQHa9X), [Boron](https://amzn.to/36WgLUd), [Electron](https://amzn.to/30vEc4k), [Photon](https://amzn.to/387F9Cd)...
+        * Texas Instruments boards: [MSP430](https://amzn.to/30nJWgg)...
+    * Tested on all major development environments
+        * [Arduino IDE](https://www.arduino.cc/en/Main/Software)
+        * [Atmel Studio](http://www.atmel.com/microsite/atmel-studio/)
+        * [Atollic TrueSTUDIO](https://atollic.com/truestudio/)
+        * [Energia](http://energia.nu/)
+        * [IAR Embedded Workbench](https://www.iar.com/iar-embedded-workbench/)
+        * [Keil uVision](http://www.keil.com/)
+        * [MPLAB X IDE](http://www.microchip.com/mplab/mplab-x-ide)
+        * [PlatformIO](http://platformio.org/)
+        * [Sloeber plugin for Eclipse](https://eclipse.baeyens.it/)
+        * [Visual Micro](http://www.visualmicro.com/)
+        * [Visual Studio](https://www.visualstudio.com/)
+    * [Even works with online compilers like wandbox.org](https://wandbox.org/permlink/t7KP7I6dVuLhqzDl)
+    * [CMake friendly](https://arduinojson.org/v6/how-to/use-arduinojson-with-cmake/?utm_source=github&utm_medium=readme)
+* Well designed
+    * [Elegant API](http://arduinojson.org/v6/example/?utm_source=github&utm_medium=readme)
+    * [Thread-safe](https://en.wikipedia.org/wiki/Thread_safety)
+    * Self-contained (no external dependency)
+    * `const` friendly
+    * [`for` friendly](https://arduinojson.org/v6/api/jsonobject/begin_end/?utm_source=github&utm_medium=readme)
+    * [TMP friendly](https://en.wikipedia.org/wiki/Template_metaprogramming)
+    * Handles [integer overflows](https://arduinojson.org/v6/api/jsonvariant/as/?utm_source=github&utm_medium=readme#integer-overflows)
+* Well tested
+    * [Unit test coverage close to 100%](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x)
+    * Continuously tested on
+        * [Visual Studio 2010, 2012, 2013, 2015, 2017, 2019](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x)
+        * [GCC 4.4, 4.6, 4.7, 4.8, 4.9, 5, 6, 7, 8](https://travis-ci.org/bblanchon/ArduinoJson)
+        * [Clang 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 5.0, 6.0, 7, 8](https://travis-ci.org/bblanchon/ArduinoJson)
+    * [Continuously fuzzed with Google OSS Fuzz](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
+* Well documented
+    * [Tutorials](https://arduinojson.org/v6/doc/deserialization/?utm_source=github&utm_medium=readme)
+    * [Examples](https://arduinojson.org/v6/example/?utm_source=github&utm_medium=readme)
+    * [How-tos](https://arduinojson.org/v6/example/?utm_source=github&utm_medium=readme)
+    * [FAQ](https://arduinojson.org/v6/faq/?utm_source=github&utm_medium=readme)
+    * [Book](https://arduinojson.org/book/?utm_source=github&utm_medium=readme)
+* Vibrant user community
+    * Most popular of all Arduino libraries on [GitHub](https://github.com/search?o=desc&q=arduino+library&s=stars&type=Repositories) and [PlatformIO](https://platformio.org/lib/search)
+    * [Used in hundreds of projects](https://www.hackster.io/search?i=projects&q=arduinojson)
+    * [Responsive support](https://github.com/bblanchon/ArduinoJson/issues?q=is%3Aissue+is%3Aclosed)

 ## Quickstart

@ -85,10 +118,8 @@ DynamicJsonDocument doc(1024);

 doc["sensor"] = "gps";
 doc["time"]   = 1351824120;
-
-JsonArray data = doc.createNestedArray("data");
-data.add(48.756080);
-data.add(2.302038);
+doc["data"][0] = 48.756080;
+doc["data"][1] = 2.302038;

 serializeJson(doc, Serial);
 // This prints:
@ -97,18 +128,9 @@ serializeJson(doc, Serial);

 See the [tutorial on arduinojson.org](https://arduinojson.org/doc/encoding/?utm_source=github&utm_medium=readme)

-## Documentation
-
-The documentation is available on [arduinojson.org](https://arduinojson.org/?utm_source=github&utm_medium=readme), here are some shortcuts:
-
-* The [Examples](https://arduinojson.org/example/?utm_source=github&utm_medium=readme) show how to use the library in various situations.
-* The [API Reference](https://arduinojson.org/api/?utm_source=github&utm_medium=readme) contains the description of each class and function.
-* The [FAQ](https://arduinojson.org/faq/?utm_source=github&utm_medium=readme) has the answer to virtually every question.
-* The [ArduinoJson Assistant](https://arduinojson.org/assistant/?utm_source=github&utm_medium=readme) writes programs for you!
-
---
+## Support the project

 Do you like this library? Please [star this project on GitHub](https://github.com/bblanchon/ArduinoJson/stargazers)!

-What? You don't like it but you *love* it?
-We don't take donations anymore, but [we sell a book](https://arduinojson.org/book/?utm_source=github&utm_medium=readme), so you can help and learn at the same time!
+What? You don't like it but you *love* it?  
+We don't take donations anymore, but [we sell a book](https://arduinojson.org/book/?utm_source=github&utm_medium=readme), so you can help and learn at the same time.
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,6 +1,8 @@
-version: 6.13.0.{build}
+version: 6.15.2.{build}
 environment:
  matrix:
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    CMAKE_GENERATOR: Visual Studio 16 2019
  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
    CMAKE_GENERATOR: Visual Studio 15 2017
  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
--- a/examples/JsonConfigFile/JsonConfigFile.ino
+++ b/examples/JsonConfigFile/JsonConfigFile.ino
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License
 //
 // This example shows how to store your project configuration in a file.
--- a/examples/JsonFilterExample/JsonFilterExample.ino
+++ b/examples/JsonFilterExample/JsonFilterExample.ino
@ -0,0 +1,63 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2020
+// MIT License
+//
+// This example shows how to use DeserializationOpion::Filter
+//
+// https://arduinojson.org/v6/example/filter/
+
+#include <ArduinoJson.h>
+
+void setup() {
+  // Initialize serial port
+  Serial.begin(9600);
+  while (!Serial) continue;
+
+  // The huge input: an extract from OpenWeatherMap response
+  const __FlashStringHelper* input_json = F(
+      "{\"cod\":\"200\",\"message\":0,\"list\":[{\"dt\":1581498000,\"main\":{"
+      "\"temp\":3.23,\"feels_like\":-3.63,\"temp_min\":3.23,\"temp_max\":4.62,"
+      "\"pressure\":1014,\"sea_level\":1014,\"grnd_level\":1010,\"humidity\":"
+      "58,\"temp_kf\":-1.39},\"weather\":[{\"id\":800,\"main\":\"Clear\","
+      "\"description\":\"clear "
+      "sky\",\"icon\":\"01d\"}],\"clouds\":{\"all\":0},\"wind\":{\"speed\":6."
+      "19,\"deg\":266},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-12 "
+      "09:00:00\"},{\"dt\":1581508800,\"main\":{\"temp\":6.09,\"feels_like\":-"
+      "1.07,\"temp_min\":6.09,\"temp_max\":7.13,\"pressure\":1015,\"sea_"
+      "level\":1015,\"grnd_level\":1011,\"humidity\":48,\"temp_kf\":-1.04},"
+      "\"weather\":[{\"id\":800,\"main\":\"Clear\",\"description\":\"clear "
+      "sky\",\"icon\":\"01d\"}],\"clouds\":{\"all\":9},\"wind\":{\"speed\":6."
+      "64,\"deg\":268},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-12 "
+      "12:00:00\"}],\"city\":{\"id\":2643743,\"name\":\"London\",\"coord\":{"
+      "\"lat\":51.5085,\"lon\":-0.1257},\"country\":\"GB\",\"population\":"
+      "1000000,\"timezone\":0,\"sunrise\":1581492085,\"sunset\":1581527294}}");
+
+  // The filter: it contains "true" for each value we want to keep
+  StaticJsonDocument<200> filter;
+  filter["list"][0]["dt"] = true;
+  filter["list"][0]["main"]["temp"] = true;
+
+  // Deserialize the document
+  StaticJsonDocument<400> doc;
+  deserializeJson(doc, input_json, DeserializationOption::Filter(filter));
+
+  // Print the result
+  serializeJsonPretty(doc, Serial);
+}
+
+void loop() {
+  // not used in this example
+}
+
+// See also
+// --------
+//
+// https://arduinojson.org/ contains the documentation for all the functions
+// used above. It also includes an FAQ that will help you solve any
+// deserialization problem.
+//
+// The book "Mastering ArduinoJson" contains a tutorial on deserialization.
+// It begins with a simple example, like the one above, and then adds more
+// features like deserializing directly from a file or an HTTP request.
+// Learn more at https://arduinojson.org/book/
+// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤
--- a/examples/JsonGeneratorExample/JsonGeneratorExample.ino
+++ b/examples/JsonGeneratorExample/JsonGeneratorExample.ino
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License
 //
 // This example shows how to generate a JSON document with ArduinoJson.
--- a/examples/JsonHttpClient/JsonHttpClient.ino
+++ b/examples/JsonHttpClient/JsonHttpClient.ino
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License
 //
 // This example shows how to parse a JSON document in an HTTP response.
--- a/examples/JsonParserExample/JsonParserExample.ino
+++ b/examples/JsonParserExample/JsonParserExample.ino
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License
 //
 // This example shows how to deserialize a JSON document with ArduinoJson.
--- a/examples/JsonServer/JsonServer.ino
+++ b/examples/JsonServer/JsonServer.ino
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License
 //
 // This example shows how to implement an HTTP server that sends a JSON document
--- a/examples/JsonUdpBeacon/JsonUdpBeacon.ino
+++ b/examples/JsonUdpBeacon/JsonUdpBeacon.ino
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License
 //
 // This example shows how to send a JSON document to a UDP socket.
--- a/examples/MsgPackParser/MsgPackParser.ino
+++ b/examples/MsgPackParser/MsgPackParser.ino
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License
 //
 // This example shows how to deserialize a MessagePack document with
--- a/examples/ProgmemExample/ProgmemExample.ino
+++ b/examples/ProgmemExample/ProgmemExample.ino
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License
 //
 // This example shows the different ways you can use Flash strings with
--- a/examples/StringExample/StringExample.ino
+++ b/examples/StringExample/StringExample.ino
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License
 //
 // This example shows the different ways you can use String with ArduinoJson.
--- a/extras/ArduinoJsonConfig.cmake.in
+++ b/extras/ArduinoJsonConfig.cmake.in
@ -0,0 +1,4 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
+check_required_components("@PROJECT_NAME@")
--- a/extras/CompileOptions.cmake
+++ b/extras/CompileOptions.cmake
@ -0,0 +1,100 @@
+if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
+	add_compile_options(
+		-pedantic
+		-Wall
+		-Wcast-align
+		-Wcast-qual
+		-Wconversion
+		-Wctor-dtor-privacy
+		-Wdisabled-optimization
+		-Werror
+		-Wextra
+		-Wformat=2
+		-Winit-self
+		-Wmissing-include-dirs
+		-Wnon-virtual-dtor
+		-Wold-style-cast
+		-Woverloaded-virtual
+		-Wparentheses
+		-Wredundant-decls
+		-Wshadow
+		-Wsign-promo
+		-Wstrict-aliasing
+		-Wundef
+	)
+
+	if(NOT MINGW)
+		add_compile_options(
+			-std=c++98
+		)
+	endif()
+
+	if(${COVERAGE})
+		set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage")
+	endif()
+
+endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL  "GNU")
+	if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8)
+		add_compile_options(-g -Og)
+	else()
+		add_compile_options(-g -O0)
+	endif()
+
+	add_compile_options(
+		-Wstrict-null-sentinel
+		-Wno-vla # Allow VLA in tests
+	)
+	add_definitions(-DHAS_VARIABLE_LENGTH_ARRAY)
+
+	if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.5)
+		add_compile_options(-Wlogical-op) # the flag exists in 4.4 but is buggy
+	endif()
+
+	if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6)
+		add_compile_options(-Wnoexcept)
+	endif()
+endif()
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	add_compile_options(
+		-Wc++11-compat
+		-Wdeprecated-register
+		-Wno-vla-extension # Allow VLA in tests
+	)
+	add_definitions(
+		-DHAS_VARIABLE_LENGTH_ARRAY
+		-DSUBSCRIPT_CONFLICTS_WITH_BUILTIN_OPERATOR
+	)
+endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0)
+		add_compile_options(-g -Og)
+	else()
+		add_compile_options(-g -O0)
+	endif()
+endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+	if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0)
+		add_compile_options(-g -Og)
+	else()
+		add_compile_options(-g -O0)
+	endif()
+endif()
+
+if(MSVC)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+	add_compile_options(
+		/W4 # Set warning level
+		/WX # Treats all compiler warnings as errors.
+	)
+
+	if (NOT MSVC_VERSION LESS  1910) #  >= Visual Studio 2017
+		add_compile_options(
+			/Zc:__cplusplus  # Enable updated __cplusplus macro
+		)
+	endif()
+endif()
--- a/extras/ci/build.sh
+++ b/extras/ci/build.sh
@ -3,12 +3,5 @@
 export CC="$_CC"
 export CXX="$_CXX"

-if [ -n "$SANITIZE" ]; then
-	export CXXFLAGS="-fsanitize=$SANITIZE"
-	BUILD_TYPE="Debug"
-else
-	BUILD_TYPE="Release"
-fi
-
-cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .
+cmake -DCMAKE_BUILD_TYPE=Release .
 cmake --build .
--- a/extras/ci/test.sh
+++ b/extras/ci/test.sh
@ -1,4 +1,10 @@
 #!/bin/sh -ex

-"$(dirname "$0")/build.sh"
+export CC="$_CC"
+export CXX="$_CXX"
+
+[ -n "$SANITIZE" ] && export CXXFLAGS="-fsanitize=$SANITIZE"
+
+cmake -DCMAKE_BUILD_TYPE=Debug .
+cmake --build .
 ctest --output-on-failure .
--- a/extras/fuzzing/CMakeLists.txt
+++ b/extras/fuzzing/CMakeLists.txt
@ -1,5 +1,5 @@
 # ArduinoJson - arduinojson.org
-# Copyright Benoit Blanchon 2014-2019
+# Copyright Benoit Blanchon 2014-2020
 # MIT License

 if(MSVC)
@ -10,8 +10,14 @@ add_executable(msgpack_fuzzer
 	msgpack_fuzzer.cpp
 	fuzzer_main.cpp
 )
+target_link_libraries(msgpack_fuzzer
+	ArduinoJson
+)

 add_executable(json_fuzzer
 	json_fuzzer.cpp
 	fuzzer_main.cpp
 )
+target_link_libraries(json_fuzzer
+	ArduinoJson
+)
--- a/extras/fuzzing/Makefile
+++ b/extras/fuzzing/Makefile
@ -1,6 +1,6 @@
 # CAUTION: this file is invoked by https://github.com/google/oss-fuzz

-CXXFLAGS += -I../../src -DARDUINOJSON_DEBUG
+CXXFLAGS += -I../../src -DARDUINOJSON_DEBUG=1

 all: \
 	$(OUT)/json_fuzzer \
--- a/extras/fuzzing/fuzzer_main.cpp
+++ b/extras/fuzzing/fuzzer_main.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 // This file is NOT use by Google's OSS fuzz
@ -21,7 +21,7 @@ std::vector<uint8_t> read(const char* path) {
  }

  fseek(f, 0, SEEK_END);
-  size_t size = ftell(f);
+  size_t size = static_cast<size_t>(ftell(f));
  fseek(f, 0, SEEK_SET);

  std::vector<uint8_t> buffer(size);
--- a/extras/scripts/build-single-header.sh
+++ b/extras/scripts/build-single-header.sh
@ -55,6 +55,7 @@ process()

 simplify_namespaces() {
 	perl -p0i -e 's|\}  // namespace ARDUINOJSON_NAMESPACE\r?\nnamespace ARDUINOJSON_NAMESPACE \{\r?\n||igs' "$1"
+	rm -f "$1.bak"
 }

 cd $(dirname $0)/../..
--- a/extras/scripts/create-build-envs.sh
+++ b/extras/scripts/create-build-envs.sh
@ -1,29 +0,0 @@
-#!/bin/bash
-
-export PATH="$PATH:/Applications/CMake.app/Contents/bin/"
-
-cd $(dirname $0)/../..
-ROOT=$(pwd)
-
-mkdir "build"
-cd build
-BUILD=$(pwd)
-
-build-env()
-{
-	cd $BUILD
-	mkdir "$1"
-	cd "$1"
-	cmake "$ROOT" -G "$2"
-}
-
-if [[ $(uname) == MINGW* ]]
-then
-	build-env "Make" "MinGW Makefiles"
-	build-env "SublimeText" "Sublime Text 2 - Ninja"
-	build-env "VisualStudio" "Visual Studio 14 2015"
-else
-	build-env "SublimeText" "Sublime Text 2 - Ninja"
-	build-env "Make" "Unix Makefiles"
-	build-env "Xcode" "Xcode"
-fi
--- a/extras/scripts/publish.sh
+++ b/extras/scripts/publish.sh
@ -14,19 +14,22 @@ update_version_in_source () {
 	UNDERLINE=$(printf -- '-%.0s' $(seq 1 ${#TAG}))

 	sed -i~ -bE "s/version=$VERSION_REGEX/version=$VERSION/; s|ardu-badge.com/ArduinoJson/$VERSION_REGEX|ardu-badge.com/ArduinoJson/$VERSION|; " README.md
-	rm README.md*~
+	rm README.md~

 	sed -i~ -bE "4s/HEAD/$TAG ($DATE)/; 5s/-+/$UNDERLINE/" CHANGELOG.md
-	rm CHANGELOG.md*~
+	rm CHANGELOG.md~
+
+	sed -i~ -bE "s/(project\\s*\\(ArduinoJson\\s+VERSION\\s+).*?\\)/\\1$MAJOR.$MINOR.$REVISION)/" CMakeLists.txt
+	rm CMakeLists.txt~

 	sed -i~ -bE "s/\"version\":.*$/\"version\": \"$VERSION\",/" library.json
-	rm library.json*~
+	rm library.json~

 	sed -i~ -bE "s/version=.*$/version=$VERSION/" library.properties
-	rm library.properties*~
+	rm library.properties~

 	sed -i~ -bE "s/version: .*$/version: $VERSION.{build}/" appveyor.yml
-	rm appveyor.yml*~
+	rm appveyor.yml~

 	sed -i~ -bE \
 		-e "s/ARDUINOJSON_VERSION .*$/ARDUINOJSON_VERSION \"$VERSION\"/" \
--- a/extras/scripts/wandbox/JsonGeneratorExample.cpp
+++ b/extras/scripts/wandbox/JsonGeneratorExample.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License
 //
 // This example shows how to generate a JSON document with ArduinoJson.
--- a/extras/scripts/wandbox/JsonParserExample.cpp
+++ b/extras/scripts/wandbox/JsonParserExample.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License
 //
 // This example shows how to deserialize a JSON document with ArduinoJson.
--- a/extras/scripts/wandbox/MsgPackParserExample.cpp
+++ b/extras/scripts/wandbox/MsgPackParserExample.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License
 //
 // This example shows how to generate a JSON document with ArduinoJson.
--- a/extras/tests/CMakeLists.txt
+++ b/extras/tests/CMakeLists.txt
@ -1,79 +1,14 @@
 # ArduinoJson - arduinojson.org
-# Copyright Benoit Blanchon 2014-2019
+# Copyright Benoit Blanchon 2014-2020
 # MIT License

 add_subdirectory(catch)

-if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
-	add_compile_options(
-		-pedantic
-		-Wall
-		-Wcast-align
-		-Wcast-qual
-		-Wconversion
-		-Wctor-dtor-privacy
-		-Wdisabled-optimization
-		-Werror
-		-Wextra
-		-Wformat=2
-		-Winit-self
-		-Wmissing-include-dirs
-		-Wnon-virtual-dtor
-		-Wold-style-cast
-		-Woverloaded-virtual
-		-Wparentheses
-		-Wredundant-decls
-		-Wshadow
-		-Wsign-promo
-		-Wstrict-aliasing
-		-Wundef
-	)
-
-	if(NOT MINGW)
-		add_compile_options(
-			-std=c++98
-		)
-	endif()
-endif()
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-	add_compile_options(
-		-Wstrict-null-sentinel
-		-Wno-vla # Allow VLA in tests
-	)
-	add_definitions(-DHAS_VARIABLE_LENGTH_ARRAY)
-
-	if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.5)
-		add_compile_options(-Wlogical-op) # the flag exists in 4.4 but is buggy
-	endif()
-
-	if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6)
-		add_compile_options(-Wnoexcept)
-	endif()
-endif()
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-	add_compile_options(
-		-Wc++11-compat
-		-Wdeprecated-register
-		-Wno-vla-extension # Allow VLA in tests
-	)
-	add_definitions(
-		-DHAS_VARIABLE_LENGTH_ARRAY
-		-DSUBSCRIPT_CONFLICTS_WITH_BUILTIN_OPERATOR
-	)
-endif()
-
-if(MSVC)
-	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-	add_compile_options(
-		/W4 # Set warning level
-		/WX # Treats all compiler warnings as errors.
-	)
-endif()
+link_libraries(ArduinoJson catch)

 include_directories(Helpers)
 add_subdirectory(ElementProxy)
+add_subdirectory(FailingBuilds)
 add_subdirectory(IntegrationTests)
 add_subdirectory(JsonArray)
 add_subdirectory(JsonDeserializer)
--- a/extras/tests/ElementProxy/CMakeLists.txt
+++ b/extras/tests/ElementProxy/CMakeLists.txt
@ -1,5 +1,5 @@
 # ArduinoJson - arduinojson.org
-# Copyright Benoit Blanchon 2014-2019
+# Copyright Benoit Blanchon 2014-2020
 # MIT License

 add_executable(ElementProxyTests
@ -11,5 +11,4 @@ add_executable(ElementProxyTests
 	size.cpp
 )

-target_link_libraries(ElementProxyTests catch)
 add_test(ElementProxy ElementProxyTests)
--- a/extras/tests/ElementProxy/add.cpp
+++ b/extras/tests/ElementProxy/add.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
@ -23,4 +23,12 @@ TEST_CASE("ElementProxy::add()") {

    REQUIRE(doc.as<std::string>() == "[[\"world\"]]");
  }
+
+  SECTION("set(char[])") {
+    char s[] = "world";
+    ep.add(s);
+    strcpy(s, "!!!!!");
+
+    REQUIRE(doc.as<std::string>() == "[[\"world\"]]");
+  }
 }
--- a/extras/tests/ElementProxy/clear.cpp
+++ b/extras/tests/ElementProxy/clear.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/ElementProxy/compare.cpp
+++ b/extras/tests/ElementProxy/compare.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/ElementProxy/remove.cpp
+++ b/extras/tests/ElementProxy/remove.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/ElementProxy/set.cpp
+++ b/extras/tests/ElementProxy/set.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
@ -9,7 +9,6 @@ using namespace ARDUINOJSON_NAMESPACE;

 TEST_CASE("ElementProxy::set()") {
  DynamicJsonDocument doc(4096);
-  doc.addElement();
  ElementProxy<JsonDocument&> ep = doc[0];

  SECTION("set(int)") {
@ -23,4 +22,12 @@ TEST_CASE("ElementProxy::set()") {

    REQUIRE(doc.as<std::string>() == "[\"world\"]");
  }
+
+  SECTION("set(char[])") {
+    char s[] = "world";
+    ep.set(s);
+    strcpy(s, "!!!!!");
+
+    REQUIRE(doc.as<std::string>() == "[\"world\"]");
+  }
 }
--- a/extras/tests/ElementProxy/size.cpp
+++ b/extras/tests/ElementProxy/size.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/ElementProxy/subscript.cpp
+++ b/extras/tests/ElementProxy/subscript.cpp
@ -0,0 +1,25 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2020
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+TEST_CASE("MemberProxy::operator[]") {
+  DynamicJsonDocument doc(4096);
+  ElementProxy<JsonDocument&> ep = doc[1];
+
+  SECTION("set member") {
+    ep["world"] = 42;
+
+    REQUIRE(doc.as<std::string>() == "[null,{\"world\":42}]");
+  }
+
+  SECTION("set element") {
+    ep[2] = 42;
+
+    REQUIRE(doc.as<std::string>() == "[null,[null,null,42]]");
+  }
+}
--- a/extras/tests/FailingBuilds/CMakeLists.txt
+++ b/extras/tests/FailingBuilds/CMakeLists.txt
@ -0,0 +1,38 @@
+# ArduinoJson - arduinojson.org
+# Copyright Benoit Blanchon 2014-2020
+# MIT License
+
+macro(build_should_fail target)
+	set_target_properties(${target}
+		PROPERTIES
+	    	EXCLUDE_FROM_ALL TRUE
+	        EXCLUDE_FROM_DEFAULT_BUILD TRUE
+	)
+	add_test(
+		NAME
+			${target}
+	    COMMAND
+	    	${CMAKE_COMMAND} --build . --target ${target} --config $<CONFIGURATION>
+	    WORKING_DIRECTORY
+	    	${CMAKE_BINARY_DIR}
+	)
+	set_tests_properties(${target} 
+		PROPERTIES
+			WILL_FAIL TRUE
+	)
+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)
+set_property(TARGET read_long_long PROPERTY CXX_STANDARD 11)
+build_should_fail(read_long_long)
+
+add_executable(write_long_long write_long_long.cpp)
+set_property(TARGET write_long_long PROPERTY CXX_STANDARD 11)
+build_should_fail(write_long_long)
--- a/extras/tests/FailingBuilds/Issue1189.cpp
+++ b/extras/tests/FailingBuilds/Issue1189.cpp
@ -0,0 +1,13 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2020
+// 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);
+}
--- a/extras/tests/FailingBuilds/Issue978.cpp
+++ b/extras/tests/FailingBuilds/Issue978.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/FailingBuilds/read_long_long.cpp
+++ b/extras/tests/FailingBuilds/read_long_long.cpp
@ -0,0 +1,20 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2020
+// MIT License
+
+#define ARDUINOJSON_USE_LONG_LONG 0
+#include <ArduinoJson.h>
+
+#if defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ >= 8
+#error This test requires sizeof(long) < 8
+#endif
+
+#if !ARDUINOJSON_HAS_LONG_LONG
+#error This test requires C++11
+#endif
+
+ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(long long)
+int main() {
+  DynamicJsonDocument doc(1024);
+  doc["dummy"].as<long long>();
+}
--- a/extras/tests/FailingBuilds/write_long_long.cpp
+++ b/extras/tests/FailingBuilds/write_long_long.cpp
@ -0,0 +1,19 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2020
+// MIT License
+
+#define ARDUINOJSON_USE_LONG_LONG 0
+#include <ArduinoJson.h>
+
+#if defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ >= 8
+#error This test requires sizeof(long) < 8
+#endif
+
+#if !ARDUINOJSON_HAS_LONG_LONG
+#error This test requires C++11
+#endif
+
+int main() {
+  DynamicJsonDocument doc(1024);
+  doc["dummy"] = static_cast<long long>(42);
+}
--- a/extras/tests/Helpers/CustomReader.hpp
+++ b/extras/tests/Helpers/CustomReader.hpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #pragma once
--- a/extras/tests/Helpers/Stream.h
+++ b/extras/tests/Helpers/Stream.h
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #pragma once
--- a/extras/tests/Helpers/WString.h
+++ b/extras/tests/Helpers/WString.h
@ -0,0 +1,42 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2020
+// MIT License
+
+#pragma once
+
+#include <string>
+
+// Reproduces Arduino's String class
+class String {
+ public:
+  String& operator+=(const char* rhs) {
+    _str += rhs;
+    return *this;
+  }
+
+  size_t length() const {
+    return _str.size();
+  }
+
+  const char* c_str() const {
+    return _str.c_str();
+  }
+
+  bool operator==(const char* s) const {
+    return _str == s;
+  }
+
+  friend std::ostream& operator<<(std::ostream& lhs, const ::String& rhs) {
+    lhs << rhs._str;
+    return lhs;
+  }
+
+ private:
+  std::string _str;
+};
+
+class StringSumHelper;
+
+inline bool operator==(const std::string& lhs, const ::String& rhs) {
+  return lhs == rhs.c_str();
+}
--- a/extras/tests/MixedConfiguration/progmem_emulation.hpp
+++ b/extras/tests/MixedConfiguration/progmem_emulation.hpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <stdint.h>  // uint8_t
--- a/extras/tests/IntegrationTests/CMakeLists.txt
+++ b/extras/tests/IntegrationTests/CMakeLists.txt
@ -1,11 +1,12 @@
 # ArduinoJson - arduinojson.org
-# Copyright Benoit Blanchon 2014-2019
+# Copyright Benoit Blanchon 2014-2020
 # MIT License

 add_executable(IntegrationTests
 	gbathree.cpp
 	issue772.cpp
 	round_trip.cpp
+	openweathermap.cpp
 )

 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
@ -15,5 +16,4 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 	)
 endif()

-target_link_libraries(IntegrationTests catch)
 add_test(IntegrationTests IntegrationTests)
--- a/extras/tests/IntegrationTests/gbathree.cpp
+++ b/extras/tests/IntegrationTests/gbathree.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/IntegrationTests/issue772.cpp
+++ b/extras/tests/IntegrationTests/issue772.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/IntegrationTests/openweathermap.cpp
+++ b/extras/tests/IntegrationTests/openweathermap.cpp
--- a/extras/tests/IntegrationTests/round_trip.cpp
+++ b/extras/tests/IntegrationTests/round_trip.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/CMakeLists.txt
+++ b/extras/tests/JsonArray/CMakeLists.txt
@ -1,5 +1,5 @@
 # ArduinoJson - arduinojson.org
-# Copyright Benoit Blanchon 2014-2019
+# Copyright Benoit Blanchon 2014-2020
 # MIT License

 add_executable(JsonArrayTests 
@ -19,5 +19,4 @@ add_executable(JsonArrayTests
 	undefined.cpp
 )

-target_link_libraries(JsonArrayTests catch)
 add_test(JsonArray JsonArrayTests)
--- a/extras/tests/JsonArray/add.cpp
+++ b/extras/tests/JsonArray/add.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/copyArray.cpp
+++ b/extras/tests/JsonArray/copyArray.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
@ -19,6 +19,18 @@ TEST_CASE("copyArray()") {
    REQUIRE(std::string("[1,2,3]") == json);
  }

+  SECTION("1D -> JsonDocument") {
+    DynamicJsonDocument doc(4096);
+    char json[32];
+    int source[] = {1, 2, 3};
+
+    bool ok = copyArray(source, doc);
+    REQUIRE(ok);
+
+    serializeJson(doc, json, sizeof(json));
+    REQUIRE(std::string("[1,2,3]") == json);
+  }
+
  SECTION("1D -> JsonArray, but not enough memory") {
    const size_t SIZE = JSON_ARRAY_SIZE(2);
    StaticJsonDocument<SIZE> doc;
@ -46,6 +58,18 @@ TEST_CASE("copyArray()") {
    REQUIRE(std::string("[[1,2,3],[4,5,6]]") == json);
  }

+  SECTION("2D -> JsonDocument") {
+    DynamicJsonDocument doc(4096);
+    char json[32];
+    int source[][3] = {{1, 2, 3}, {4, 5, 6}};
+
+    bool ok = copyArray(source, doc);
+    REQUIRE(ok);
+
+    serializeJson(doc, json, sizeof(json));
+    REQUIRE(std::string("[[1,2,3],[4,5,6]]") == json);
+  }
+
  SECTION("2D -> JsonArray, but not enough memory") {
    const size_t SIZE =
        JSON_ARRAY_SIZE(2) + JSON_ARRAY_SIZE(3) + JSON_ARRAY_SIZE(2);
@ -96,6 +120,22 @@ TEST_CASE("copyArray()") {
    REQUIRE(2 == destination[1]);
  }

+  SECTION("JsonDocument -> 1D") {
+    DynamicJsonDocument doc(4096);
+    char json[] = "[1,2,3]";
+    DeserializationError err = deserializeJson(doc, json);
+    REQUIRE(err == DeserializationError::Ok);
+
+    int destination[4] = {0};
+    size_t result = copyArray(doc, destination);
+
+    REQUIRE(3 == result);
+    REQUIRE(1 == destination[0]);
+    REQUIRE(2 == destination[1]);
+    REQUIRE(3 == destination[2]);
+    REQUIRE(0 == destination[3]);
+  }
+
  SECTION("JsonArray -> 2D") {
    DynamicJsonDocument doc(4096);
    char json[] = "[[1,2],[3],[4]]";
@ -114,4 +154,22 @@ TEST_CASE("copyArray()") {
    REQUIRE(4 == destination[2][0]);
    REQUIRE(0 == destination[2][1]);
  }
+
+  SECTION("JsonDocument -> 2D") {
+    DynamicJsonDocument doc(4096);
+    char json[] = "[[1,2],[3],[4]]";
+
+    DeserializationError err = deserializeJson(doc, json);
+    REQUIRE(err == DeserializationError::Ok);
+
+    int destination[3][2] = {{0}};
+    copyArray(doc, destination);
+
+    REQUIRE(1 == destination[0][0]);
+    REQUIRE(2 == destination[0][1]);
+    REQUIRE(3 == destination[1][0]);
+    REQUIRE(0 == destination[1][1]);
+    REQUIRE(4 == destination[2][0]);
+    REQUIRE(0 == destination[2][1]);
+  }
 }
--- a/extras/tests/JsonArray/createNested.cpp
+++ b/extras/tests/JsonArray/createNested.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/equals.cpp
+++ b/extras/tests/JsonArray/equals.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
@ -31,7 +31,7 @@ TEST_CASE("JsonArray::operator==()") {
    REQUIRE_FALSE(array1c == array2c);
  }

-  SECTION("should return false when RKS has more elements") {
+  SECTION("should return false when RHS has more elements") {
    array1.add(1);
    array2.add(1);
    array2.add(2);
@ -47,4 +47,23 @@ TEST_CASE("JsonArray::operator==()") {
    REQUIRE(array1 == array2);
    REQUIRE(array1c == array2c);
  }
+
+  SECTION("should return false when RHS is null") {
+    JsonArray null;
+
+    REQUIRE_FALSE(array1 == null);
+  }
+
+  SECTION("should return false when LHS is null") {
+    JsonArray null;
+
+    REQUIRE_FALSE(null == array1);
+  }
+
+  SECTION("should return true when both are null") {
+    JsonArray null1;
+    JsonArray null2;
+
+    REQUIRE(null1 == null2);
+  }
 }
--- a/extras/tests/JsonArray/get.cpp
+++ b/extras/tests/JsonArray/get.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/isNull.cpp
+++ b/extras/tests/JsonArray/isNull.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/iterator.cpp
+++ b/extras/tests/JsonArray/iterator.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
@ -28,9 +28,25 @@ static void run_iterator_test() {
 }

 TEST_CASE("JsonArray::begin()/end()") {
-  run_iterator_test<JsonArray>();
+  SECTION("Non null JsonArray") {
+    run_iterator_test<JsonArray>();
+  }
+
+  SECTION("Null JsonArray") {
+    JsonArray array;
+
+    REQUIRE(array.begin() == array.end());
+  }
 }

 TEST_CASE("JsonArrayConst::begin()/end()") {
-  run_iterator_test<JsonArrayConst>();
+  SECTION("Non null JsonArrayConst") {
+    run_iterator_test<JsonArrayConst>();
+  }
+
+  SECTION("Null JsonArrayConst") {
+    JsonArrayConst array;
+
+    REQUIRE(array.begin() == array.end());
+  }
 }
--- a/extras/tests/JsonArray/memoryUsage.cpp
+++ b/extras/tests/JsonArray/memoryUsage.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/nesting.cpp
+++ b/extras/tests/JsonArray/nesting.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/remove.cpp
+++ b/extras/tests/JsonArray/remove.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/size.cpp
+++ b/extras/tests/JsonArray/size.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/std_string.cpp
+++ b/extras/tests/JsonArray/std_string.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/subscript.cpp
+++ b/extras/tests/JsonArray/subscript.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
@ -9,7 +9,20 @@
 TEST_CASE("JsonArray::operator[]") {
  DynamicJsonDocument doc(4096);
  JsonArray array = doc.to<JsonArray>();
-  array.add(0);
+
+  SECTION("Pad with null") {
+    array[2] = 2;
+    array[5] = 5;
+    REQUIRE(array.size() == 6);
+    REQUIRE(array[0].isNull() == true);
+    REQUIRE(array[1].isNull() == true);
+    REQUIRE(array[2].isNull() == false);
+    REQUIRE(array[3].isNull() == true);
+    REQUIRE(array[4].isNull() == true);
+    REQUIRE(array[5].isNull() == false);
+    REQUIRE(array[2] == 2);
+    REQUIRE(array[5] == 5);
+  }

  SECTION("int") {
    array[0] = 123;
--- a/extras/tests/JsonArray/undefined.cpp
+++ b/extras/tests/JsonArray/undefined.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDeserializer/CMakeLists.txt
+++ b/extras/tests/JsonDeserializer/CMakeLists.txt
@ -1,21 +1,23 @@
 # ArduinoJson - arduinojson.org
-# Copyright Benoit Blanchon 2014-2019
+# Copyright Benoit Blanchon 2014-2020
 # MIT License

 add_executable(JsonDeserializerTests
 	array.cpp
 	array_static.cpp
 	DeserializationError.cpp
+	filter.cpp
 	incomplete_input.cpp
 	input_types.cpp
-	number.cpp
 	invalid_input.cpp
 	misc.cpp
 	nestingLimit.cpp
+	number.cpp
 	object.cpp
 	object_static.cpp
 	string.cpp
 )

-target_link_libraries(JsonDeserializerTests catch)
+set_target_properties(JsonDeserializerTests PROPERTIES UNITY_BUILD OFF)
+
 add_test(JsonDeserializer JsonDeserializerTests)
--- a/extras/tests/JsonDeserializer/DeserializationError.cpp
+++ b/extras/tests/JsonDeserializer/DeserializationError.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDeserializer/array.cpp
+++ b/extras/tests/JsonDeserializer/array.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
@ -170,155 +170,6 @@ TEST_CASE("deserialize JSON array") {
    }
  }

-  SECTION("Block comments") {
-    SECTION("Before opening bracket") {
-      DeserializationError err =
-          deserializeJson(doc, "/*COMMENT*/  [\"hello\"]");
-      JsonArray arr = doc.as<JsonArray>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(1 == arr.size());
-      REQUIRE(arr[0] == "hello");
-    }
-
-    SECTION("After opening bracket") {
-      DeserializationError err =
-          deserializeJson(doc, "[/*COMMENT*/ \"hello\"]");
-      JsonArray arr = doc.as<JsonArray>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(1 == arr.size());
-      REQUIRE(arr[0] == "hello");
-    }
-
-    SECTION("Before closing bracket") {
-      DeserializationError err = deserializeJson(doc, "[\"hello\"/*COMMENT*/]");
-      JsonArray arr = doc.as<JsonArray>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(1 == arr.size());
-      REQUIRE(arr[0] == "hello");
-    }
-
-    SECTION("After closing bracket") {
-      DeserializationError err = deserializeJson(doc, "[\"hello\"]/*COMMENT*/");
-      JsonArray arr = doc.as<JsonArray>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(1 == arr.size());
-      REQUIRE(arr[0] == "hello");
-    }
-
-    SECTION("Before comma") {
-      DeserializationError err =
-          deserializeJson(doc, "[\"hello\"/*COMMENT*/,\"world\"]");
-      JsonArray arr = doc.as<JsonArray>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(2 == arr.size());
-      REQUIRE(arr[0] == "hello");
-      REQUIRE(arr[1] == "world");
-    }
-
-    SECTION("After comma") {
-      DeserializationError err =
-          deserializeJson(doc, "[\"hello\",/*COMMENT*/ \"world\"]");
-      JsonArray arr = doc.as<JsonArray>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(2 == arr.size());
-      REQUIRE(arr[0] == "hello");
-      REQUIRE(arr[1] == "world");
-    }
-
-    SECTION("/*/") {
-      DeserializationError err = deserializeJson(doc, "[/*/\n]");
-      REQUIRE(err == DeserializationError::IncompleteInput);
-    }
-
-    SECTION("Unfinished comment") {
-      DeserializationError err = deserializeJson(doc, "[/*COMMENT]");
-      REQUIRE(err == DeserializationError::IncompleteInput);
-    }
-
-    SECTION("Final slash missing") {
-      DeserializationError err = deserializeJson(doc, "[/*COMMENT*]");
-      REQUIRE(err == DeserializationError::IncompleteInput);
-    }
-  }
-
-  SECTION("Trailing comments") {
-    SECTION("Before opening bracket") {
-      DeserializationError err =
-          deserializeJson(doc, "//COMMENT\n\t[\"hello\"]");
-      JsonArray arr = doc.as<JsonArray>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(1 == arr.size());
-      REQUIRE(arr[0] == "hello");
-    }
-
-    SECTION("After opening bracket") {
-      DeserializationError err = deserializeJson(doc, "[//COMMENT\n\"hello\"]");
-      JsonArray arr = doc.as<JsonArray>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(1 == arr.size());
-      REQUIRE(arr[0] == "hello");
-    }
-
-    SECTION("Before closing bracket") {
-      DeserializationError err =
-          deserializeJson(doc, "[\"hello\"//COMMENT\r\n]");
-      JsonArray arr = doc.as<JsonArray>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(1 == arr.size());
-      REQUIRE(arr[0] == "hello");
-    }
-
-    SECTION("After closing bracket") {
-      DeserializationError err = deserializeJson(doc, "[\"hello\"]//COMMENT\n");
-      JsonArray arr = doc.as<JsonArray>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(1 == arr.size());
-      REQUIRE(arr[0] == "hello");
-    }
-
-    SECTION("Before comma") {
-      DeserializationError err =
-          deserializeJson(doc, "[\"hello\"//COMMENT\n,\"world\"]");
-      JsonArray arr = doc.as<JsonArray>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(2 == arr.size());
-      REQUIRE(arr[0] == "hello");
-      REQUIRE(arr[1] == "world");
-    }
-
-    SECTION("After comma") {
-      DeserializationError err =
-          deserializeJson(doc, "[\"hello\",//COMMENT\n\"world\"]");
-      JsonArray arr = doc.as<JsonArray>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(2 == arr.size());
-      REQUIRE(arr[0] == "hello");
-      REQUIRE(arr[1] == "world");
-    }
-
-    SECTION("Invalid comment") {
-      DeserializationError err = deserializeJson(doc, "[/COMMENT\n]");
-      REQUIRE(err == DeserializationError::InvalidInput);
-    }
-
-    SECTION("End document with comment") {
-      DeserializationError err = deserializeJson(doc, "[//COMMENT");
-      REQUIRE(err == DeserializationError::IncompleteInput);
-    }
-  }
-
  SECTION("Premature null-terminator") {
    SECTION("After opening bracket") {
      DeserializationError err = deserializeJson(doc, "[");
--- a/extras/tests/JsonDeserializer/array_static.cpp
+++ b/extras/tests/JsonDeserializer/array_static.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDeserializer/filter.cpp
+++ b/extras/tests/JsonDeserializer/filter.cpp
@ -0,0 +1,749 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2020
+// MIT License
+
+#define ARDUINOJSON_ENABLE_COMMENTS 1
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+#include <sstream>
+#include <string>
+
+TEST_CASE("Filtering") {
+  struct TestCase {
+    const char* input;
+    const char* filter;
+    uint8_t nestingLimit;
+    DeserializationError error;
+    const char* output;
+    size_t memoryUsage;
+  };
+
+  // clang-format off
+  TestCase testCases[] = {
+    {
+      "{\"hello\":\"world\"}",   // 1. input
+      "null",                    // 2. filter
+      10,                        // 3. nestingLimit
+      DeserializationError::Ok,  // 4. error
+      "null",                    // 5. output
+      0                          // 6. memoryUsage
+    },
+    {
+      "{\"hello\":\"world\"}",
+      "false",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      "{\"abcdefg\":\"hijklmn\"}",
+      "true",
+      10,
+      DeserializationError::Ok,
+      "{\"abcdefg\":\"hijklmn\"}",
+      JSON_OBJECT_SIZE(1) + 16
+    },
+    {
+      "{\"hello\":\"world\"}",
+      "{}",
+      10,
+      DeserializationError::Ok,
+      "{}",
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // Input in an object, but filter wants an array
+      "{\"hello\":\"world\"}",
+      "[]",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // Input is an array, but filter wants an object
+      "[\"hello\",\"world\"]",
+      "{}",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // Input is a bool, but filter wants an object
+      "true",
+      "{}",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // Input is a string, but filter wants an object
+      "\"hello\"",
+      "{}",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // skip an integer
+      "{\"an_integer\":666,example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // skip a float
+      "{\"a_float\":12.34e-6,example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip a boolean
+      "{\"a_bool\":false,example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip a double-quoted string
+      "{\"a_double_quoted_string\":\"hello\",example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip a single-quoted string
+      "{\"a_single_quoted_string\":'hello',example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip an empty array
+      "{\"an_empty_array\":[],example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip an empty array with spaces in it
+      "{\"an_empty_array\":[\t],example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip an array
+      "{\"an_array\":[1,2,3],example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip an array with spaces in it
+      "{\"an_array\": [ 1 , 2 , 3 ] ,example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip an empty object
+      "{\"an_empty_object\":{},example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip an empty object with spaces in it
+      "{\"an_empty_object\":{    },example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip an object
+      "{\"an_object\":{a:1,'b':2,\"c\":3},example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // skip an object with spaces in it
+      "{\"an_object\" : { a : 1 , 'b' : 2 , \"c\" : 3 } ,example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      "{\"an_integer\": 0,\"example\":{\"type\":\"int\",\"outcome\":42}}",
+      "{\"example\":{\"outcome\":true}}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":{\"outcome\":42}}",
+      2 * JSON_OBJECT_SIZE(1) + 16
+    },
+    {
+      // only the first element of array counts
+      "[1,2,3]",
+      "[true, false]",
+      10,
+      DeserializationError::Ok,
+      "[1,2,3]",
+      JSON_ARRAY_SIZE(3)
+    },
+    {
+      // only the first element of array counts
+      "[1,2,3]",
+      "[false, true]",
+      10,
+      DeserializationError::Ok,
+      "[]",
+      JSON_ARRAY_SIZE(0)
+    },
+    {
+      // filter members of object in array
+      "[{\"example\":1,\"ignore\":2},{\"example\":3,\"ignore\":4}]",
+      "[{\"example\":true}]",
+      10,
+      DeserializationError::Ok,
+      "[{\"example\":1},{\"example\":3}]",
+      JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 16
+    },
+    {
+      "[',2,3]",
+      "[false,true]",
+      10,
+      DeserializationError::IncompleteInput,
+      "[]",
+      JSON_ARRAY_SIZE(0)
+    },
+    {
+      "[\",2,3]",
+      "[false,true]",
+      10,
+      DeserializationError::IncompleteInput,
+      "[]",
+      JSON_ARRAY_SIZE(0)
+    },
+    {
+      // detect errors in skipped value
+      "[!,2,\\]",
+      "[false]",
+      10,
+      DeserializationError::InvalidInput,
+      "[]",
+      JSON_ARRAY_SIZE(0)
+    },
+    {
+      // detect incomplete string event if it's skipped
+      "\"ABC",
+      "false",
+      10,
+      DeserializationError::IncompleteInput,
+      "null",
+      0
+    },
+    {
+      // detect incomplete string event if it's skipped
+      "'ABC",
+      "false",
+      10,
+      DeserializationError::IncompleteInput,
+      "null",
+      0
+    },
+    {
+      // handle escaped quotes
+      "'A\\'BC'",
+      "false",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // handle escaped quotes
+      "\"A\\\"BC\"",
+      "false",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // detect incomplete string in presence of escaped quotes
+      "'A\\'BC",
+      "false",
+      10,
+      DeserializationError::IncompleteInput,
+      "null",
+      0
+    },
+    {
+      // detect incomplete string in presence of escaped quotes
+      "\"A\\\"BC",
+      "false",
+      10,
+      DeserializationError::IncompleteInput,
+      "null",
+      0
+    },
+    {
+      // skip empty array
+      "[]",
+      "false",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // skip empty array with spaces
+      " [ ] ",
+      "false",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // bubble up element error even if array is skipped 
+      "[1,'2,3]",
+      "false",
+      10,
+      DeserializationError::IncompleteInput,
+      "null",
+      0
+    },
+    {
+      // bubble up member error even if object is skipped 
+      "{'hello':'worl}",
+      "false",
+      10,
+      DeserializationError::IncompleteInput,
+      "null",
+      0
+    },
+    {
+      // bubble up colon error even if object is skipped 
+      "{'hello','world'}",
+      "false",
+      10,
+      DeserializationError::InvalidInput,
+      "null",
+      0
+    },
+    {
+      // bubble up key error even if object is skipped 
+      "{'hello:1}",
+      "false",
+      10,
+      DeserializationError::IncompleteInput,
+      "null",
+      0
+    },
+    {
+      // detect invalid value in skipped object
+      "{'hello':!}",
+      "false", 
+      10,
+      DeserializationError::InvalidInput,
+      "null",
+      0
+    },
+    {
+      // ignore invalid value in skipped object
+      "{'hello':\\}",
+      "false", 
+      10,
+      DeserializationError::InvalidInput,
+      "null", 
+      0
+    },
+    {
+      // check nesting limit even for ignored objects
+      "{}",
+      "false", 
+      0,
+      DeserializationError::TooDeep,
+      "null", 
+      0
+    },
+    {
+      // check nesting limit even for ignored objects
+      "{'hello':{}}",
+      "false", 
+      1,
+      DeserializationError::TooDeep,
+      "null", 
+      0
+    },
+    {
+      // check nesting limit even for ignored values in objects
+      "{'hello':{}}",
+      "{}", 
+      1,
+      DeserializationError::TooDeep,
+      "{}", 
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // check nesting limit even for ignored arrays
+      "[]",
+      "false", 
+      0,
+      DeserializationError::TooDeep,
+      "null", 
+      0
+    },
+    {
+      // check nesting limit even for ignored arrays
+      "[[]]",
+      "false", 
+      1,
+      DeserializationError::TooDeep,
+      "null", 
+      0
+    },
+    {
+      // check nesting limit even for ignored values in arrays
+      "[[]]",
+      "[]", 
+      1,
+      DeserializationError::TooDeep,
+      "[]", 
+      JSON_ARRAY_SIZE(0)
+    },
+    {
+      // supports back-slash at the end of skipped string
+      "\"hell\\",
+      "false", 
+      1,
+      DeserializationError::IncompleteInput,
+      "null", 
+      0
+    },
+    {
+      // invalid comment at after an element in a skipped array
+      "[1/]",
+      "false", 
+      10,
+      DeserializationError::InvalidInput,
+      "null", 
+      0
+    },
+    {
+      // incomplete comment at after an element in a skipped array
+      "[1/*]",
+      "false", 
+      10,
+      DeserializationError::IncompleteInput,
+      "null", 
+      0
+    },
+    {
+      // missing comma in a skipped array
+      "[1 2]",
+      "false", 
+      10,
+      DeserializationError::InvalidInput,
+      "null", 
+      0
+    },
+    {
+      // invalid comment at the beginning of array
+      "[/1]",
+      "[false]", 
+      10,
+      DeserializationError::InvalidInput,
+      "[]", 
+      JSON_ARRAY_SIZE(0)
+    },
+    {
+      // incomplete comment at the begining of an array
+      "[/*]",
+      "[false]", 
+      10,
+      DeserializationError::IncompleteInput,
+      "[]", 
+      JSON_ARRAY_SIZE(0)
+    },
+    {
+      // invalid comment before key
+      "{/1:2}",
+      "{}", 
+      10,
+      DeserializationError::InvalidInput,
+      "{}", 
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // incomplete comment before key
+      "{/*:2}",
+      "{}", 
+      10,
+      DeserializationError::IncompleteInput,
+      "{}", 
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // invalid comment after key
+      "{\"example\"/1:2}",
+      "{}", 
+      10,
+      DeserializationError::InvalidInput,
+      "{}", 
+      JSON_OBJECT_SIZE(0) + 8
+    },
+    {
+      // incomplete comment after key
+      "{\"example\"/*:2}",
+      "{}", 
+      10,
+      DeserializationError::IncompleteInput,
+      "{}", 
+      JSON_OBJECT_SIZE(0) + 8
+    },
+    {
+      // invalid comment after colon
+      "{\"example\":/12}",
+      "{}", 
+      10,
+      DeserializationError::InvalidInput,
+      "{}", 
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // incomplete comment after colon
+      "{\"example\":/*2}",
+      "{}", 
+      10,
+      DeserializationError::IncompleteInput,
+      "{}", 
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // comment next to an integer
+      "{\"ignore\":1//,\"example\":2\n}",
+      "{\"example\":true}", 
+      10,
+      DeserializationError::Ok,
+      "{}", 
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // invalid comment after opening brace of a skipped object
+      "{/1:2}",
+      "false", 
+      10,
+      DeserializationError::InvalidInput,
+      "null", 
+      0
+    },
+    {
+      // incomplete after opening brace of a skipped object
+      "{/*:2}",
+      "false", 
+      10,
+      DeserializationError::IncompleteInput,
+      "null", 
+      0
+    },
+    {
+      // invalid comment after key of a skipped object
+      "{\"example\"/:2}",
+      "false", 
+      10,
+      DeserializationError::InvalidInput,
+      "null", 
+      0
+    },
+    {
+      // incomplete after after key of a skipped object
+      "{\"example\"/*:2}",
+      "false", 
+      10,
+      DeserializationError::IncompleteInput,
+      "null", 
+      0
+    },
+    {
+      // invalid comment after value in a skipped object
+      "{\"example\":2/}",
+      "false", 
+      10,
+      DeserializationError::InvalidInput,
+      "null", 
+      0
+    },
+    {
+      // incomplete after after value of a skipped object
+      "{\"example\":2/*}",
+      "false", 
+      10,
+      DeserializationError::IncompleteInput,
+      "null", 
+      0
+    },
+  };  // clang-format on
+
+  for (size_t i = 0; i < sizeof(testCases) / sizeof(testCases[0]); i++) {
+    CAPTURE(i);
+
+    DynamicJsonDocument filter(256);
+    DynamicJsonDocument doc(256);
+    TestCase& tc = testCases[i];
+
+    CAPTURE(tc.filter);
+    REQUIRE(deserializeJson(filter, tc.filter) == DeserializationError::Ok);
+
+    CAPTURE(tc.input);
+    CAPTURE(tc.nestingLimit);
+    CHECK(deserializeJson(doc, tc.input, DeserializationOption::Filter(filter),
+                          DeserializationOption::NestingLimit(
+                              tc.nestingLimit)) == tc.error);
+
+    CHECK(doc.as<std::string>() == tc.output);
+    CHECK(doc.memoryUsage() == tc.memoryUsage);
+  }
+}
+
+TEST_CASE("Overloads") {
+  StaticJsonDocument<256> doc;
+  StaticJsonDocument<256> filter;
+
+  using namespace DeserializationOption;
+
+  // deserializeJson(..., Filter)
+
+  SECTION("const char*, Filter") {
+    deserializeJson(doc, "{}", Filter(filter));
+  }
+
+  SECTION("const char*, size_t, Filter") {
+    deserializeJson(doc, "{}", 2, Filter(filter));
+  }
+
+  SECTION("const std::string&, Filter") {
+    deserializeJson(doc, std::string("{}"), Filter(filter));
+  }
+
+  SECTION("std::istream&, Filter") {
+    std::stringstream s("{}");
+    deserializeJson(doc, s, Filter(filter));
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("char[n], Filter") {
+    int i = 4;
+    char vla[i];
+    strcpy(vla, "{}");
+    deserializeJson(doc, vla, Filter(filter));
+  }
+#endif
+
+  // deserializeJson(..., Filter, NestingLimit)
+
+  SECTION("const char*, Filter, NestingLimit") {
+    deserializeJson(doc, "{}", Filter(filter), NestingLimit(5));
+  }
+
+  SECTION("const char*, size_t, Filter, NestingLimit") {
+    deserializeJson(doc, "{}", 2, Filter(filter), NestingLimit(5));
+  }
+
+  SECTION("const std::string&, Filter, NestingLimit") {
+    deserializeJson(doc, std::string("{}"), Filter(filter), NestingLimit(5));
+  }
+
+  SECTION("std::istream&, Filter, NestingLimit") {
+    std::stringstream s("{}");
+    deserializeJson(doc, s, Filter(filter), NestingLimit(5));
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("char[n], Filter, NestingLimit") {
+    int i = 4;
+    char vla[i];
+    strcpy(vla, "{}");
+    deserializeJson(doc, vla, Filter(filter), NestingLimit(5));
+  }
+#endif
+
+  // deserializeJson(..., NestingLimit, Filter)
+
+  SECTION("const char*, NestingLimit, Filter") {
+    deserializeJson(doc, "{}", NestingLimit(5), Filter(filter));
+  }
+
+  SECTION("const char*, size_t, NestingLimit, Filter") {
+    deserializeJson(doc, "{}", 2, NestingLimit(5), Filter(filter));
+  }
+
+  SECTION("const std::string&, NestingLimit, Filter") {
+    deserializeJson(doc, std::string("{}"), NestingLimit(5), Filter(filter));
+  }
+
+  SECTION("std::istream&, NestingLimit, Filter") {
+    std::stringstream s("{}");
+    deserializeJson(doc, s, NestingLimit(5), Filter(filter));
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("char[n], NestingLimit, Filter") {
+    int i = 4;
+    char vla[i];
+    strcpy(vla, "{}");
+    deserializeJson(doc, vla, NestingLimit(5), Filter(filter));
+  }
+#endif
+}
+
+TEST_CASE("StringMover::reclaim()") {
+  StaticJsonDocument<200> filter;
+  filter["a"] = true;
+  filter["c"] = true;
+  char input[] = "{\"a\":1,\"b\":2,\"c\":1}";
+
+  StaticJsonDocument<200> doc;
+  deserializeJson(doc, input, DeserializationOption::Filter(filter));
+
+  REQUIRE(doc.as<std::string>() == "{\"a\":1,\"c\":1}");
+
+  CHECK(input[0] == 'a');
+  CHECK(input[1] == 0);
+  CHECK(input[2] == 'c');
+  CHECK(input[3] == 0);
+}
--- a/extras/tests/JsonDeserializer/incomplete_input.cpp
+++ b/extras/tests/JsonDeserializer/incomplete_input.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #define ARDUINOJSON_DECODE_UNICODE 1
@ -13,7 +13,9 @@ TEST_CASE("Truncated JSON input") {
                             // true
                             "t", "tr", "tru",
                             // null
-                             "n", "nu", "nul"};
+                             "n", "nu", "nul",
+                             // object
+                             "{", "{a", "{a:", "{a:1", "{a:1,", "{a:1,"};
  const size_t testCount = sizeof(testCases) / sizeof(testCases[0]);

  DynamicJsonDocument doc(4096);
--- a/extras/tests/JsonDeserializer/input_types.cpp
+++ b/extras/tests/JsonDeserializer/input_types.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
@ -41,7 +41,7 @@ TEST_CASE("deserializeJson(std::istream&)") {
  DynamicJsonDocument doc(4096);

  SECTION("array") {
-    std::istringstream json(" [ 42 /* comment */ ] ");
+    std::istringstream json(" [ 42 ] ");

    DeserializationError err = deserializeJson(doc, json);
    JsonArray arr = doc.as<JsonArray>();
@ -52,7 +52,7 @@ TEST_CASE("deserializeJson(std::istream&)") {
  }

  SECTION("object") {
-    std::istringstream json(" { hello : 'world' // comment\n }");
+    std::istringstream json(" { hello : 'world' }");

    DeserializationError err = deserializeJson(doc, json);
    JsonObject obj = doc.as<JsonObject>();
@ -126,3 +126,57 @@ TEST_CASE("deserializeJson(CustomReader)") {
  REQUIRE(doc[0] == 4);
  REQUIRE(doc[1] == 2);
 }
+
+TEST_CASE("deserializeJson(JsonDocument&, MemberProxy)") {
+  DynamicJsonDocument doc1(4096);
+  doc1["payload"] = "[4,2]";
+
+  DynamicJsonDocument doc2(4096);
+  DeserializationError err = deserializeJson(doc2, doc1["payload"]);
+
+  REQUIRE(err == DeserializationError::Ok);
+  REQUIRE(doc2.size() == 2);
+  REQUIRE(doc2[0] == 4);
+  REQUIRE(doc2[1] == 2);
+}
+
+TEST_CASE("deserializeJson(JsonDocument&, JsonVariant)") {
+  DynamicJsonDocument doc1(4096);
+  doc1["payload"] = "[4,2]";
+
+  DynamicJsonDocument doc2(4096);
+  DeserializationError err =
+      deserializeJson(doc2, doc1["payload"].as<JsonVariant>());
+
+  REQUIRE(err == DeserializationError::Ok);
+  REQUIRE(doc2.size() == 2);
+  REQUIRE(doc2[0] == 4);
+  REQUIRE(doc2[1] == 2);
+}
+
+TEST_CASE("deserializeJson(JsonDocument&, JsonVariantConst)") {
+  DynamicJsonDocument doc1(4096);
+  doc1["payload"] = "[4,2]";
+
+  DynamicJsonDocument doc2(4096);
+  DeserializationError err =
+      deserializeJson(doc2, doc1["payload"].as<JsonVariantConst>());
+
+  REQUIRE(err == DeserializationError::Ok);
+  REQUIRE(doc2.size() == 2);
+  REQUIRE(doc2[0] == 4);
+  REQUIRE(doc2[1] == 2);
+}
+
+TEST_CASE("deserializeJson(JsonDocument&, ElementProxy)") {
+  DynamicJsonDocument doc1(4096);
+  doc1[0] = "[4,2]";
+
+  DynamicJsonDocument doc2(4096);
+  DeserializationError err = deserializeJson(doc2, doc1[0]);
+
+  REQUIRE(err == DeserializationError::Ok);
+  REQUIRE(doc2.size() == 2);
+  REQUIRE(doc2[0] == 4);
+  REQUIRE(doc2[1] == 2);
+}
--- a/extras/tests/JsonDeserializer/invalid_input.cpp
+++ b/extras/tests/JsonDeserializer/invalid_input.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #define ARDUINOJSON_DECODE_UNICODE 1
@ -22,7 +22,14 @@ TEST_CASE("Invalid JSON input") {
 }

 TEST_CASE("Invalid JSON input that should pass") {
-  const char* testCases[] = {"nulL", "tru3", "fals3"};
+  const char* testCases[] = {
+      "nulL",
+      "tru3",
+      "fals3",
+      "'\\ud83d'",         // leading surrogate without a trailing surrogate
+      "'\\udda4'",         // trailing surrogate without a leading surrogate
+      "'\\ud83d\\ud83d'",  // two leading surrogates
+  };
  const size_t testCount = sizeof(testCases) / sizeof(testCases[0]);

  DynamicJsonDocument doc(4096);
--- a/extras/tests/JsonDeserializer/misc.cpp
+++ b/extras/tests/JsonDeserializer/misc.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
@ -61,26 +61,6 @@ TEST_CASE("deserializeJson(DynamicJsonDocument&)") {
    }
  }

-  SECTION("Comments") {
-    SECTION("Just a trailing comment") {
-      DeserializationError err = deserializeJson(doc, "// comment");
-
-      REQUIRE(err == DeserializationError::IncompleteInput);
-    }
-
-    SECTION("Just a block comment") {
-      DeserializationError err = deserializeJson(doc, "/*comment*/");
-
-      REQUIRE(err == DeserializationError::IncompleteInput);
-    }
-
-    SECTION("Just a slash") {
-      DeserializationError err = deserializeJson(doc, "/");
-
-      REQUIRE(err == DeserializationError::InvalidInput);
-    }
-  }
-
  SECTION("Premature null-terminator") {
    SECTION("In escape sequence") {
      DeserializationError err = deserializeJson(doc, "\"\\");
@ -88,12 +68,6 @@ TEST_CASE("deserializeJson(DynamicJsonDocument&)") {
      REQUIRE(err == DeserializationError::IncompleteInput);
    }

-    SECTION("In block comment") {
-      DeserializationError err = deserializeJson(doc, "/* comment");
-
-      REQUIRE(err == DeserializationError::IncompleteInput);
-    }
-
    SECTION("In double quoted string") {
      DeserializationError err = deserializeJson(doc, "\"hello");

@ -114,12 +88,6 @@ TEST_CASE("deserializeJson(DynamicJsonDocument&)") {
      REQUIRE(err == DeserializationError::IncompleteInput);
    }

-    SECTION("In block comment") {
-      DeserializationError err = deserializeJson(doc, "/* comment */", 10);
-
-      REQUIRE(err == DeserializationError::IncompleteInput);
-    }
-
    SECTION("In double quoted string") {
      DeserializationError err = deserializeJson(doc, "\"hello\"", 6);

--- a/extras/tests/JsonDeserializer/nestingLimit.cpp
+++ b/extras/tests/JsonDeserializer/nestingLimit.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDeserializer/number.cpp
+++ b/extras/tests/JsonDeserializer/number.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #define ARDUINOJSON_USE_LONG_LONG 0
--- a/extras/tests/JsonDeserializer/object.cpp
+++ b/extras/tests/JsonDeserializer/object.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
@ -281,212 +281,6 @@ TEST_CASE("deserialize JSON object") {
    }
  }

-  SECTION("Block comments") {
-    SECTION("Before opening brace") {
-      DeserializationError err =
-          deserializeJson(doc, "/*COMMENT*/ {\"hello\":\"world\"}");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-    }
-
-    SECTION("After opening brace") {
-      DeserializationError err =
-          deserializeJson(doc, "{/*COMMENT*/\"hello\":\"world\"}");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-    }
-
-    SECTION("Before colon") {
-      DeserializationError err =
-          deserializeJson(doc, "{\"hello\"/*COMMENT*/:\"world\"}");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-    }
-
-    SECTION("After colon") {
-      DeserializationError err =
-          deserializeJson(doc, "{\"hello\":/*COMMENT*/\"world\"}");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-    }
-
-    SECTION("Before closing brace") {
-      DeserializationError err =
-          deserializeJson(doc, "{\"hello\":\"world\"/*COMMENT*/}");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-    }
-
-    SECTION("After closing brace") {
-      DeserializationError err =
-          deserializeJson(doc, "{\"hello\":\"world\"}/*COMMENT*/");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-    }
-
-    SECTION("Before comma") {
-      DeserializationError err = deserializeJson(
-          doc, "{\"hello\":\"world\"/*COMMENT*/,\"answer\":42}");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-      REQUIRE(obj["answer"] == 42);
-    }
-
-    SECTION("After comma") {
-      DeserializationError err = deserializeJson(
-          doc, "{\"hello\":\"world\",/*COMMENT*/\"answer\":42}");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-      REQUIRE(obj["answer"] == 42);
-    }
-  }
-
-  SECTION("Trailing comments") {
-    SECTION("Before opening brace") {
-      DeserializationError err =
-          deserializeJson(doc, "//COMMENT\n {\"hello\":\"world\"}");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-    }
-
-    SECTION("After opening brace") {
-      DeserializationError err =
-          deserializeJson(doc, "{//COMMENT\n\"hello\":\"world\"}");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-    }
-
-    SECTION("Before colon") {
-      DeserializationError err =
-          deserializeJson(doc, "{\"hello\"//COMMENT\n:\"world\"}");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-    }
-
-    SECTION("After colon") {
-      DeserializationError err =
-          deserializeJson(doc, "{\"hello\"://COMMENT\n\"world\"}");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-    }
-
-    SECTION("Before closing brace") {
-      DeserializationError err =
-          deserializeJson(doc, "{\"hello\":\"world\"//COMMENT\n}");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-    }
-
-    SECTION("After closing brace") {
-      DeserializationError err =
-          deserializeJson(doc, "{\"hello\":\"world\"}//COMMENT\n");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-    }
-
-    SECTION("Before comma") {
-      DeserializationError err = deserializeJson(
-          doc, "{\"hello\":\"world\"//COMMENT\n,\"answer\":42}");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-      REQUIRE(obj["answer"] == 42);
-    }
-
-    SECTION("After comma") {
-      DeserializationError err = deserializeJson(
-          doc, "{\"hello\":\"world\",//COMMENT\n\"answer\":42}");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-      REQUIRE(obj["answer"] == 42);
-    }
-  }
-
-  SECTION("Dangling slash") {
-    SECTION("Before opening brace") {
-      DeserializationError err = deserializeJson(doc, "/{\"hello\":\"world\"}");
-
-      REQUIRE(err == DeserializationError::InvalidInput);
-    }
-
-    SECTION("After opening brace") {
-      DeserializationError err = deserializeJson(doc, "{/\"hello\":\"world\"}");
-
-      REQUIRE(err == DeserializationError::InvalidInput);
-    }
-
-    SECTION("Before colon") {
-      DeserializationError err = deserializeJson(doc, "{\"hello\"/:\"world\"}");
-
-      REQUIRE(err == DeserializationError::InvalidInput);
-    }
-
-    SECTION("After colon") {
-      DeserializationError err = deserializeJson(doc, "{\"hello\":/\"world\"}");
-
-      REQUIRE(err == DeserializationError::InvalidInput);
-    }
-
-    SECTION("Before closing brace") {
-      DeserializationError err = deserializeJson(doc, "{\"hello\":\"world\"/}");
-
-      REQUIRE(err == DeserializationError::InvalidInput);
-    }
-
-    SECTION("After closing brace") {
-      DeserializationError err = deserializeJson(doc, "{\"hello\":\"world\"}/");
-      JsonObject obj = doc.as<JsonObject>();
-
-      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(obj["hello"] == "world");
-    }
-
-    SECTION("Before comma") {
-      DeserializationError err =
-          deserializeJson(doc, "{\"hello\":\"world\"/,\"answer\":42}");
-
-      REQUIRE(err == DeserializationError::InvalidInput);
-    }
-
-    SECTION("After comma") {
-      DeserializationError err =
-          deserializeJson(doc, "{\"hello\":\"world\",/\"answer\":42}");
-
-      REQUIRE(err == DeserializationError::InvalidInput);
-    }
-  }
-
  SECTION("Should clear the JsonObject") {
    deserializeJson(doc, "{\"hello\":\"world\"}");
    deserializeJson(doc, "{}");
--- a/extras/tests/JsonDeserializer/object_static.cpp
+++ b/extras/tests/JsonDeserializer/object_static.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDeserializer/string.cpp
+++ b/extras/tests/JsonDeserializer/string.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #define ARDUINOJSON_DECODE_UNICODE 1
@ -15,12 +15,23 @@ TEST_CASE("Valid JSON strings value") {
  TestCase testCases[] = {
      {"\"hello world\"", "hello world"},
      {"\'hello world\'", "hello world"},
+      {"'\"'", "\""},
+      {"'\\\\'", "\\"},
+      {"'\\/'", "/"},
+      {"'\\b'", "\b"},
+      {"'\\f'", "\f"},
+      {"'\\n'", "\n"},
+      {"'\\r'", "\r"},
+      {"'\\t'", "\t"},
      {"\"1\\\"2\\\\3\\/4\\b5\\f6\\n7\\r8\\t9\"", "1\"2\\3/4\b5\f6\n7\r8\t9"},
      {"'\\u0041'", "A"},
-      {"'\\u00e4'", "\xc3\xa4"},      // ä
-      {"'\\u00E4'", "\xc3\xa4"},      // ä
-      {"'\\u3042'", "\xe3\x81\x82"},  // あ
-
+      {"'\\u00e4'", "\xc3\xa4"},                 // ä
+      {"'\\u00E4'", "\xc3\xa4"},                 // ä
+      {"'\\u3042'", "\xe3\x81\x82"},             // あ
+      {"'\\ud83d\\udda4'", "\xf0\x9f\x96\xa4"},  // 🖤
+      {"'\\uF053'", "\xef\x81\x93"},             // issue #1173
+      {"'\\uF015'", "\xef\x80\x95"},             // issue #1173
+      {"'\\uF054'", "\xef\x81\x94"},             // issue #1173
  };
  const size_t testCount = sizeof(testCases) / sizeof(testCases[0]);

@ -30,8 +41,8 @@ TEST_CASE("Valid JSON strings value") {
    const TestCase& testCase = testCases[i];
    CAPTURE(testCase.input);
    DeserializationError err = deserializeJson(doc, testCase.input);
-    REQUIRE(err == DeserializationError::Ok);
-    REQUIRE(doc.as<std::string>() == testCase.expectedOutput);
+    CHECK(err == DeserializationError::Ok);
+    CHECK(doc.as<std::string>() == testCase.expectedOutput);
  }
 }

@ -51,7 +62,7 @@ TEST_CASE("Truncated JSON string") {

 TEST_CASE("Invalid JSON string") {
  const char* testCases[] = {"'\\u'",     "'\\u000g'", "'\\u000'",
-                             "'\\u000G'", "'\\u000/'", "\\x1234"};
+                             "'\\u000G'", "'\\u000/'", "'\\x1234'"};
  const size_t testCount = sizeof(testCases) / sizeof(testCases[0]);

  DynamicJsonDocument doc(4096);
@ -64,9 +75,15 @@ TEST_CASE("Invalid JSON string") {
 }

 TEST_CASE("Not enough room to duplicate the string") {
-  DynamicJsonDocument doc(4);
+  DynamicJsonDocument doc(JSON_OBJECT_SIZE(0));

-  REQUIRE(deserializeJson(doc, "\"hello world!\"") ==
-          DeserializationError::NoMemory);
-  REQUIRE(doc.isNull() == true);
+  SECTION("Quoted string") {
+    REQUIRE(deserializeJson(doc, "{\"example\":1}") ==
+            DeserializationError::NoMemory);
+  }
+
+  SECTION("Non-quoted string") {
+    REQUIRE(deserializeJson(doc, "{example:1}") ==
+            DeserializationError::NoMemory);
+  }
 }
--- a/extras/tests/JsonDocument/BasicJsonDocument.cpp
+++ b/extras/tests/JsonDocument/BasicJsonDocument.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
@ -8,9 +8,11 @@
 #include <sstream>

 using ARDUINOJSON_NAMESPACE::addPadding;
+using ARDUINOJSON_NAMESPACE::move;

 class SpyingAllocator {
 public:
+  SpyingAllocator(const SpyingAllocator& src) : _log(src._log) {}
  SpyingAllocator(std::ostream& log) : _log(log) {}

  void* allocate(size_t n) {
@ -28,22 +30,128 @@ class SpyingAllocator {
  std::ostream& _log;
 };

-typedef BasicJsonDocument<SpyingAllocator> MyJsonDocument;
+class ControllableAllocator {
+ public:
+  ControllableAllocator() : _enabled(true) {}
+
+  void* allocate(size_t n) {
+    return _enabled ? malloc(n) : 0;
+  }
+
+  void deallocate(void* p) {
+    free(p);
+  }
+
+  void disable() {
+    _enabled = false;
+  }
+
+ private:
+  bool _enabled;
+};

 TEST_CASE("BasicJsonDocument") {
  std::stringstream log;

  SECTION("Construct/Destruct") {
-    { MyJsonDocument doc(4096, log); }
+    { BasicJsonDocument<SpyingAllocator> doc(4096, log); }
    REQUIRE(log.str() == "A4096F");
  }

  SECTION("Copy construct") {
    {
-      MyJsonDocument doc1(4096, log);
+      BasicJsonDocument<SpyingAllocator> doc1(4096, log);
      doc1.set(std::string("The size of this string is 32!!"));
-      MyJsonDocument doc2(doc1);
+
+      BasicJsonDocument<SpyingAllocator> doc2(doc1);
+
+      REQUIRE(doc1.as<std::string>() == "The size of this string is 32!!");
+      REQUIRE(doc2.as<std::string>() == "The size of this string is 32!!");
+      REQUIRE(doc2.capacity() == 4096);
+    }
+    REQUIRE(log.str() == "A4096A4096FF");
+  }
+
+#if ARDUINOJSON_HAS_RVALUE_REFERENCES
+  SECTION("Move construct") {
+    {
+      BasicJsonDocument<SpyingAllocator> doc1(4096, log);
+      doc1.set(std::string("The size of this string is 32!!"));
+
+      BasicJsonDocument<SpyingAllocator> doc2(move(doc1));
+
+      REQUIRE(doc2.as<std::string>() == "The size of this string is 32!!");
+      REQUIRE(doc1.as<std::string>() == "null");
+      REQUIRE(doc1.capacity() == 0);
+      REQUIRE(doc2.capacity() == 4096);
+    }
+    REQUIRE(log.str() == "A4096F");
+  }
+#endif
+
+  SECTION("Copy assign") {
+    {
+      BasicJsonDocument<SpyingAllocator> doc1(4096, log);
+      doc1.set(std::string("The size of this string is 32!!"));
+      BasicJsonDocument<SpyingAllocator> doc2(8, log);
+
+      doc2 = doc1;
+
+      REQUIRE(doc1.as<std::string>() == "The size of this string is 32!!");
+      REQUIRE(doc2.as<std::string>() == "The size of this string is 32!!");
+      REQUIRE(doc2.capacity() == 4096);
+    }
+    REQUIRE(log.str() == "A4096A8FA4096FF");
+  }
+
+#if ARDUINOJSON_HAS_RVALUE_REFERENCES
+  SECTION("Move assign") {
+    {
+      BasicJsonDocument<SpyingAllocator> doc1(4096, log);
+      doc1.set(std::string("The size of this string is 32!!"));
+      BasicJsonDocument<SpyingAllocator> doc2(8, log);
+
+      doc2 = move(doc1);
+
+      REQUIRE(doc2.as<std::string>() == "The size of this string is 32!!");
+      REQUIRE(doc1.as<std::string>() == "null");
+      REQUIRE(doc1.capacity() == 0);
+      REQUIRE(doc2.capacity() == 4096);
+    }
+    REQUIRE(log.str() == "A4096A8FF");
+  }
+#endif
+
+  SECTION("garbageCollect()") {
+    BasicJsonDocument<ControllableAllocator> doc(4096);
+
+    SECTION("when allocation succeeds") {
+      deserializeJson(doc, "{\"blanket\":1,\"dancing\":2}");
+      REQUIRE(doc.capacity() == 4096);
+      REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      doc.remove("blanket");
+
+      bool result = doc.garbageCollect();
+
+      REQUIRE(result == true);
+      REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      REQUIRE(doc.capacity() == 4096);
+      REQUIRE(doc.as<std::string>() == "{\"dancing\":2}");
+    }
+
+    SECTION("when allocation fails") {
+      deserializeJson(doc, "{\"blanket\":1,\"dancing\":2}");
+      REQUIRE(doc.capacity() == 4096);
+      REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      doc.remove("blanket");
+      doc.allocator().disable();
+
+      bool result = doc.garbageCollect();
+
+      REQUIRE(result == false);
+      REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      REQUIRE(doc.capacity() == 4096);
+      REQUIRE(doc.as<std::string>() == "{\"dancing\":2}");
    }
-    REQUIRE(log.str() == "A4096A32FF");
  }
 }
--- a/extras/tests/JsonDocument/CMakeLists.txt
+++ b/extras/tests/JsonDocument/CMakeLists.txt
@ -1,5 +1,5 @@
 # ArduinoJson - arduinojson.org
-# Copyright Benoit Blanchon 2014-2019
+# Copyright Benoit Blanchon 2014-2020
 # MIT License

 add_executable(JsonDocumentTests
@ -12,10 +12,10 @@ add_executable(JsonDocumentTests
 	isNull.cpp
 	nesting.cpp
 	remove.cpp
+	shrinkToFit.cpp
 	size.cpp
 	StaticJsonDocument.cpp
 	subscript.cpp
 )

-target_link_libraries(JsonDocumentTests catch)
 add_test(JsonDocument JsonDocumentTests)
--- a/extras/tests/JsonDocument/DynamicJsonDocument.cpp
+++ b/extras/tests/JsonDocument/DynamicJsonDocument.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
@ -91,7 +91,7 @@ TEST_CASE("DynamicJsonDocument constructor") {

    REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");

-    REQUIRE(doc2.capacity() == addPadding(doc1.memoryUsage()));
+    REQUIRE(doc2.capacity() == doc1.capacity());
  }

  SECTION("Construct from StaticJsonDocument") {
@ -101,7 +101,7 @@ TEST_CASE("DynamicJsonDocument constructor") {
    DynamicJsonDocument doc2 = doc1;

    REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
-    REQUIRE(doc2.capacity() == addPadding(doc1.memoryUsage()));
+    REQUIRE(doc2.capacity() == doc1.capacity());
  }

  SECTION("Construct from JsonObject") {
--- a/extras/tests/JsonDocument/StaticJsonDocument.cpp
+++ b/extras/tests/JsonDocument/StaticJsonDocument.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
@ -209,4 +209,16 @@ TEST_CASE("StaticJsonDocument") {
      REQUIRE_JSON(doc2, "42");
    }
  }
+
+  SECTION("garbageCollect()") {
+    StaticJsonDocument<256> doc;
+    doc[std::string("example")] = std::string("example");
+    doc.remove("example");
+    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 16);
+
+    doc.garbageCollect();
+
+    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0));
+    REQUIRE_JSON(doc, "{}");
+  }
 }
--- a/extras/tests/JsonDocument/add.cpp
+++ b/extras/tests/JsonDocument/add.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDocument/compare.cpp
+++ b/extras/tests/JsonDocument/compare.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDocument/containsKey.cpp
+++ b/extras/tests/JsonDocument/containsKey.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDocument/createNested.cpp
+++ b/extras/tests/JsonDocument/createNested.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDocument/isNull.cpp
+++ b/extras/tests/JsonDocument/isNull.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDocument/nesting.cpp
+++ b/extras/tests/JsonDocument/nesting.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDocument/remove.cpp
+++ b/extras/tests/JsonDocument/remove.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDocument/shrinkToFit.cpp
+++ b/extras/tests/JsonDocument/shrinkToFit.cpp
@ -0,0 +1,154 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2020
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+#include <stdlib.h>  // malloc, free
+#include <string>
+
+using ARDUINOJSON_NAMESPACE::addPadding;
+
+class ArmoredAllocator {
+ public:
+  ArmoredAllocator() : _ptr(0), _size(0) {}
+
+  void* allocate(size_t size) {
+    _ptr = malloc(size);
+    _size = size;
+    return _ptr;
+  }
+
+  void deallocate(void* ptr) {
+    REQUIRE(ptr == _ptr);
+    free(ptr);
+    _ptr = 0;
+    _size = 0;
+  }
+
+  void* reallocate(void* ptr, size_t new_size) {
+    REQUIRE(ptr == _ptr);
+    // don't call realloc, instead alloc a new buffer and erase the old one
+    // this way we make sure we support relocation
+    void* new_ptr = malloc(new_size);
+    memcpy(new_ptr, _ptr, std::min(new_size, _size));
+    memset(_ptr, '#', _size);  // erase
+    free(_ptr);
+    _ptr = new_ptr;
+    return new_ptr;
+  }
+
+ private:
+  void* _ptr;
+  size_t _size;
+};
+
+typedef BasicJsonDocument<ArmoredAllocator> ShrinkToFitTestDocument;
+
+void testShrinkToFit(ShrinkToFitTestDocument& doc, std::string expected_json,
+                     size_t expected_size) {
+  // test twice: shrinkToFit() should be idempotent
+  for (int i = 0; i < 2; i++) {
+    doc.shrinkToFit();
+
+    REQUIRE(doc.capacity() == expected_size);
+    REQUIRE(doc.memoryUsage() == expected_size);
+
+    std::string json;
+    serializeJson(doc, json);
+    REQUIRE(json == expected_json);
+  }
+}
+
+TEST_CASE("BasicJsonDocument::shrinkToFit()") {
+  ShrinkToFitTestDocument doc(4096);
+
+  SECTION("null") {
+    testShrinkToFit(doc, "null", 0);
+  }
+
+  SECTION("empty object") {
+    deserializeJson(doc, "{}");
+    testShrinkToFit(doc, "{}", JSON_OBJECT_SIZE(0));
+  }
+
+  SECTION("empty array") {
+    deserializeJson(doc, "[]");
+    testShrinkToFit(doc, "[]", JSON_ARRAY_SIZE(0));
+  }
+
+  SECTION("linked string") {
+    doc.set("hello");
+    testShrinkToFit(doc, "\"hello\"", 0);
+  }
+
+  SECTION("owned string") {
+    doc.set(std::string("abcdefg"));
+    testShrinkToFit(doc, "\"abcdefg\"", 8);
+  }
+
+  SECTION("linked raw") {
+    doc.set(serialized("[{},123]"));
+    testShrinkToFit(doc, "[{},123]", 0);
+  }
+
+  SECTION("owned raw") {
+    doc.set(serialized(std::string("[{},123]")));
+    testShrinkToFit(doc, "[{},123]", 8);
+  }
+
+  SECTION("linked key") {
+    doc["key"] = 42;
+    testShrinkToFit(doc, "{\"key\":42}", JSON_OBJECT_SIZE(1));
+  }
+
+  SECTION("owned key") {
+    doc[std::string("abcdefg")] = 42;
+    testShrinkToFit(doc, "{\"abcdefg\":42}", JSON_OBJECT_SIZE(1) + 8);
+  }
+
+  SECTION("linked string in array") {
+    doc.add("hello");
+    testShrinkToFit(doc, "[\"hello\"]", JSON_ARRAY_SIZE(1));
+  }
+
+  SECTION("owned string in array") {
+    doc.add(std::string("abcdefg"));
+    testShrinkToFit(doc, "[\"abcdefg\"]", JSON_ARRAY_SIZE(1) + 8);
+  }
+
+  SECTION("linked string in object") {
+    doc["key"] = "hello";
+    testShrinkToFit(doc, "{\"key\":\"hello\"}", JSON_OBJECT_SIZE(1));
+  }
+
+  SECTION("owned string in object") {
+    doc["key"] = std::string("abcdefg");
+    testShrinkToFit(doc, "{\"key\":\"abcdefg\"}", JSON_ARRAY_SIZE(1) + 8);
+  }
+
+  SECTION("unaligned") {
+    doc.add(std::string("?"));  // two bytes in the string pool
+    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 2);
+
+    doc.shrinkToFit();
+
+    // the new capacity should be padded to align the pointers
+    REQUIRE(doc.capacity() == JSON_OBJECT_SIZE(1) + sizeof(void*));
+    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 2);
+    REQUIRE(doc[0] == "?");
+  }
+}
+
+TEST_CASE("DynamicJsonDocument::shrinkToFit()") {
+  DynamicJsonDocument doc(4096);
+
+  deserializeJson(doc, "{\"hello\":[\"world\"]");
+
+  doc.shrinkToFit();
+
+  std::string json;
+  serializeJson(doc, json);
+  REQUIRE(json == "{\"hello\":[\"world\"]}");
+}
--- a/extras/tests/JsonDocument/size.cpp
+++ b/extras/tests/JsonDocument/size.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDocument/subscript.cpp
+++ b/extras/tests/JsonDocument/subscript.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
@ -43,3 +43,11 @@ TEST_CASE("JsonDocument automatically promotes to object") {

  REQUIRE(doc["one"]["two"]["three"] == 4);
 }
+
+TEST_CASE("JsonDocument automatically promotes to array") {
+  DynamicJsonDocument doc(4096);
+
+  doc[2] = 2;
+
+  REQUIRE(doc.as<std::string>() == "[null,null,2]");
+}
--- a/extras/tests/JsonObject/CMakeLists.txt
+++ b/extras/tests/JsonObject/CMakeLists.txt
@ -1,5 +1,5 @@
 # ArduinoJson - arduinojson.org
-# Copyright Benoit Blanchon 2014-2019
+# Copyright Benoit Blanchon 2014-2020
 # MIT License

 add_executable(JsonObjectTests 
@ -19,5 +19,4 @@ add_executable(JsonObjectTests
 	subscript.cpp
 )

-target_link_libraries(JsonObjectTests catch)
 add_test(JsonObject JsonObjectTests)
--- a/extras/tests/JsonObject/containsKey.cpp
+++ b/extras/tests/JsonObject/containsKey.cpp
@ -1,5 +1,5 @@
 // ArduinoJson - arduinojson.org
-// Copyright Benoit Blanchon 2014-2019
+// Copyright Benoit Blanchon 2014-2020
 // MIT License

 #include <ArduinoJson.h>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Benoit Blanchon	6fb52c3638	Set version to 6.15.2	2020-05-15 09:26:25 +02:00
Benoit Blanchon	b72ef09451	Fixed publish script	2020-05-15 09:26:06 +02:00
Benoit Blanchon	f7de027617	Break build if using 64-bit integers with ARDUINOJSON_USE_LONG_LONG==0	2020-05-14 10:25:10 +02:00
Benoit Blanchon	bc4c2dde33	Moved failing builds to a dedicated folder	2020-05-12 18:11:55 +02:00
Benoit Blanchon	95f05dad66	Added `JsonVariant` as an input type for `deserializeXxx()`	2020-05-05 13:16:32 +02:00
Benoit Blanchon	3bb0a7aa8e	Added support for `enum`s in `as<T>()` and `is<T>()` (fixes #1256 )	2020-05-04 11:13:06 +02:00
Benoit Blanchon	dcf7eeef28	CMake: used link_libraries() instead of target_link_libraries()	2020-05-03 10:25:38 +02:00
Benoit Blanchon	3b923b6e4e	Added support for `JsonDocument` to `copyArray()` (issue #1255 )	2020-05-02 10:00:08 +02:00
Benoit Blanchon	8050f7404b	CMake: gathered all build flags in a dedicated file	2020-04-28 16:02:59 +02:00
Benoit Blanchon	959b1d9e4c	Fixed error C2766 with flag `/Zc:__cplusplus` on VS2017+ (fixes #1250 )	2020-04-28 16:02:38 +02:00
Benoit Blanchon	daa279d57b	CMake: made project arch-independent	2020-04-11 18:49:28 +02:00
Benoit Blanchon	ae9b7926a2	CMake: don't build tests when imported in another project	2020-04-11 18:49:28 +02:00
Benoit Blanchon	1f7a5e6943	Fixed links in README	2020-04-11 11:53:08 +02:00
Benoit Blanchon	9e354803de	Changed publish.sh to update the CMake project version	2020-04-09 21:28:48 +02:00
Benoit Blanchon	3ea5eb3f3a	Set version to 6.15.1	2020-04-08 18:23:27 +02:00
Benoit Blanchon	ec43bf4fe9	Simplified the implementation of implicit casts	2020-04-08 18:18:18 +02:00
Benoit Blanchon	2097ffaabf	Updated README	2020-04-08 11:16:22 +02:00
Benoit Blanchon	67e78f0751	Disabled alignment on AVR (fixes #1231 )	2020-04-08 11:16:22 +02:00
Benoit Blanchon	1791dccbf2	Added CMake "install" target (closes #1209 )	2020-04-07 21:43:10 +02:00
Benoit Blanchon	40d1cfe7af	Fixed "pointless integer comparison" warning on IAR (issue #1233 )	2020-04-06 18:20:12 +02:00
Benoit Blanchon	4627f851ca	Fixed "statement is unreachable" warning on IAR (issue #1233 )	2020-04-06 18:19:32 +02:00
Benoit Blanchon	fc9e609ab5	Fixed "maybe-uninitialized" warning (fixes #1217 )	2020-03-25 08:37:57 +01:00
Benoit Blanchon	8b3d861a9d	Updated README	2020-03-23 13:39:58 +01:00
Benoit Blanchon	9ef864b27c	Fixed markup in changelog	2020-03-23 11:03:30 +01:00
Benoit Blanchon	275b80a462	Updated library description	2020-03-23 11:02:58 +01:00
Benoit Blanchon	763be4f266	Set version to 6.15.0	2020-03-22 21:02:38 +01:00
Benoit Blanchon	5b812522fa	Enabled debug mode when PlatformIO builds in debug	2020-03-20 20:58:08 +01:00
Benoit Blanchon	9cb0ddb5e7	Removed the copy-constructor of JsonDocument (issue #1189 )	2020-03-05 13:46:45 +01:00
Benoit Blanchon	735bea1f47	Added `StaticJsonDocument::garbageCollect()`	2020-03-02 14:50:16 +01:00
Benoit Blanchon	0853b04589	Changed BasicJsonDocument's copy-constructor to copy the capacity	2020-03-02 12:39:29 +01:00
Benoit Blanchon	c1b3705df1	Added `BasicJsonDocument::garbageCollect()` (issue #1195 )	2020-03-01 18:01:55 +01:00
Benoit Blanchon	2540b4e01b	Added move-constructor and move-assignment to `BasicJsonDocument`	2020-03-01 17:24:29 +01:00
Benoit Blanchon	2641697e0b	Fixed incorrect string comparison on some platforms (fixes #1198 )	2020-02-27 11:44:09 +01:00
Benoit Blanchon	2996503b27	Fixed enums serialized as booleans (fixes #1197 )	2020-02-26 16:16:20 +01:00
Benoit Blanchon	0214c9bcad	Improved coverage of JsonObject	2020-02-23 13:03:14 +01:00
Benoit Blanchon	a471aed6db	Improved coverage of JsonObject	2020-02-22 14:17:10 +01:00
Benoit Blanchon	af0edecddb	Fixed MemberProxy::set(char[]) not duplicating the string (fixes #1191 )	2020-02-22 12:06:39 +01:00
Benoit Blanchon	300323cfd7	Improved coverage of JsonArray	2020-02-20 09:18:10 +01:00
Benoit Blanchon	d8724e0a0b	Changed the array subscript to automatically add missing elements	2020-02-20 08:59:25 +01:00
Benoit Blanchon	0001dabfd1	Improved coverage of MemoryPool	2020-02-19 17:27:04 +01:00
Benoit Blanchon	ad78001241	Removed useless null checks	2020-02-19 17:22:23 +01:00
Benoit Blanchon	5a837a591e	Improved coverage of MsgPackDeserializer	2020-02-19 17:14:40 +01:00
Benoit Blanchon	fd79d23910	Updated copyright year	2020-02-19 16:07:34 +01:00
Benoit Blanchon	1902c0ec93	Improved coverage of JsonDeserializer	2020-02-19 10:31:56 +01:00
Benoit Blanchon	85499be855	Added tests for FlashStringAdapter	2020-02-16 17:56:47 +01:00
Benoit Blanchon	e6ddfc7afb	Fixed static JsonString not being saved by reference	2020-02-16 17:34:04 +01:00
Benoit Blanchon	58298ec5ba	Extracted storage_policy to improve coverage in string adapters	2020-02-16 17:34:04 +01:00
Benoit Blanchon	0814fc185f	Added a line-break after each "if" to get more accurate coverage report	2020-02-16 15:05:23 +01:00
Benoit Blanchon	8f8c82d400	Reduced code size	2020-02-13 17:05:08 +01:00
Benoit Blanchon	372b7d3d9d	Exposed JsonPairConst	2020-02-13 16:58:23 +01:00
Benoit Blanchon	fbffadb2cf	Moved nesting decrement logic to class NestingLimit	2020-02-13 16:54:18 +01:00
Benoit Blanchon	6e52f242b2	Extracted the class Latch also fixed a buffer overrun and reduced the code size	2020-02-13 14:53:54 +01:00
Benoit Blanchon	d2a67f362f	Fixed "deprecated-copy" warning on GCC 9 (fixes #1184 )	2020-02-13 11:07:40 +01:00
Benoit Blanchon	66b12da4e7	Added `DeserializationOption::Filter` (closes #959 )	2020-02-12 17:22:42 +01:00
Benoit Blanchon	42b0d6a83d	Set version to 6.14.1	2020-01-27 15:05:36 +01:00
Benoit Blanchon	94b1c75fd2	Added getElement() and getMember() to JsonVariantConst	2020-01-27 12:35:32 +01:00
Benoit Blanchon	b04b549b34	Delete .bak file produced during publish	2020-01-27 12:10:11 +01:00
Benoit Blanchon	09d4b2cd38	Fixed regression in UTF16 decoding (fixes #1173 )	2020-01-27 12:10:10 +01:00
Benoit Blanchon	ddfe7d8b91	Set version to 6.14.0	2020-01-16 20:48:03 +01:00
Benoit Blanchon	4a657ca87f	Update the features section of the README page	2020-01-16 20:46:25 +01:00
Benoit Blanchon	1e3d478998	Improved speed of serializeXxx() when writing to a String	2020-01-14 14:50:44 +01:00
Benoit Blanchon	3aebef6d0a	Fixed value returned by serializeXxx() when writing to a String	2020-01-14 11:22:44 +01:00
Benoit Blanchon	25879466da	Fixed variant.is<nullptr_t>()	2020-01-13 20:47:43 +01:00
Benoit Blanchon	27ec1afb7a	Configure the "lock-threads" app	2020-01-13 18:23:30 +01:00
Benoit Blanchon	06a0d1a872	Added measureJson, measureJsonPretty, and measureMsgPack to keywords	2020-01-13 18:20:05 +01:00
Benoit Blanchon	04fe7e1a27	Added ARDUINOJSON_ENABLE_COMMENTS to enable support for comments	2020-01-13 18:16:02 +01:00
Benoit Blanchon	f9cfea244a	Updated copyright notice	2020-01-09 15:48:38 +01:00
Benoit Blanchon	5ec062cc71	Reduced Unicode conversion code size (-122 bytes on AVR)	2020-01-09 15:39:45 +01:00
Kay Sievers	91b808381e	Improved decoding of UTF-16 surrogate pairs (closes #1157 )	2020-01-08 09:55:43 +01:00
Benoit Blanchon	8550418875	Auto enable std::string and stream on modern compilers (closes #1156 )	2020-01-04 15:05:20 +01:00
Benoit Blanchon	00c391320c	Added support for CMake's unity builds	2019-12-24 16:42:34 +01:00
Benoit Blanchon	9723682d20	AppVeyor: added Visual Studio 2019	2019-12-24 16:10:11 +01:00
Benoit Blanchon	8bf6f6e09f	Added support `uint8_t` for `serializeMsgPack()` (closes #1142 )	2019-12-13 14:15:30 +01:00
Benoit Blanchon	062c1c13b5	Added `BasicJsonDocument::shrinkToFit()`	2019-11-07 15:40:20 +01:00