test: update Catch2 to use version 2.11.0

Author: henryborchers

tests/CMakeLists.txt

@@ -3,9 +3,9 @@ if(BUILD_TESTING)
 
     FetchContent_Declare(
         libcatch2
-        URL https://github.com/catchorg/Catch2/archive/v2.13.6.tar.gz
-#        GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-#        GIT_TAG 15cf3ca
+        URL https://github.com/catchorg/Catch2/archive/v3.11.0.tar.gz
+        URL_HASH SHA1=5f5a932acf6990764c33ed80ee04f1c696f4d5bc
+        DOWNLOAD_EXTRACT_TIMESTAMP true
     )
 
     FetchContent_MakeAvailable(libcatch2)
@@ -22,7 +22,7 @@ if(BUILD_TESTING)
             URL ${PROJECT_BINARY_DIR}/metadata_test_images.tar.gz
     )
     FetchContent_MakeAvailable(test_images)
-    add_executable(tester test-main.cpp test-basic.cpp test_exceptions.cpp)
+    add_executable(tester test-basic.cpp test_exceptions.cpp)
     target_include_directories(tester PRIVATE ${PROJECT_SOURCE_DIR}/uiucprescon/imagevalidate)
 
     target_compile_definitions(tester PRIVATE TEST_IMAGE_PATH="${test_images_SOURCE_DIR}")
@@ -31,35 +31,22 @@ if(BUILD_TESTING)
                 CXX_CPPCHECK ${CMAKE_CXX_CPPCHECK};--suppress=*:${libcatch2_SOURCE_DIR}/single_include/catch2/catch.hpp
             )
     endif()
-    set_target_properties(tester PROPERTIES
-            CXX_STANDARD 11
-            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-            )
 
-    target_link_libraries(tester PRIVATE Catch2 imagevalidate::glue)
+    target_link_libraries(tester PRIVATE Catch2::Catch2WithMain imagevalidate::glue)
     catch_discover_tests(tester
             TEST_PREFIX imagevalidate.
             )
 
     #############
 
-    add_executable(tester-internal test-main.cpp tester-internal.cpp)
-    if(CMAKE_CXX_CPPCHECK)
-        set_property(TARGET tester-internal PROPERTY
-                CXX_CPPCHECK ${CMAKE_CXX_CPPCHECK};--suppress=*:${libcatch2_SOURCE_DIR}/single_include/catch2/catch.hpp
-                )
-    endif()
+    add_executable(tester-internal tester-internal.cpp)
     target_compile_definitions(tester-internal
             PRIVATE TEST_IMAGE_PATH="${test_images_SOURCE_DIR}")
 
-    set_target_properties(tester-internal PROPERTIES
-            CXX_STANDARD 11
-            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-            )
 
     target_link_libraries(tester-internal
             PRIVATE
-                Catch2
+                Catch2::Catch2WithMain
                 glue
             )
     catch_discover_tests(tester-internal

tests/test-basic.cpp

@@ -1,6 +1,6 @@
 #include "glue.h"
 #include "exceptions.h"
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 
 TEST_CASE("utils"){

tests/test-main.cpp

@@ -2,12 +2,15 @@
 // Created by Borchers, Henry Samuel on 5/25/21.
 //
 
-#include "catch2/catch.hpp"
 #include "exceptions.h"
 
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
+#include <catch2/matchers/catch_matchers_exception.hpp>
+
 TEST_CASE("InvalidFileException filename only"){
-    REQUIRE_THROWS_WITH(throw InvalidFileException("myfile.txt"), Catch::Equals( "myfile.txt" ));
+    REQUIRE_THROWS_WITH(throw InvalidFileException("myfile.txt"), Catch::Matchers::Equals( "myfile.txt" ));
 }
 TEST_CASE("InvalidFileException filename with message"){
-    REQUIRE_THROWS_WITH(throw InvalidFileException("myfile.txt", "did something stupid"), Catch::Equals( "myfile.txt: did something stupid" ));
+    REQUIRE_THROWS_WITH(throw InvalidFileException("myfile.txt", "did something stupid"), Catch::Matchers::Equals( "myfile.txt: did something stupid" ));
 }

tests/test_exceptions.cpp

@@ -2,7 +2,7 @@
 // Created by Borchers, Henry Samuel on 9/13/18.
 //
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "opj_colorspace_checker.h"