Update to Catch 3.x (#190)

offa · offa · commit e4cdd8bd2b94 · 2022-07-15T17:16:51.000+02:00
diff --git a/conanfile.py b/conanfile.py
@@ -24,7 +24,7 @@ class ScopeguardConan(ConanFile):
         "enable_compat_header=OFF"
     )
     __requirements = [
-        "catch2/2.13.9",
+        "catch2/3.0.1",
         "trompeloeil/42"
     ]
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,13 +1,10 @@
 find_package(Catch2 REQUIRED)
 find_package(trompeloeil REQUIRED)
 
-add_library(TestMain TestMain.cpp)
-target_link_libraries(TestMain PUBLIC Catch2::Catch2 trompeloeil::trompeloeil)
-
 
 function(add_test_suite name)
     add_executable(${name} ${name}.cpp)
-    target_link_libraries(${name} PRIVATE TestMain ScopeGuard)
+    target_link_libraries(${name} PRIVATE Catch2::Catch2WithMain trompeloeil::trompeloeil ScopeGuard)
     add_test(${name} ${name})
 endfunction()
 
diff --git a/test/ScopeExitTest.cpp b/test/ScopeExitTest.cpp
@@ -22,7 +22,7 @@
 
 #include "scope_exit.h"
 #include "CallMocks.h"
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 namespace
 {
diff --git a/test/ScopeFailTest.cpp b/test/ScopeFailTest.cpp
@@ -22,7 +22,7 @@
 
 #include "scope_fail.h"
 #include "CallMocks.h"
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 namespace
 {
diff --git a/test/ScopeSuccessTest.cpp b/test/ScopeSuccessTest.cpp
@@ -22,7 +22,7 @@
 
 #include "scope_success.h"
 #include "CallMocks.h"
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 namespace
 {
diff --git a/test/TestMain.cpp b/test/TestMain.cpp
diff --git a/test/UniqueResourceTest.cpp b/test/UniqueResourceTest.cpp
@@ -22,7 +22,7 @@
 
 #include "unique_resource.h"
 #include "CallMocks.h"
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <trompeloeil.hpp>
 
 namespace

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class ScopeguardConan(ConanFile):`
`24`	`24`	`"enable_compat_header=OFF"`
`25`	`25`	`)`
`26`	`26`	`__requirements = [`
`27`		`- "catch2/2.13.9",`
	`27`	`+ "catch2/3.0.1",`
`28`	`28`	`"trompeloeil/42"`
`29`	`29`	`]`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`	`#include "scope_exit.h"`
`24`	`24`	`#include "CallMocks.h"`
`25`		`-#include <catch2/catch.hpp>`
	`25`	`+#include <catch2/catch_test_macros.hpp>`
`26`	`26`
`27`	`27`	`namespace`
`28`	`28`	`{`