Added JsonArrayConst, JsonObjectConst, and JsonVariantConst

test/JsonArray/CMakeLists.txt

@@ -7,6 +7,7 @@ add_executable(JsonArrayTests
 	copyFrom.cpp
 	copyTo.cpp
 	createNested.cpp
+	equals.cpp
 	isNull.cpp
 	iterator.cpp
 	remove.cpp

test/JsonArray/equals.cpp

@@ -0,0 +1,32 @@
+// ArduinoJson - arduinojson.org
+// Copyright Benoit Blanchon 2014-2018
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray::operator==()") {
+  DynamicJsonDocument doc1;
+  JsonArray array1 = doc1.to<JsonArray>();
+  JsonArrayConst array1c = array1;
+
+  DynamicJsonDocument doc2;
+  JsonArray array2 = doc2.to<JsonArray>();
+  JsonArrayConst array2c = array2;
+
+  SECTION("should return false when arrays differ") {
+    array1.add("coucou");
+    array2.add(1);
+
+    REQUIRE_FALSE(array1 == array2);
+    REQUIRE_FALSE(array1c == array2c);
+  }
+
+  SECTION("should return false when arrays differ") {
+    array1.add("coucou");
+    array2.add("coucou");
+
+    REQUIRE(array1 == array2);
+    REQUIRE(array1c == array2c);
+  }
+}

test/JsonArray/isNull.cpp

@@ -23,3 +23,22 @@ TEST_CASE("JsonArray::isNull()") {
       REQUIRE(array.isNull() == true);
     }*/
 }
+
+TEST_CASE("JsonArrayConst::isNull()") {
+  SECTION("returns true for undefined JsonArray") {
+    JsonArrayConst array;
+    REQUIRE(array.isNull() == true);
+  }
+
+  SECTION("returns false when allocation succeeds") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(0)> doc;
+    JsonArrayConst array = doc.to<JsonArray>();
+    REQUIRE(array.isNull() == false);
+  }
+
+  /*  SECTION("returns true when allocation fails") {
+      StaticJsonDocument<1> doc;
+      JsonArray array = doc.to<JsonArray>();
+      REQUIRE(array.isNull() == true);
+    }*/
+}

test/JsonArray/iterator.cpp

@@ -5,15 +5,16 @@
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
-template <typename TIterator>
+template <typename TArray>
 static void run_iterator_test() {
   StaticJsonDocument<JSON_ARRAY_SIZE(2)> doc;
-  JsonArray array = doc.to<JsonArray>();
-  array.add(12);
-  array.add(34);
+  JsonArray tmp = doc.to<JsonArray>();
+  tmp.add(12);
+  tmp.add(34);
 
-  TIterator it = array.begin();
-  TIterator end = array.end();
+  TArray array = tmp;
+  typename TArray::iterator it = array.begin();
+  typename TArray::iterator end = array.end();
 
   REQUIRE(end != it);
   REQUIRE(12 == it->template as<int>());
@@ -27,7 +28,9 @@ static void run_iterator_test() {
 }
 
 TEST_CASE("JsonArray::begin()/end()") {
-  SECTION("Mutable") {
-    run_iterator_test<JsonArray::iterator>();
-  }
+  run_iterator_test<JsonArray>();
+}
+
+TEST_CASE("JsonArrayConst::begin()/end()") {
+  run_iterator_test<JsonArrayConst>();
 }

test/JsonArray/subscript.cpp

@@ -58,9 +58,6 @@ TEST_CASE("JsonArray::operator[]") {
     array[0] = arr2;
 
     REQUIRE(arr2 == array[0].as<JsonArray>());
-    REQUIRE(arr2 == array[0].as<JsonArray>());  // <- short hand
-    // REQUIRE(arr2 == array[0].as<const JsonArray>());
-    // REQUIRE(arr2 == array[0].as<const JsonArray>());  // <- short hand
     REQUIRE(true == array[0].is<JsonArray>());
     REQUIRE(false == array[0].is<int>());
   }
@@ -72,7 +69,6 @@ TEST_CASE("JsonArray::operator[]") {
     array[0] = obj;
 
     REQUIRE(obj == array[0].as<JsonObject>());
-    REQUIRE(obj == array[0].as<const JsonObject>());  // <- short hand
     REQUIRE(true == array[0].is<JsonObject>());
     REQUIRE(false == array[0].is<int>());
   }
@@ -148,3 +144,18 @@ TEST_CASE("JsonArray::operator[]") {
   }
 #endif
 }
+
+TEST_CASE("JsonArrayConst::operator[]") {
+  DynamicJsonDocument doc;
+  JsonArray array = doc.to<JsonArray>();
+  array.add(0);
+
+  SECTION("int") {
+    array[0] = 123;
+    JsonArrayConst carr = array;
+
+    REQUIRE(123 == carr[0].as<int>());
+    REQUIRE(true == carr[0].is<int>());
+    REQUIRE(false == carr[0].is<bool>());
+  }
+}