Merge pull request #49121 from Dr15Jones/catch2_v3

Moved catch2 tests to the v3 API

Author: cmsbuild

Alignment/HIPAlignmentAlgorithm/test/testHIPAnalyzers.cc

@@ -5,7 +5,7 @@
 #include <format>
 
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 // Function to run the catch2 tests
 //___________________________________________________________________________________________

Alignment/OfflineValidation/test/testTrackAnalyzers.cc

@@ -6,7 +6,7 @@
 
 #include <format>
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 // Function to run the catch2 tests
 //___________________________________________________________________________________________

CUDADataFormats/Common/test/test_Product.cc

@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "CUDADataFormats/Common/interface/Product.h"
 #include "HeterogeneousCore/CUDACore/interface/ScopedContext.h"

CUDADataFormats/Common/test/test_main.cc

@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"

CalibFormats/SiStripObjects/test/test_catch2_SiStripHashedDetId.cc

@@ -2,7 +2,7 @@
 #include "CalibFormats/SiStripObjects/interface/SiStripDetInfo.h"
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include <set>
 #include <vector>

CalibFormats/SiStripObjects/test/test_catch2_main.cc

@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"

CalibTracker/SiPixelESProducers/test/test_catch2_ESSources.cc

@@ -4,7 +4,7 @@
 #include <format>
 
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 // Function to run the catch2 tests
 //___________________________________________________________________________________________

CommonTools/BaseParticlePropagator/test/makeMuon_catch2.cc

@@ -2,7 +2,7 @@
 #include "CommonTools/BaseParticlePropagator/interface/RawParticle.h"
 
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 
 static constexpr const double kMuonMass = 0.10566;
 

CondCore/CondHDF5ESSource/test/test_catch2_convertSyncValue.cc

@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "CondCore/CondHDF5ESSource/plugins/convertSyncValue.h"
 
 using namespace cond::hdf5;

CondCore/CondHDF5ESSource/test/test_catch2_findMatchFirst.cc

@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "CondCore/CondHDF5ESSource/plugins/IOVSyncValue.h"
 //can't link to plugin so must include source
 #include "CondCore/CondHDF5ESSource/plugins/IOVSyncValue.cc"