Added StaticJsonDocument and DynamicJsonDocument.

Removed StaticJsonArray and DynamicJsonArray.
Removed StaticJsonObject and DynamicJsonObject.
Removed StaticJsonVariant and DynamicJsonVariant.

test/JsonDeserializer/CMakeLists.txt

@@ -0,0 +1,16 @@
+# ArduinoJson - arduinojson.org
+# Copyright Benoit Blanchon 2014-2018
+# MIT License
+
+add_executable(JsonDeserializerTests
+	deserializeJsonArray.cpp
+	deserializeJsonArrayStatic.cpp
+	deserializeJsonObject.cpp
+	deserializeJsonObjectStatic.cpp
+	deserializeJsonValue.cpp
+	JsonError.cpp
+	nestingLimit.cpp
+)
+
+target_link_libraries(JsonDeserializerTests catch)
+add_test(JsonDeserializer JsonDeserializerTests)

test/JsonDeserializer/JsonError.cpp

@@ -0,0 +1,42 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+void testStringification(JsonError error, std::string expected) {
+  REQUIRE(error.c_str() == expected);
+}
+
+void testBoolification(JsonError error, bool expected) {
+  CHECK(error == expected);
+}
+
+#define TEST_STRINGIFICATION(symbol) \
+  testStringification(JsonError::symbol, #symbol)
+
+#define TEST_BOOLIFICATION(symbol, expected) \
+  testBoolification(JsonError::symbol, expected)
+
+TEST_CASE("JsonError") {
+  SECTION("c_str()") {
+    TEST_STRINGIFICATION(Ok);
+    TEST_STRINGIFICATION(TooDeep);
+    TEST_STRINGIFICATION(NoMemory);
+    TEST_STRINGIFICATION(InvalidInput);
+  }
+
+  SECTION("as boolean") {
+    TEST_BOOLIFICATION(Ok, false);
+    TEST_BOOLIFICATION(TooDeep, true);
+    TEST_BOOLIFICATION(NoMemory, true);
+    TEST_BOOLIFICATION(InvalidInput, true);
+  }
+
+  SECTION("ostream") {
+    std::stringstream s;
+    s << JsonError::InvalidInput;
+    REQUIRE(s.str() == "InvalidInput");
+  }
+}

test/JsonDeserializer/deserializeJsonArray.cpp

@@ -0,0 +1,384 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("deserialize JSON array") {
+  DynamicJsonDocument doc;
+
+  SECTION("An empty array") {
+    JsonError err = deserializeJson(doc, "[]");
+    JsonArray& arr = doc.as<JsonArray>();
+
+    REQUIRE(err == JsonError::Ok);
+    REQUIRE(0 == arr.size());
+  }
+
+  SECTION("Spaces") {
+    SECTION("Before the opening bracket") {
+      JsonError err = deserializeJson(doc, "  []");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(0 == arr.size());
+    }
+
+    SECTION("Before first value") {
+      JsonError err = deserializeJson(doc, "[ \t\r\n42]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == 42);
+    }
+
+    SECTION("After first value") {
+      JsonError err = deserializeJson(doc, "[42 \t\r\n]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == 42);
+    }
+  }
+
+  SECTION("Values types") {
+    SECTION("On integer") {
+      JsonError err = deserializeJson(doc, "[42]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == 42);
+    }
+
+    SECTION("Two integers") {
+      JsonError err = deserializeJson(doc, "[42,84]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == 42);
+      REQUIRE(arr[1] == 84);
+    }
+
+    SECTION("Double") {
+      JsonError err = deserializeJson(doc, "[4.2,1e2]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == 4.2);
+      REQUIRE(arr[1] == 1e2);
+    }
+
+    SECTION("Unsigned long") {
+      JsonError err = deserializeJson(doc, "[4294967295]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == 4294967295UL);
+    }
+
+    SECTION("Boolean") {
+      JsonError err = deserializeJson(doc, "[true,false]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == true);
+      REQUIRE(arr[1] == false);
+    }
+
+    SECTION("Null") {
+      JsonError err = deserializeJson(doc, "[null,null]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0].as<char*>() == 0);
+      REQUIRE(arr[1].as<char*>() == 0);
+    }
+  }
+
+  SECTION("Quotes") {
+    SECTION("Double quotes") {
+      JsonError err = deserializeJson(doc, "[ \"hello\" , \"world\" ]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "hello");
+      REQUIRE(arr[1] == "world");
+    }
+
+    SECTION("Single quotes") {
+      JsonError err = deserializeJson(doc, "[ 'hello' , 'world' ]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "hello");
+      REQUIRE(arr[1] == "world");
+    }
+
+    SECTION("No quotes") {
+      JsonError err = deserializeJson(doc, "[ hello , world ]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "hello");
+      REQUIRE(arr[1] == "world");
+    }
+
+    SECTION("Double quotes (empty strings)") {
+      JsonError err = deserializeJson(doc, "[\"\",\"\"]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "");
+      REQUIRE(arr[1] == "");
+    }
+
+    SECTION("Single quotes (empty strings)") {
+      JsonError err = deserializeJson(doc, "[\'\',\'\']");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "");
+      REQUIRE(arr[1] == "");
+    }
+
+    SECTION("No quotes (empty strings)") {
+      JsonError err = deserializeJson(doc, "[,]");
+
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+
+    SECTION("Closing single quotes missing") {
+      JsonError err = deserializeJson(doc, "[\"]");
+
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+
+    SECTION("Closing double quotes missing") {
+      JsonError err = deserializeJson(doc, "[\']");
+
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+  }
+
+  SECTION("Block comments") {
+    SECTION("Before opening bracket") {
+      JsonError err = deserializeJson(doc, "/*COMMENT*/  [\"hello\"]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("After opening bracket") {
+      JsonError err = deserializeJson(doc, "[/*COMMENT*/ \"hello\"]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("Before closing bracket") {
+      JsonError err = deserializeJson(doc, "[\"hello\"/*COMMENT*/]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("After closing bracket") {
+      JsonError err = deserializeJson(doc, "[\"hello\"]/*COMMENT*/");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("Before comma") {
+      JsonError err = deserializeJson(doc, "[\"hello\"/*COMMENT*/,\"world\"]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "hello");
+      REQUIRE(arr[1] == "world");
+    }
+
+    SECTION("After comma") {
+      JsonError err = deserializeJson(doc, "[\"hello\",/*COMMENT*/ \"world\"]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "hello");
+      REQUIRE(arr[1] == "world");
+    }
+
+    SECTION("/*/") {
+      JsonError err = deserializeJson(doc, "[/*/\n]");
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+
+    SECTION("Unfinished comment") {
+      JsonError err = deserializeJson(doc, "[/*COMMENT]");
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+
+    SECTION("Final slash missing") {
+      JsonError err = deserializeJson(doc, "[/*COMMENT*]");
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+  }
+
+  SECTION("Line comments") {
+    SECTION("Before opening bracket") {
+      JsonError err = deserializeJson(doc, "//COMMENT\n\t[\"hello\"]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("After opening bracket") {
+      JsonError err = deserializeJson(doc, "[//COMMENT\n\"hello\"]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("Before closing bracket") {
+      JsonError err = deserializeJson(doc, "[\"hello\"//COMMENT\r\n]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("After closing bracket") {
+      JsonError err = deserializeJson(doc, "[\"hello\"]//COMMENT\n");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("Before comma") {
+      JsonError err = deserializeJson(doc, "[\"hello\"//COMMENT\n,\"world\"]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "hello");
+      REQUIRE(arr[1] == "world");
+    }
+
+    SECTION("After comma") {
+      JsonError err = deserializeJson(doc, "[\"hello\",//COMMENT\n\"world\"]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "hello");
+      REQUIRE(arr[1] == "world");
+    }
+
+    SECTION("Invalid comment") {
+      JsonError err = deserializeJson(doc, "[/COMMENT\n]");
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+
+    SECTION("End document with comment") {
+      JsonError err = deserializeJson(doc, "[//COMMENT");
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+  }
+
+  SECTION("Misc") {
+    SECTION("Garbage") {
+      JsonError err = deserializeJson(doc, "%*$£¤");
+
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+
+    SECTION("The opening bracket is missing") {
+      JsonError err = deserializeJson(doc, "]");
+
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+
+    SECTION("The closing bracket is missing") {
+      JsonError err = deserializeJson(doc, "[");
+
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+
+    SECTION("Escape sequences") {
+      JsonError err =
+          deserializeJson(doc, "[\"1\\\"2\\\\3\\/4\\b5\\f6\\n7\\r8\\t9\"]");
+      JsonArray& arr = doc.as<JsonArray>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "1\"2\\3/4\b5\f6\n7\r8\t9");
+    }
+
+    SECTION("Nested objects") {
+      char jsonString[] =
+          " [ { \"a\" : 1 , \"b\" : 2 } , { \"c\" : 3 , \"d\" : 4 } ] ";
+
+      JsonError err = deserializeJson(doc, jsonString);
+      JsonArray& arr = doc.as<JsonArray>();
+
+      JsonObject& object1 = arr[0];
+      const JsonObject& object2 = arr[1];
+      JsonObject& object3 = arr[2];
+
+      REQUIRE(err == JsonError::Ok);
+
+      REQUIRE(true == object1.success());
+      REQUIRE(true == object2.success());
+      REQUIRE(false == object3.success());
+
+      REQUIRE(2 == object1.size());
+      REQUIRE(2 == object2.size());
+      REQUIRE(0 == object3.size());
+
+      REQUIRE(1 == object1["a"].as<int>());
+      REQUIRE(2 == object1["b"].as<int>());
+      REQUIRE(3 == object2["c"].as<int>());
+      REQUIRE(4 == object2["d"].as<int>());
+      REQUIRE(0 == object3["e"].as<int>());
+    }
+  }
+
+  SECTION("Should clear the JsonArray") {
+    deserializeJson(doc, "[1,2,3,4]");
+    deserializeJson(doc, "[]");
+    JsonArray& arr = doc.as<JsonArray>();
+
+    REQUIRE(arr.size() == 0);
+    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(0));
+  }
+}

test/JsonDeserializer/deserializeJsonArrayStatic.cpp

@@ -0,0 +1,105 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("deserialize JSON array with a StaticJsonDocument") {
+  SECTION("BufferOfTheRightSizeForEmptyArray") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(0)> doc;
+    char input[] = "[]";
+
+    JsonError err = deserializeJson(doc, input);
+
+    REQUIRE(err == JsonError::Ok);
+  }
+
+  SECTION("TooSmallBufferForArrayWithOneValue") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(1) - 1> doc;
+    char input[] = "[1]";
+
+    JsonError err = deserializeJson(doc, input);
+
+    REQUIRE(err != JsonError::Ok);
+  }
+
+  SECTION("BufferOfTheRightSizeForArrayWithOneValue") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(1)> doc;
+    char input[] = "[1]";
+
+    JsonError err = deserializeJson(doc, input);
+
+    REQUIRE(err == JsonError::Ok);
+  }
+
+  SECTION("TooSmallBufferForArrayWithNestedObject") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(1) + JSON_OBJECT_SIZE(0) - 1> doc;
+    char input[] = "[{}]";
+
+    JsonError err = deserializeJson(doc, input);
+
+    REQUIRE(err != JsonError::Ok);
+  }
+
+  SECTION("BufferOfTheRightSizeForArrayWithNestedObject") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(1) + JSON_OBJECT_SIZE(0)> doc;
+    char input[] = "[{}]";
+
+    JsonError err = deserializeJson(doc, input);
+
+    REQUIRE(err == JsonError::Ok);
+  }
+
+  SECTION("CharPtrNull") {
+    StaticJsonDocument<100> doc;
+
+    JsonError err = deserializeJson(doc, static_cast<char*>(0));
+
+    REQUIRE(err != JsonError::Ok);
+  }
+
+  SECTION("ConstCharPtrNull") {
+    StaticJsonDocument<100> doc;
+
+    JsonError err = deserializeJson(doc, static_cast<const char*>(0));
+
+    REQUIRE(err != JsonError::Ok);
+  }
+
+  SECTION("CopyStringNotSpaces") {
+    StaticJsonDocument<100> doc;
+
+    deserializeJson(doc, "  [ \"1234567\" ] ");
+
+    REQUIRE(JSON_ARRAY_SIZE(1) + sizeof("1234567") == doc.memoryUsage());
+    // note: we use a string of 8 bytes to be sure that the StaticJsonBuffer
+    // will not insert bytes to enforce alignement
+  }
+
+  SECTION("Should clear the JsonArray") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(4)> doc;
+    char input[] = "[1,2,3,4]";
+
+    deserializeJson(doc, input);
+    deserializeJson(doc, "[]");
+
+    JsonArray& arr = doc.as<JsonArray>();
+    REQUIRE(arr.size() == 0);
+    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(0));
+  }
+
+  SECTION("Array") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(2)> doc;
+    char input[] = "[1,2]";
+
+    JsonError err = deserializeJson(doc, input);
+    JsonArray& arr = doc.as<JsonArray>();
+
+    REQUIRE(err == JsonError::Ok);
+    REQUIRE(doc.is<JsonArray>());
+    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(2));
+    REQUIRE(arr[0] == 1);
+    REQUIRE(arr[1] == 2);
+  }
+}

test/JsonDeserializer/deserializeJsonObject.cpp

@@ -0,0 +1,262 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("deserialize JSON object") {
+  DynamicJsonDocument doc;
+
+  SECTION("An empty object") {
+    JsonError err = deserializeJson(doc, "{}");
+    JsonObject& obj = doc.as<JsonObject>();
+
+    REQUIRE(err == JsonError::Ok);
+    REQUIRE(doc.is<JsonObject>());
+    REQUIRE(obj.size() == 0);
+  }
+
+  SECTION("Quotes") {
+    SECTION("Double quotes") {
+      JsonError err = deserializeJson(doc, "{\"key\":\"value\"}");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["key"] == "value");
+    }
+
+    SECTION("Single quotes") {
+      JsonError err = deserializeJson(doc, "{'key':'value'}");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["key"] == "value");
+    }
+
+    SECTION("No quotes") {
+      JsonError err = deserializeJson(doc, "{key:value}");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["key"] == "value");
+    }
+
+    SECTION("No quotes, allow underscore in key") {
+      JsonError err = deserializeJson(doc, "{_k_e_y_:42}");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["_k_e_y_"] == 42);
+    }
+  }
+
+  SECTION("Spaces") {
+    SECTION("Before the key") {
+      JsonError err = deserializeJson(doc, "{ \"key\":\"value\"}");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["key"] == "value");
+    }
+
+    SECTION("After the key") {
+      JsonError err = deserializeJson(doc, "{\"key\" :\"value\"}");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["key"] == "value");
+    }
+
+    SECTION("Before the value") {
+      JsonError err = deserializeJson(doc, "{\"key\": \"value\"}");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["key"] == "value");
+    }
+
+    SECTION("After the value") {
+      JsonError err = deserializeJson(doc, "{\"key\":\"value\" }");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["key"] == "value");
+    }
+
+    SECTION("Before the colon") {
+      JsonError err =
+          deserializeJson(doc, "{\"key1\":\"value1\" ,\"key2\":\"value2\"}");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["key1"] == "value1");
+      REQUIRE(obj["key2"] == "value2");
+    }
+
+    SECTION("After the colon") {
+      JsonError err =
+          deserializeJson(doc, "{\"key1\":\"value1\" ,\"key2\":\"value2\"}");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["key1"] == "value1");
+      REQUIRE(obj["key2"] == "value2");
+    }
+  }
+
+  SECTION("Values types") {
+    SECTION("String") {
+      JsonError err =
+          deserializeJson(doc, "{\"key1\":\"value1\",\"key2\":\"value2\"}");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["key1"] == "value1");
+      REQUIRE(obj["key2"] == "value2");
+    }
+
+    SECTION("Integer") {
+      JsonError err = deserializeJson(doc, "{\"key1\":42,\"key2\":-42}");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["key1"] == 42);
+      REQUIRE(obj["key2"] == -42);
+    }
+
+    SECTION("Double") {
+      JsonError err = deserializeJson(doc, "{\"key1\":12.345,\"key2\":-7E89}");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["key1"] == 12.345);
+      REQUIRE(obj["key2"] == -7E89);
+    }
+
+    SECTION("Booleans") {
+      JsonError err = deserializeJson(doc, "{\"key1\":true,\"key2\":false}");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["key1"] == true);
+      REQUIRE(obj["key2"] == false);
+    }
+
+    SECTION("Null") {
+      JsonError err = deserializeJson(doc, "{\"key1\":null,\"key2\":null}");
+      JsonObject& obj = doc.as<JsonObject>();
+
+      REQUIRE(err == JsonError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["key1"].as<char*>() == 0);
+      REQUIRE(obj["key2"].as<char*>() == 0);
+    }
+
+    SECTION("Array") {
+      char jsonString[] = " { \"ab\" : [ 1 , 2 ] , \"cd\" : [ 3 , 4 ] } ";
+
+      JsonError err = deserializeJson(doc, jsonString);
+      JsonObject& obj = doc.as<JsonObject>();
+
+      JsonArray& array1 = obj["ab"];
+      const JsonArray& array2 = obj["cd"];
+      JsonArray& array3 = obj["ef"];
+
+      REQUIRE(err == JsonError::Ok);
+
+      REQUIRE(true == array1.success());
+      REQUIRE(true == array2.success());
+      REQUIRE(false == array3.success());
+
+      REQUIRE(2 == array1.size());
+      REQUIRE(2 == array2.size());
+      REQUIRE(0 == array3.size());
+
+      REQUIRE(1 == array1[0].as<int>());
+      REQUIRE(2 == array1[1].as<int>());
+
+      REQUIRE(3 == array2[0].as<int>());
+      REQUIRE(4 == array2[1].as<int>());
+
+      REQUIRE(0 == array3[0].as<int>());
+    }
+  }
+
+  SECTION("Misc") {
+    SECTION("The opening brace is missing") {
+      JsonError err = deserializeJson(doc, "}");
+
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+
+    SECTION("The closing brace is missing") {
+      JsonError err = deserializeJson(doc, "{\"hello\":\"world\"");
+
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+
+    SECTION("A quoted key without value") {
+      JsonError err = deserializeJson(doc, "{\"key\"}");
+
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+
+    SECTION("A non-quoted key without value") {
+      JsonError err = deserializeJson(doc, "{key}");
+
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+
+    SECTION("A dangling comma") {
+      JsonError err = deserializeJson(doc, "{\"key1\":\"value1\",}");
+
+      REQUIRE(err == JsonError::InvalidInput);
+    }
+
+    SECTION("null as a key") {
+      JsonError err = deserializeJson(doc, "{null:\"value\"}");
+
+      REQUIRE(err == JsonError::Ok);
+    }
+  }
+
+  SECTION("Should clear the JsonObject") {
+    deserializeJson(doc, "{\"hello\":\"world\"}");
+    deserializeJson(doc, "{}");
+    JsonObject& obj = doc.as<JsonObject>();
+
+    REQUIRE(doc.is<JsonObject>());
+    REQUIRE(obj.size() == 0);
+    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0));
+  }
+}

test/JsonDeserializer/deserializeJsonObjectStatic.cpp

@@ -0,0 +1,80 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("deserialize JSON object with StaticJsonDocument") {
+  SECTION("BufferOfTheRightSizeForEmptyObject") {
+    StaticJsonDocument<JSON_OBJECT_SIZE(0)> doc;
+    char input[] = "{}";
+
+    JsonError err = deserializeJson(doc, input);
+
+    REQUIRE(err == JsonError::Ok);
+  }
+
+  SECTION("TooSmallBufferForObjectWithOneValue") {
+    StaticJsonDocument<JSON_OBJECT_SIZE(1) - 1> doc;
+    char input[] = "{\"a\":1}";
+
+    JsonError err = deserializeJson(doc, input);
+
+    REQUIRE(err != JsonError::Ok);
+  }
+
+  SECTION("BufferOfTheRightSizeForObjectWithOneValue") {
+    StaticJsonDocument<JSON_OBJECT_SIZE(1)> doc;
+    char input[] = "{\"a\":1}";
+
+    JsonError err = deserializeJson(doc, input);
+
+    REQUIRE(err == JsonError::Ok);
+  }
+
+  SECTION("TooSmallBufferForObjectWithNestedObject") {
+    StaticJsonDocument<JSON_OBJECT_SIZE(1) + JSON_ARRAY_SIZE(0) - 1> doc;
+    char input[] = "{\"a\":[]}";
+
+    JsonError err = deserializeJson(doc, input);
+
+    REQUIRE(err != JsonError::Ok);
+  }
+
+  SECTION("BufferOfTheRightSizeForObjectWithNestedObject") {
+    StaticJsonDocument<JSON_OBJECT_SIZE(1) + JSON_ARRAY_SIZE(0)> doc;
+    char input[] = "{\"a\":[]}";
+
+    JsonError err = deserializeJson(doc, input);
+
+    REQUIRE(err == JsonError::Ok);
+  }
+
+  SECTION("CharPtrNull") {
+    StaticJsonDocument<100> doc;
+
+    JsonError err = deserializeJson(doc, static_cast<char*>(0));
+
+    REQUIRE(err != JsonError::Ok);
+  }
+
+  SECTION("ConstCharPtrNull") {
+    StaticJsonDocument<100> doc;
+
+    JsonError err = deserializeJson(doc, static_cast<const char*>(0));
+
+    REQUIRE(err != JsonError::Ok);
+  }
+
+  SECTION("Should clear the JsonObject") {
+    StaticJsonDocument<JSON_OBJECT_SIZE(1)> doc;
+    char input[] = "{\"hello\":\"world\"}";
+
+    deserializeJson(doc, input);
+    deserializeJson(doc, "{}");
+
+    REQUIRE(doc.as<JsonObject>().size() == 0);
+    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0));
+  }
+}

test/JsonDeserializer/deserializeJsonValue.cpp

@@ -0,0 +1,103 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using namespace Catch::Matchers;
+
+TEST_CASE("deserializeJson(DynamicJsonDocument&)") {
+  DynamicJsonDocument doc;
+
+  SECTION("EmptyObject") {
+    JsonError err = deserializeJson(doc, "{}");
+
+    REQUIRE(err == JsonError::Ok);
+    REQUIRE(doc.is<JsonObject>());
+  }
+
+  SECTION("EmptyArray") {
+    JsonError err = deserializeJson(doc, "[]");
+
+    REQUIRE(err == JsonError::Ok);
+    REQUIRE(doc.is<JsonArray>());
+  }
+
+  SECTION("Integer") {
+    JsonError err = deserializeJson(doc, "-42");
+
+    REQUIRE(err == JsonError::Ok);
+    REQUIRE(doc.is<int>());
+    REQUIRE_FALSE(doc.is<bool>());
+    REQUIRE(doc.as<int>() == -42);
+  }
+
+  SECTION("Double") {
+    JsonError err = deserializeJson(doc, "-1.23e+4");
+
+    REQUIRE(err == JsonError::Ok);
+    REQUIRE_FALSE(doc.is<int>());
+    REQUIRE(doc.is<double>());
+    REQUIRE(doc.as<double>() == Approx(-1.23e+4));
+  }
+
+  SECTION("Double quoted string") {
+    JsonError err = deserializeJson(doc, "\"hello world\"");
+
+    REQUIRE(err == JsonError::Ok);
+    REQUIRE(doc.is<char*>());
+    REQUIRE_THAT(doc.as<char*>(), Equals("hello world"));
+  }
+
+  SECTION("Single quoted string") {
+    JsonError err = deserializeJson(doc, "\'hello world\'");
+
+    REQUIRE(err == JsonError::Ok);
+    REQUIRE(doc.is<char*>());
+    REQUIRE_THAT(doc.as<char*>(), Equals("hello world"));
+  }
+
+  SECTION("True") {
+    JsonError err = deserializeJson(doc, "true");
+
+    REQUIRE(err == JsonError::Ok);
+    REQUIRE(doc.is<bool>());
+    REQUIRE(doc.as<bool>() == true);
+  }
+
+  SECTION("False") {
+    JsonError err = deserializeJson(doc, "false");
+
+    REQUIRE(err == JsonError::Ok);
+    REQUIRE(doc.is<bool>());
+    REQUIRE(doc.as<bool>() == false);
+  }
+
+  SECTION("OpenBrace") {
+    JsonError err = deserializeJson(doc, "{");
+
+    REQUIRE(err != JsonError::Ok);
+  }
+
+  SECTION("Incomplete string") {
+    JsonError err = deserializeJson(doc, "\"hello");
+
+    REQUIRE(err == JsonError::Ok);
+    REQUIRE(doc.is<char*>());
+    REQUIRE_THAT(doc.as<char*>(), Equals("hello"));
+  }
+
+  SECTION("Unterminated escape sequence") {
+    JsonError err = deserializeJson(doc, "\"\\\0\"");
+    REQUIRE(err == JsonError::InvalidInput);
+  }
+
+  SECTION("Should clear the JsonVariant") {
+    deserializeJson(doc, "[1,2,3]");
+    deserializeJson(doc, "{}");
+
+    REQUIRE(doc.is<JsonObject>());
+    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0));
+  }
+}

test/JsonDeserializer/nestingLimit.cpp

@@ -0,0 +1,32 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+#define SHOULD_WORK(expression) REQUIRE(JsonError::Ok == expression);
+#define SHOULD_FAIL(expression) REQUIRE(JsonError::TooDeep == expression);
+
+TEST_CASE("JsonDeserializer nestingLimit") {
+  DynamicJsonDocument doc;
+
+  SECTION("limit = 0") {
+    SHOULD_WORK(deserializeJson(doc, "\"toto\"", 0));
+    SHOULD_WORK(deserializeJson(doc, "123", 0));
+    SHOULD_WORK(deserializeJson(doc, "true", 0));
+    SHOULD_FAIL(deserializeJson(doc, "[]", 0));
+    SHOULD_FAIL(deserializeJson(doc, "{}", 0));
+    SHOULD_FAIL(deserializeJson(doc, "[\"toto\"]", 0));
+    SHOULD_FAIL(deserializeJson(doc, "{\"toto\":1}", 0));
+  }
+
+  SECTION("limit = 1") {
+    SHOULD_WORK(deserializeJson(doc, "[\"toto\"]", 1));
+    SHOULD_WORK(deserializeJson(doc, "{\"toto\":1}", 1));
+    SHOULD_FAIL(deserializeJson(doc, "{\"toto\":{}}", 1));
+    SHOULD_FAIL(deserializeJson(doc, "{\"toto\":[]}", 1));
+    SHOULD_FAIL(deserializeJson(doc, "[[\"toto\"]]", 1));
+    SHOULD_FAIL(deserializeJson(doc, "[{\"toto\":1}]", 1));
+  }
+}