Added conversion from JsonArray/JsonObject to bool

bblanchon · bblanchon · commit 7d1d0c4e6747 · 2019-09-24T09:38:00.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ HEAD
 ----
 
 * Added support for custom writer classes (issue #1088)
+* Added conversion from `JsonArray` and `JsonObject` to `bool`, to be consistent with `JsonVariant`
 
 v6.12.0 (2019-09-05)
 -------
diff --git a/extras/tests/JsonArray/isNull.cpp b/extras/tests/JsonArray/isNull.cpp
@@ -6,29 +6,53 @@
 #include <catch.hpp>
 
 TEST_CASE("JsonArray::isNull()") {
-  DynamicJsonDocument doc(4096);
-
   SECTION("returns true") {
     JsonArray arr;
     REQUIRE(arr.isNull() == true);
   }
 
   SECTION("returns false") {
+    DynamicJsonDocument doc(4096);
     JsonArray arr = doc.to<JsonArray>();
     REQUIRE(arr.isNull() == false);
   }
 }
 
 TEST_CASE("JsonArrayConst::isNull()") {
-  DynamicJsonDocument doc(4096);
-
   SECTION("returns true") {
     JsonArrayConst arr;
     REQUIRE(arr.isNull() == true);
   }
 
   SECTION("returns false") {
+    DynamicJsonDocument doc(4096);
     JsonArrayConst arr = doc.to<JsonArray>();
     REQUIRE(arr.isNull() == false);
   }
 }
+
+TEST_CASE("JsonArray::operator bool()") {
+  SECTION("returns false") {
+    JsonArray arr;
+    REQUIRE(static_cast<bool>(arr) == false);
+  }
+
+  SECTION("returns true") {
+    DynamicJsonDocument doc(4096);
+    JsonArray arr = doc.to<JsonArray>();
+    REQUIRE(static_cast<bool>(arr) == true);
+  }
+}
+
+TEST_CASE("JsonArrayConst::operator bool()") {
+  SECTION("returns false") {
+    JsonArrayConst arr;
+    REQUIRE(static_cast<bool>(arr) == false);
+  }
+
+  SECTION("returns true") {
+    DynamicJsonDocument doc(4096);
+    JsonArrayConst arr = doc.to<JsonArray>();
+    REQUIRE(static_cast<bool>(arr) == true);
+  }
+}
diff --git a/extras/tests/JsonObject/isNull.cpp b/extras/tests/JsonObject/isNull.cpp
@@ -6,29 +6,53 @@
 #include <catch.hpp>
 
 TEST_CASE("JsonObject::isNull()") {
-  DynamicJsonDocument doc(4096);
-
   SECTION("returns true") {
     JsonObject obj;
     REQUIRE(obj.isNull() == true);
   }
 
   SECTION("returns false") {
+    DynamicJsonDocument doc(4096);
     JsonObject obj = doc.to<JsonObject>();
     REQUIRE(obj.isNull() == false);
   }
 }
 
 TEST_CASE("JsonObjectConst::isNull()") {
-  DynamicJsonDocument doc(4096);
-
   SECTION("returns true") {
     JsonObjectConst obj;
     REQUIRE(obj.isNull() == true);
   }
 
   SECTION("returns false") {
+    DynamicJsonDocument doc(4096);
     JsonObjectConst obj = doc.to<JsonObject>();
     REQUIRE(obj.isNull() == false);
   }
 }
+
+TEST_CASE("JsonObject::operator bool()") {
+  SECTION("returns false") {
+    JsonObject obj;
+    REQUIRE(static_cast<bool>(obj) == false);
+  }
+
+  SECTION("returns true") {
+    DynamicJsonDocument doc(4096);
+    JsonObject obj = doc.to<JsonObject>();
+    REQUIRE(static_cast<bool>(obj) == true);
+  }
+}
+
+TEST_CASE("JsonObjectConst::operator bool()") {
+  SECTION("returns false") {
+    JsonObjectConst obj;
+    REQUIRE(static_cast<bool>(obj) == false);
+  }
+
+  SECTION("returns true") {
+    DynamicJsonDocument doc(4096);
+    JsonObjectConst obj = doc.to<JsonObject>();
+    REQUIRE(static_cast<bool>(obj) == true);
+  }
+}
diff --git a/src/ArduinoJson/Array/ArrayRef.hpp b/src/ArduinoJson/Array/ArrayRef.hpp
@@ -36,6 +36,10 @@ class ArrayRefBase {
     return _data == 0;
   }
 
+  FORCE_INLINE operator bool() const {
+    return _data != 0;
+  }
+
   FORCE_INLINE size_t memoryUsage() const {
     return _data ? _data->memoryUsage() : 0;
   }
diff --git a/src/ArduinoJson/Object/ObjectRef.hpp b/src/ArduinoJson/Object/ObjectRef.hpp
@@ -31,6 +31,10 @@ class ObjectRefBase {
     return _data == 0;
   }
 
+  FORCE_INLINE operator bool() const {
+    return _data != 0;
+  }
+
   FORCE_INLINE size_t memoryUsage() const {
     return _data ? _data->memoryUsage() : 0;
   }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,10 @@ class ArrayRefBase {`
`36`	`36`	`return _data == 0;`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ FORCE_INLINE operator bool() const {`
	`40`	`+ return _data != 0;`
	`41`	`+ }`
	`42`	`+`
`39`	`43`	`FORCE_INLINE size_t memoryUsage() const {`
`40`	`44`	`return _data ? _data->memoryUsage() : 0;`
`41`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,10 @@ class ObjectRefBase {`
`31`	`31`	`return _data == 0;`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ FORCE_INLINE operator bool() const {`
	`35`	`+ return _data != 0;`
	`36`	`+ }`
	`37`	`+`
`34`	`38`	`FORCE_INLINE size_t memoryUsage() const {`
`35`	`39`	`return _data ? _data->memoryUsage() : 0;`
`36`	`40`	`}`