From e1e957b346eabb81211f6285b6f9d1f4c2202818 Mon Sep 17 00:00:00 2001
From: Mario Emmenlauer <memmenlauer@biodataanalysis.de>
Date: Fri, 11 Jun 2021 09:54:39 +0200
Subject: [PATCH] Switched to Catch2 v3

---
 tests/CMakeLists.txt                                 | 2 +-
 tests/v1/containers/static_vector_tests.cpp          | 2 +-
 tests/v1/domain/domain_tests.cpp                     | 2 +-
 tests/v1/domain/idna_table_tests.cpp                 | 2 +-
 tests/v1/domain/punycode_tests.cpp                   | 2 +-
 tests/v1/filesystem/filesystem_path_tests.cpp        | 2 +-
 tests/v1/json/json_query_tests.cpp                   | 2 +-
 tests/v1/network/ipv4_address_tests.cpp              | 2 +-
 tests/v1/network/ipv6_address_tests.cpp              | 2 +-
 tests/v1/percent_encoding/percent_decoding_tests.cpp | 2 +-
 tests/v1/percent_encoding/percent_encoding_tests.cpp | 2 +-
 tests/v1/unicode/byte_conversion_tests.cpp           | 2 +-
 tests/v1/unicode/unicode_code_point_tests.cpp        | 2 +-
 tests/v1/unicode/unicode_range_tests.cpp             | 2 +-
 tests/v1/unicode/unicode_tests.cpp                   | 2 +-
 tests/v1/url/parse_host_tests.cpp                    | 2 +-
 tests/v1/url/url_literal_tests.cpp                   | 2 +-
 tests/v1/url/url_parse_tests.cpp                     | 2 +-
 tests/v1/url/url_search_parameters_tests.cpp         | 2 +-
 tests/v1/url/url_serialize_tests.cpp                 | 2 +-
 tests/v1/url/url_setter_tests.cpp                    | 2 +-
 tests/v1/url/url_tests.cpp                           | 2 +-
 tests/v1/url/url_tests_with_exceptions.cpp           | 2 +-
 tests/v1/url/url_vector_tests.cpp                    | 2 +-
 tests/v2/containers/static_vector_tests.cpp          | 2 +-
 tests/v2/core/parse_host_tests.cpp                   | 2 +-
 tests/v2/core/parse_path_tests.cpp                   | 2 +-
 tests/v2/core/parse_query_tests.cpp                  | 2 +-
 tests/v2/core/url_parse_tests.cpp                    | 2 +-
 tests/v2/core/url_serialize_tests.cpp                | 2 +-
 tests/v2/domain/domain_tests.cpp                     | 2 +-
 tests/v2/domain/idna_table_tests.cpp                 | 2 +-
 tests/v2/domain/punycode_tests.cpp                   | 2 +-
 tests/v2/filesystem/filesystem_path_tests.cpp        | 2 +-
 tests/v2/json/json_query_tests.cpp                   | 2 +-
 tests/v2/network/ipv4_address_tests.cpp              | 2 +-
 tests/v2/network/ipv6_address_tests.cpp              | 2 +-
 tests/v2/percent_encoding/percent_decoding_tests.cpp | 2 +-
 tests/v2/percent_encoding/percent_encoding_tests.cpp | 2 +-
 tests/v2/unicode/byte_conversion_tests.cpp           | 2 +-
 tests/v2/unicode/unicode_code_point_tests.cpp        | 2 +-
 tests/v2/unicode/unicode_range_tests.cpp             | 2 +-
 tests/v2/unicode/unicode_tests.cpp                   | 2 +-
 tests/v2/url/url_literal_tests.cpp                   | 2 +-
 tests/v2/url/url_search_parameters_tests.cpp         | 2 +-
 tests/v2/url/url_setter_tests.cpp                    | 2 +-
 tests/v2/url/url_tests.cpp                           | 2 +-
 tests/v2/url/url_tests_with_exceptions.cpp           | 2 +-
 tests/v2/url/url_vector_tests.cpp                    | 2 +-
 49 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 39ce3bcf..2ab94dd4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -9,7 +9,7 @@ function(skyr_create_test file_name output_dir test_name version)
             ${test}
             PRIVATE
             skyr-url-${version}
-            Catch2::Catch2
+            Catch2::Catch2WithMain
             fmt::fmt
     )
     set_target_properties(
diff --git a/tests/v1/containers/static_vector_tests.cpp b/tests/v1/containers/static_vector_tests.cpp
index 1e9f5321..e5d6d0a9 100644
--- a/tests/v1/containers/static_vector_tests.cpp
+++ b/tests/v1/containers/static_vector_tests.cpp
@@ -5,7 +5,7 @@
 
 #include <memory>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/containers/static_vector.hpp>
 
 
diff --git a/tests/v1/domain/domain_tests.cpp b/tests/v1/domain/domain_tests.cpp
index 3784da6f..0a35d7d3 100644
--- a/tests/v1/domain/domain_tests.cpp
+++ b/tests/v1/domain/domain_tests.cpp
@@ -5,7 +5,7 @@
 
 #include <string>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/domain/domain.hpp>
 #include <skyr/v1/domain/errors.hpp>
 
diff --git a/tests/v1/domain/idna_table_tests.cpp b/tests/v1/domain/idna_table_tests.cpp
index 6a5425dd..a6a31087 100644
--- a/tests/v1/domain/idna_table_tests.cpp
+++ b/tests/v1/domain/idna_table_tests.cpp
@@ -4,7 +4,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/domain/idna.hpp>
 
 
diff --git a/tests/v1/domain/punycode_tests.cpp b/tests/v1/domain/punycode_tests.cpp
index 374a6c89..23c75f46 100644
--- a/tests/v1/domain/punycode_tests.cpp
+++ b/tests/v1/domain/punycode_tests.cpp
@@ -5,7 +5,7 @@
 
 #include <string>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/domain/punycode.hpp>
 
 
diff --git a/tests/v1/filesystem/filesystem_path_tests.cpp b/tests/v1/filesystem/filesystem_path_tests.cpp
index 50dc79ac..6de80499 100644
--- a/tests/v1/filesystem/filesystem_path_tests.cpp
+++ b/tests/v1/filesystem/filesystem_path_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/url.hpp>
 #include <skyr/v1/filesystem/path.hpp>
 
diff --git a/tests/v1/json/json_query_tests.cpp b/tests/v1/json/json_query_tests.cpp
index 737f06a8..e3f243b7 100644
--- a/tests/v1/json/json_query_tests.cpp
+++ b/tests/v1/json/json_query_tests.cpp
@@ -5,7 +5,7 @@
 
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <vector>
 #include <skyr/v1/json/json.hpp>
 
diff --git a/tests/v1/network/ipv4_address_tests.cpp b/tests/v1/network/ipv4_address_tests.cpp
index 5a89b8ac..ee068c52 100644
--- a/tests/v1/network/ipv4_address_tests.cpp
+++ b/tests/v1/network/ipv4_address_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/network/ipv4_address.hpp>
 
 TEST_CASE("ipv4 addresses", "[ipv4]") {
diff --git a/tests/v1/network/ipv6_address_tests.cpp b/tests/v1/network/ipv6_address_tests.cpp
index fae313b3..36097f95 100644
--- a/tests/v1/network/ipv6_address_tests.cpp
+++ b/tests/v1/network/ipv6_address_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/network/ipv6_address.hpp>
 
 TEST_CASE("ipv6_address_tests", "[ipv6]") {
diff --git a/tests/v1/percent_encoding/percent_decoding_tests.cpp b/tests/v1/percent_encoding/percent_decoding_tests.cpp
index a3f2b911..db4fc6fe 100644
--- a/tests/v1/percent_encoding/percent_decoding_tests.cpp
+++ b/tests/v1/percent_encoding/percent_decoding_tests.cpp
@@ -4,7 +4,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #define FMT_HEADER_ONLY
 #include <fmt/format.h>
 #include <skyr/v1/percent_encoding/percent_decode.hpp>
diff --git a/tests/v1/percent_encoding/percent_encoding_tests.cpp b/tests/v1/percent_encoding/percent_encoding_tests.cpp
index 2287b475..423d7445 100644
--- a/tests/v1/percent_encoding/percent_encoding_tests.cpp
+++ b/tests/v1/percent_encoding/percent_encoding_tests.cpp
@@ -4,7 +4,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #define FMT_HEADER_ONLY
 #include <fmt/format.h>
 #include <skyr/v1/percent_encoding/percent_encode.hpp>
diff --git a/tests/v1/unicode/byte_conversion_tests.cpp b/tests/v1/unicode/byte_conversion_tests.cpp
index b8aaf046..05c8d4ef 100644
--- a/tests/v1/unicode/byte_conversion_tests.cpp
+++ b/tests/v1/unicode/byte_conversion_tests.cpp
@@ -5,7 +5,7 @@
 
 #include <string>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/unicode/details/to_u8.hpp>
 
 TEST_CASE("weird_01", "byte_conversion_tests") {
diff --git a/tests/v1/unicode/unicode_code_point_tests.cpp b/tests/v1/unicode/unicode_code_point_tests.cpp
index ac4b1cfe..62ad7a9f 100644
--- a/tests/v1/unicode/unicode_code_point_tests.cpp
+++ b/tests/v1/unicode/unicode_code_point_tests.cpp
@@ -6,7 +6,7 @@
 #include <iterator>
 #include <string_view>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/unicode/code_point.hpp>
 
 
diff --git a/tests/v1/unicode/unicode_range_tests.cpp b/tests/v1/unicode/unicode_range_tests.cpp
index b088f586..4f775f33 100644
--- a/tests/v1/unicode/unicode_range_tests.cpp
+++ b/tests/v1/unicode/unicode_range_tests.cpp
@@ -6,7 +6,7 @@
 #include <iterator>
 #include <string_view>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/unicode/ranges/transforms/u16_transform.hpp>
 #include <skyr/v1/unicode/ranges/transforms/u32_transform.hpp>
 #include <skyr/v1/unicode/ranges/transforms/u8_transform.hpp>
diff --git a/tests/v1/unicode/unicode_tests.cpp b/tests/v1/unicode/unicode_tests.cpp
index 7c76616e..52ae9d4d 100644
--- a/tests/v1/unicode/unicode_tests.cpp
+++ b/tests/v1/unicode/unicode_tests.cpp
@@ -4,7 +4,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/unicode/ranges/transforms/u16_transform.hpp>
 #include <skyr/v1/unicode/ranges/transforms/u32_transform.hpp>
 #include <skyr/v1/unicode/ranges/transforms/u8_transform.hpp>
diff --git a/tests/v1/url/parse_host_tests.cpp b/tests/v1/url/parse_host_tests.cpp
index 88629791..bb973660 100644
--- a/tests/v1/url/parse_host_tests.cpp
+++ b/tests/v1/url/parse_host_tests.cpp
@@ -6,7 +6,7 @@
 #include <string_view>
 #include <variant>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/core/host.hpp>
 
 TEST_CASE("parse_host_tests", "url.parse_host") {
diff --git a/tests/v1/url/url_literal_tests.cpp b/tests/v1/url/url_literal_tests.cpp
index a81f05e0..be6faf65 100644
--- a/tests/v1/url/url_literal_tests.cpp
+++ b/tests/v1/url/url_literal_tests.cpp
@@ -6,7 +6,7 @@
 #include <algorithm>
 #include <memory>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/url.hpp>
 
 using namespace skyr::literals;
diff --git a/tests/v1/url/url_parse_tests.cpp b/tests/v1/url/url_parse_tests.cpp
index 80f4e8e6..54b7008f 100644
--- a/tests/v1/url/url_parse_tests.cpp
+++ b/tests/v1/url/url_parse_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/core/parse.hpp>
 #include <skyr/v1/core/serialize.hpp>
 
diff --git a/tests/v1/url/url_search_parameters_tests.cpp b/tests/v1/url/url_search_parameters_tests.cpp
index e334b5d4..3c1c6234 100644
--- a/tests/v1/url/url_search_parameters_tests.cpp
+++ b/tests/v1/url/url_search_parameters_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/url.hpp>
 #include <skyr/v1/url_search_parameters.hpp>
 
diff --git a/tests/v1/url/url_serialize_tests.cpp b/tests/v1/url/url_serialize_tests.cpp
index cff90ab7..ac6986ad 100644
--- a/tests/v1/url/url_serialize_tests.cpp
+++ b/tests/v1/url/url_serialize_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/core/parse.hpp>
 #include <skyr/v1/core/serialize.hpp>
 
diff --git a/tests/v1/url/url_setter_tests.cpp b/tests/v1/url/url_setter_tests.cpp
index b7a9cd9a..23804986 100644
--- a/tests/v1/url/url_setter_tests.cpp
+++ b/tests/v1/url/url_setter_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/url.hpp>
 
 TEST_CASE("url_setter_tests", "[url]") {
diff --git a/tests/v1/url/url_tests.cpp b/tests/v1/url/url_tests.cpp
index faf1957e..3290100d 100644
--- a/tests/v1/url/url_tests.cpp
+++ b/tests/v1/url/url_tests.cpp
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <memory>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/url.hpp>
 
 TEST_CASE("url_tests", "[url]") {
diff --git a/tests/v1/url/url_tests_with_exceptions.cpp b/tests/v1/url/url_tests_with_exceptions.cpp
index a167be50..8bad1a8f 100644
--- a/tests/v1/url/url_tests_with_exceptions.cpp
+++ b/tests/v1/url/url_tests_with_exceptions.cpp
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <memory>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/url.hpp>
 
 TEST_CASE("url_tests", "[url]") {
diff --git a/tests/v1/url/url_vector_tests.cpp b/tests/v1/url/url_vector_tests.cpp
index 1c2ec96e..997884df 100644
--- a/tests/v1/url/url_vector_tests.cpp
+++ b/tests/v1/url/url_vector_tests.cpp
@@ -5,7 +5,7 @@
 
 #include <vector>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/url.hpp>
 
 TEST_CASE("url_vector_tests", "[url]") {
diff --git a/tests/v2/containers/static_vector_tests.cpp b/tests/v2/containers/static_vector_tests.cpp
index b47620e5..4c9f519d 100644
--- a/tests/v2/containers/static_vector_tests.cpp
+++ b/tests/v2/containers/static_vector_tests.cpp
@@ -5,7 +5,7 @@
 
 #include <memory>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/containers/static_vector.hpp>
 
 
diff --git a/tests/v2/core/parse_host_tests.cpp b/tests/v2/core/parse_host_tests.cpp
index 12974303..e5527b5b 100644
--- a/tests/v2/core/parse_host_tests.cpp
+++ b/tests/v2/core/parse_host_tests.cpp
@@ -6,7 +6,7 @@
 #include <string_view>
 #include <variant>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/core/host.hpp>
 
 TEST_CASE("parse_host_tests", "url.parse_host") {
diff --git a/tests/v2/core/parse_path_tests.cpp b/tests/v2/core/parse_path_tests.cpp
index d06df103..5b3b794b 100644
--- a/tests/v2/core/parse_path_tests.cpp
+++ b/tests/v2/core/parse_path_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/core/parse_path.hpp>
 
 TEST_CASE("path_parsing_example_tests", "[parse]") {
diff --git a/tests/v2/core/parse_query_tests.cpp b/tests/v2/core/parse_query_tests.cpp
index 754340fb..d47b8e7d 100644
--- a/tests/v2/core/parse_query_tests.cpp
+++ b/tests/v2/core/parse_query_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/core/parse_query.hpp>
 
 TEST_CASE("query_parsing_example_tests", "[parse]") {
diff --git a/tests/v2/core/url_parse_tests.cpp b/tests/v2/core/url_parse_tests.cpp
index d88c21a8..d5bb586d 100644
--- a/tests/v2/core/url_parse_tests.cpp
+++ b/tests/v2/core/url_parse_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/core/parse.hpp>
 #include <skyr/v2/core/serialize.hpp>
 
diff --git a/tests/v2/core/url_serialize_tests.cpp b/tests/v2/core/url_serialize_tests.cpp
index 7b22cf10..5abf228b 100644
--- a/tests/v2/core/url_serialize_tests.cpp
+++ b/tests/v2/core/url_serialize_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/core/parse.hpp>
 #include <skyr/v2/core/serialize.hpp>
 
diff --git a/tests/v2/domain/domain_tests.cpp b/tests/v2/domain/domain_tests.cpp
index 35e7453a..aa9de174 100644
--- a/tests/v2/domain/domain_tests.cpp
+++ b/tests/v2/domain/domain_tests.cpp
@@ -5,7 +5,7 @@
 
 #include <string>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/domain/domain.hpp>
 #include <skyr/v2/domain/errors.hpp>
 
diff --git a/tests/v2/domain/idna_table_tests.cpp b/tests/v2/domain/idna_table_tests.cpp
index 4aa92e6d..2f12ef74 100644
--- a/tests/v2/domain/idna_table_tests.cpp
+++ b/tests/v2/domain/idna_table_tests.cpp
@@ -4,7 +4,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/domain/idna.hpp>
 
 
diff --git a/tests/v2/domain/punycode_tests.cpp b/tests/v2/domain/punycode_tests.cpp
index 4b9e80d0..06fb3d0a 100644
--- a/tests/v2/domain/punycode_tests.cpp
+++ b/tests/v2/domain/punycode_tests.cpp
@@ -5,7 +5,7 @@
 
 #include <string>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/domain/punycode.hpp>
 
 
diff --git a/tests/v2/filesystem/filesystem_path_tests.cpp b/tests/v2/filesystem/filesystem_path_tests.cpp
index 1871539d..67ee4910 100644
--- a/tests/v2/filesystem/filesystem_path_tests.cpp
+++ b/tests/v2/filesystem/filesystem_path_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/url.hpp>
 #include <skyr/v2/filesystem/path.hpp>
 
diff --git a/tests/v2/json/json_query_tests.cpp b/tests/v2/json/json_query_tests.cpp
index 61cf6402..c5911a88 100644
--- a/tests/v2/json/json_query_tests.cpp
+++ b/tests/v2/json/json_query_tests.cpp
@@ -5,7 +5,7 @@
 
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <vector>
 #include <skyr/v2/json/json.hpp>
 
diff --git a/tests/v2/network/ipv4_address_tests.cpp b/tests/v2/network/ipv4_address_tests.cpp
index 913e854e..9a45429c 100644
--- a/tests/v2/network/ipv4_address_tests.cpp
+++ b/tests/v2/network/ipv4_address_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/network/ipv4_address.hpp>
 
 TEST_CASE("ipv4 addresses", "[ipv4]") {
diff --git a/tests/v2/network/ipv6_address_tests.cpp b/tests/v2/network/ipv6_address_tests.cpp
index bd132fbb..7d8f4cb9 100644
--- a/tests/v2/network/ipv6_address_tests.cpp
+++ b/tests/v2/network/ipv6_address_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/network/ipv6_address.hpp>
 
 TEST_CASE("ipv6_address_tests", "[ipv6]") {
diff --git a/tests/v2/percent_encoding/percent_decoding_tests.cpp b/tests/v2/percent_encoding/percent_decoding_tests.cpp
index 77f06640..b1687249 100644
--- a/tests/v2/percent_encoding/percent_decoding_tests.cpp
+++ b/tests/v2/percent_encoding/percent_decoding_tests.cpp
@@ -4,7 +4,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #define FMT_HEADER_ONLY
 #include <fmt/format.h>
 #include <skyr/v2/percent_encoding/percent_decode.hpp>
diff --git a/tests/v2/percent_encoding/percent_encoding_tests.cpp b/tests/v2/percent_encoding/percent_encoding_tests.cpp
index e3f23e64..cf14ada6 100644
--- a/tests/v2/percent_encoding/percent_encoding_tests.cpp
+++ b/tests/v2/percent_encoding/percent_encoding_tests.cpp
@@ -4,7 +4,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #define FMT_HEADER_ONLY
 #include <fmt/format.h>
 #include <skyr/v2/percent_encoding/percent_encoded_char.hpp>
diff --git a/tests/v2/unicode/byte_conversion_tests.cpp b/tests/v2/unicode/byte_conversion_tests.cpp
index fc402bca..3678806e 100644
--- a/tests/v2/unicode/byte_conversion_tests.cpp
+++ b/tests/v2/unicode/byte_conversion_tests.cpp
@@ -5,7 +5,7 @@
 
 #include <string>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/unicode/details/to_u8.hpp>
 
 TEST_CASE("weird_01", "byte_conversion_tests") {
diff --git a/tests/v2/unicode/unicode_code_point_tests.cpp b/tests/v2/unicode/unicode_code_point_tests.cpp
index 6f8f057c..f18846f2 100644
--- a/tests/v2/unicode/unicode_code_point_tests.cpp
+++ b/tests/v2/unicode/unicode_code_point_tests.cpp
@@ -6,7 +6,7 @@
 #include <iterator>
 #include <string_view>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/unicode/code_point.hpp>
 
 
diff --git a/tests/v2/unicode/unicode_range_tests.cpp b/tests/v2/unicode/unicode_range_tests.cpp
index fdb71b0c..9e1c137f 100644
--- a/tests/v2/unicode/unicode_range_tests.cpp
+++ b/tests/v2/unicode/unicode_range_tests.cpp
@@ -6,7 +6,7 @@
 #include <iterator>
 #include <string_view>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/unicode/ranges/transforms/u16_transform.hpp>
 #include <skyr/v2/unicode/ranges/transforms/u32_transform.hpp>
 #include <skyr/v2/unicode/ranges/transforms/u8_transform.hpp>
diff --git a/tests/v2/unicode/unicode_tests.cpp b/tests/v2/unicode/unicode_tests.cpp
index 2489af66..a547c635 100644
--- a/tests/v2/unicode/unicode_tests.cpp
+++ b/tests/v2/unicode/unicode_tests.cpp
@@ -4,7 +4,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/unicode/ranges/transforms/u16_transform.hpp>
 #include <skyr/v2/unicode/ranges/transforms/u32_transform.hpp>
 #include <skyr/v2/unicode/ranges/transforms/u8_transform.hpp>
diff --git a/tests/v2/url/url_literal_tests.cpp b/tests/v2/url/url_literal_tests.cpp
index 706ee5f7..157af849 100644
--- a/tests/v2/url/url_literal_tests.cpp
+++ b/tests/v2/url/url_literal_tests.cpp
@@ -6,7 +6,7 @@
 #include <algorithm>
 #include <memory>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/url.hpp>
 
 using namespace skyr::literals;
diff --git a/tests/v2/url/url_search_parameters_tests.cpp b/tests/v2/url/url_search_parameters_tests.cpp
index e334b5d4..3c1c6234 100644
--- a/tests/v2/url/url_search_parameters_tests.cpp
+++ b/tests/v2/url/url_search_parameters_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v1/url.hpp>
 #include <skyr/v1/url_search_parameters.hpp>
 
diff --git a/tests/v2/url/url_setter_tests.cpp b/tests/v2/url/url_setter_tests.cpp
index 1b168b9a..2e327424 100644
--- a/tests/v2/url/url_setter_tests.cpp
+++ b/tests/v2/url/url_setter_tests.cpp
@@ -4,7 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/url.hpp>
 
 TEST_CASE("url_setter_tests", "[url]") {
diff --git a/tests/v2/url/url_tests.cpp b/tests/v2/url/url_tests.cpp
index c9ba21de..3fd40c7c 100644
--- a/tests/v2/url/url_tests.cpp
+++ b/tests/v2/url/url_tests.cpp
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <memory>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/url.hpp>
 
 TEST_CASE("url_tests", "[url]") {
diff --git a/tests/v2/url/url_tests_with_exceptions.cpp b/tests/v2/url/url_tests_with_exceptions.cpp
index 48ad5170..bd964172 100644
--- a/tests/v2/url/url_tests_with_exceptions.cpp
+++ b/tests/v2/url/url_tests_with_exceptions.cpp
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <memory>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/url.hpp>
 
 TEST_CASE("url_tests", "[url]") {
diff --git a/tests/v2/url/url_vector_tests.cpp b/tests/v2/url/url_vector_tests.cpp
index cc90ef5c..de4695a9 100644
--- a/tests/v2/url/url_vector_tests.cpp
+++ b/tests/v2/url/url_vector_tests.cpp
@@ -5,7 +5,7 @@
 
 #include <vector>
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <skyr/v2/url.hpp>
 
 TEST_CASE("url_vector_tests", "[url]") {
