Replace catch with doctest

This reduces the build times by about 38%

Author: bblanchon

.vscode/settings.json

@@ -4,9 +4,6 @@
   "git.inputValidationSubjectLength": 72,
   "files.insertFinalNewline": true,
   "files.trimFinalNewlines": true,
-  "search.exclude": {
-    "/extras/tests/catch/*": true
-  },
   "C_Cpp.default.includePath": [
     "/src"
   ],

extras/tests/CMakeLists.txt

@@ -7,11 +7,11 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 link_libraries(ArduinoJson)
 
-# Failing builds should only link with ArduinoJson, not catch
+# Failing builds should only link with ArduinoJson, not doctest
 add_subdirectory(FailingBuilds)
 
-add_subdirectory(catch)
-link_libraries(catch)
+add_subdirectory(doctest)
+link_libraries(doctest)
 
 include_directories(Helpers)
 add_subdirectory(Cpp17)

extras/tests/Cpp17/CMakeLists.txt

@@ -25,5 +25,5 @@ add_test(Cpp17 Cpp17Tests)
 
 set_tests_properties(Cpp17
 	PROPERTIES
-		LABELS "Catch"
+		LABELS "doctest"
 )

extras/tests/Cpp17/string_view.cpp

@@ -9,7 +9,7 @@
 #define ARDUINOJSON_ENABLE_STD_STRING 0
 
 #include <ArduinoJson.h>
-#include <catch.hpp>
+#include <doctest.h>
 
 #include "Allocators.hpp"
 #include "Literals.hpp"
@@ -25,47 +25,47 @@ TEST_CASE("string_view") {
   JsonDocument doc(&spy);
   JsonVariant variant = doc.to<JsonVariant>();
 
-  SECTION("deserializeJson()") {
+  SUBCASE("deserializeJson()") {
     auto err = deserializeJson(doc, std::string_view("123", 2));
     REQUIRE(err == DeserializationError::Ok);
     REQUIRE(doc.as<int>() == 12);
   }
 
-  SECTION("JsonDocument::set()") {
+  SUBCASE("JsonDocument::set()") {
     doc.set(std::string_view("123", 2));
     REQUIRE(doc.as<std::string_view>() == "12");
   }
 
-  SECTION("JsonDocument::operator[]() const") {
+  SUBCASE("JsonDocument::operator[]() const") {
     doc["ab"] = "Yes";
     doc["abc"] = "No";
     REQUIRE(doc[std::string_view("abc", 2)] == "Yes");
   }
 
-  SECTION("JsonDocument::operator[]()") {
+  SUBCASE("JsonDocument::operator[]()") {
     doc[std::string_view("abc", 2)] = "Yes";
     REQUIRE(doc["ab"] == "Yes");
   }
 
-  SECTION("JsonVariant::operator==()") {
+  SUBCASE("JsonVariant::operator==()") {
     variant.set("A");
     REQUIRE(variant == std::string_view("AX", 1));
     REQUIRE_FALSE(variant == std::string_view("BX", 1));
   }
 
-  SECTION("JsonVariant::operator>()") {
+  SUBCASE("JsonVariant::operator>()") {
     variant.set("B");
     REQUIRE(variant > std::string_view("AX", 1));
     REQUIRE_FALSE(variant > std::string_view("CX", 1));
   }
 
-  SECTION("JsonVariant::operator<()") {
+  SUBCASE("JsonVariant::operator<()") {
     variant.set("B");
     REQUIRE(variant < std::string_view("CX", 1));
     REQUIRE_FALSE(variant < std::string_view("AX", 1));
   }
 
-  SECTION("String deduplication") {
+  SUBCASE("String deduplication") {
     doc.add(std::string_view("example one", 7));
     doc.add(std::string_view("example two", 7));
     doc.add(std::string_view("example\0tree", 12));
@@ -78,21 +78,21 @@ TEST_CASE("string_view") {
                          });
   }
 
-  SECTION("as<std::string_view>()") {
+  SUBCASE("as<std::string_view>()") {
     doc["s"] = "Hello World";
     doc["i"] = 42;
     REQUIRE(doc["s"].as<std::string_view>() == std::string_view("Hello World"));
     REQUIRE(doc["i"].as<std::string_view>() == std::string_view());
   }
 
-  SECTION("is<std::string_view>()") {
+  SUBCASE("is<std::string_view>()") {
     doc["s"] = "Hello World";
     doc["i"] = 42;
     REQUIRE(doc["s"].is<std::string_view>() == true);
     REQUIRE(doc["i"].is<std::string_view>() == false);
   }
 
-  SECTION("String containing NUL") {
+  SUBCASE("String containing NUL") {
     doc.set("hello\0world"_s);
     REQUIRE(doc.as<std::string_view>().size() == 11);
     REQUIRE(doc.as<std::string_view>() == std::string_view("hello\0world", 11));

extras/tests/Cpp20/CMakeLists.txt

@@ -25,5 +25,5 @@ add_test(Cpp20 Cpp20Tests)
 
 set_tests_properties(Cpp20
 	PROPERTIES
-		LABELS "Catch"
+		LABELS "doctest"
 )

extras/tests/Cpp20/smoke_test.cpp

@@ -1,6 +1,6 @@
 #include <ArduinoJson.h>
 
-#include <catch.hpp>
+#include <doctest.h>
 #include <string>
 
 TEST_CASE("C++20 smoke test") {

extras/tests/Deprecated/BasicJsonDocument.cpp

@@ -3,7 +3,7 @@
 // MIT License
 
 #include <ArduinoJson.h>
-#include <catch.hpp>
+#include <doctest.h>
 
 #include <string>
 
@@ -35,34 +35,34 @@ struct CustomAllocator {
 TEST_CASE("BasicJsonDocument") {
   allocatorLog.clear();
 
-  SECTION("is a JsonDocument") {
+  SUBCASE("is a JsonDocument") {
     REQUIRE(
-        is_base_of<JsonDocument, BasicJsonDocument<CustomAllocator>>::value ==
-        true);
+        (is_base_of<JsonDocument, BasicJsonDocument<CustomAllocator>>::value ==
+         true));
   }
 
-  SECTION("deserialize / serialize") {
+  SUBCASE("deserialize / serialize") {
     BasicJsonDocument<CustomAllocator> doc(256);
     deserializeJson(doc, "{\"hello\":\"world\"}");
     REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\"}");
     doc.clear();
     REQUIRE(allocatorLog == "AARARDDD");
   }
 
-  SECTION("copy") {
+  SUBCASE("copy") {
     BasicJsonDocument<CustomAllocator> doc(256);
     doc["hello"] = "world";
     auto copy = doc;
     REQUIRE(copy.as<std::string>() == "{\"hello\":\"world\"}");
     REQUIRE(allocatorLog == "AAAAAA");
   }
 
-  SECTION("capacity") {
+  SUBCASE("capacity") {
     BasicJsonDocument<CustomAllocator> doc(256);
     REQUIRE(doc.capacity() == 256);
   }
 
-  SECTION("garbageCollect()") {
+  SUBCASE("garbageCollect()") {
     BasicJsonDocument<CustomAllocator> doc(256);
     doc.garbageCollect();
   }

extras/tests/Deprecated/CMakeLists.txt

@@ -31,5 +31,5 @@ add_test(Deprecated DeprecatedTests)
 
 set_tests_properties(Deprecated
 	PROPERTIES
-	LABELS "Catch"
+	LABELS "doctest"
 )

extras/tests/Deprecated/DynamicJsonDocument.cpp

@@ -3,34 +3,34 @@
 // MIT License
 
 #include <ArduinoJson.h>
-#include <catch.hpp>
+#include <doctest.h>
 
 using ArduinoJson::detail::is_base_of;
 
 TEST_CASE("DynamicJsonDocument") {
-  SECTION("is a JsonDocument") {
-    REQUIRE(is_base_of<JsonDocument, DynamicJsonDocument>::value == true);
+  SUBCASE("is a JsonDocument") {
+    REQUIRE((is_base_of<JsonDocument, DynamicJsonDocument>::value == true));
   }
 
-  SECTION("deserialize / serialize") {
+  SUBCASE("deserialize / serialize") {
     DynamicJsonDocument doc(256);
     deserializeJson(doc, "{\"hello\":\"world\"}");
     REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\"}");
   }
 
-  SECTION("copy") {
+  SUBCASE("copy") {
     DynamicJsonDocument doc(256);
     doc["hello"] = "world";
     auto copy = doc;
     REQUIRE(copy.as<std::string>() == "{\"hello\":\"world\"}");
   }
 
-  SECTION("capacity") {
+  SUBCASE("capacity") {
     DynamicJsonDocument doc(256);
     REQUIRE(doc.capacity() == 256);
   }
 
-  SECTION("garbageCollect()") {
+  SUBCASE("garbageCollect()") {
     DynamicJsonDocument doc(256);
     doc.garbageCollect();
   }

extras/tests/Deprecated/StaticJsonDocument.cpp

@@ -3,29 +3,29 @@
 // MIT License
 
 #include <ArduinoJson.h>
-#include <catch.hpp>
+#include <doctest.h>
 
 using ArduinoJson::detail::is_base_of;
 
 TEST_CASE("StaticJsonDocument") {
-  SECTION("is a JsonDocument") {
-    REQUIRE(is_base_of<JsonDocument, StaticJsonDocument<256>>::value == true);
+  SUBCASE("is a JsonDocument") {
+    REQUIRE((is_base_of<JsonDocument, StaticJsonDocument<256>>::value == true));
   }
 
-  SECTION("deserialize / serialize") {
+  SUBCASE("deserialize / serialize") {
     StaticJsonDocument<256> doc;
     deserializeJson(doc, "{\"hello\":\"world\"}");
     REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\"}");
   }
 
-  SECTION("copy") {
+  SUBCASE("copy") {
     StaticJsonDocument<256> doc;
     doc["hello"] = "world";
     auto copy = doc;
     REQUIRE(copy.as<std::string>() == "{\"hello\":\"world\"}");
   }
 
-  SECTION("capacity") {
+  SUBCASE("capacity") {
     StaticJsonDocument<256> doc;
     REQUIRE(doc.capacity() == 256);
   }