two tests translated from boost test to catch2 (#2222)

* two tests translated from boost test to catch2

* if we try out CustomParameters::operator<<, check if it does not throw

Author: knopers8

Framework/CMakeLists.txt

@@ -232,8 +232,10 @@ add_executable(o2-qc-test-core
                test/testActivityHelpers.cxx
                test/testAggregatorInterface.cxx
                test/testAggregatorRunner.cxx
+               test/testCheck.cxx
                test/testCheckInterface.cxx
                test/testCheckRunner.cxx
+               test/testCustomParameters.cxx
                test/testInfrastructureGenerator.cxx
                test/testMonitorObject.cxx
                test/testPolicyManager.cxx
@@ -265,7 +267,6 @@ set(TEST_SRCS
     test/testPublisher.cxx
     test/testQcInfoLogger.cxx
     test/testTaskRunner.cxx
-    test/testCheck.cxx
     test/testObjectsManager.cxx
     test/testCcdbDatabase.cxx
     test/testCcdbDatabaseExtra.cxx
@@ -279,7 +280,6 @@ set(TEST_SRCS
     test/testRepoPathUtils.cxx
     test/testQualitiesToTRFCollectionConverter.cxx
     test/testUserCodeInterface.cxx
-    test/testCustomParameters.cxx
   )
 
 set(TEST_ARGS
@@ -295,13 +295,11 @@ set(TEST_ARGS
     ""
     ""
     ""
-    ""
     "-b --run"
     "-b --run"
     ""
     ""
     ""
-    ""
   )
 
 list(LENGTH TEST_SRCS count)
@@ -325,7 +323,7 @@ endforeach()
 
 foreach(t testWorkflow testTaskRunner testCheckWorkflow
         testPostProcessingConfig testPostProcessingInterface
-        testCheck testTrendingTask testCustomParameters)
+        testTrendingTask)
   target_sources(${t} PRIVATE
                  ${CMAKE_BINARY_DIR}/getTestDataDirectory.cxx)
   target_include_directories(${t} PRIVATE ${CMAKE_SOURCE_DIR})

Framework/test/testCheck.cxx

@@ -25,12 +25,7 @@
 #include <TH1F.h>
 #include <Configuration/ConfigurationFactory.h>
 #include <Configuration/ConfigurationInterface.h>
-
-#define BOOST_TEST_MODULE Check test
-#define BOOST_TEST_MAIN
-#define BOOST_TEST_DYN_LINK
-
-#include <boost/test/unit_test.hpp>
+#include <catch_amalgamated.hpp>
 
 using namespace o2::quality_control::checker;
 using namespace o2::quality_control::core;
@@ -57,28 +52,28 @@ CheckConfig getCheckConfig(const std::string& configFilePath, const std::string&
   }
 }
 
-BOOST_AUTO_TEST_CASE(test_check_specs)
+TEST_CASE("test_check_specs")
 {
   std::string configFilePath = std::string("json://") + getTestDataDirectory() + "testSharedConfig.json";
 
   Check check(getCheckConfig(configFilePath, "singleCheck"));
 
-  BOOST_REQUIRE_EQUAL(check.getInputs().size(), 1);
-  BOOST_CHECK_EQUAL(check.getInputs()[0], (InputSpec{ { "mo" }, "QTST", "skeletonTask", 0, Lifetime::Sporadic }));
+  REQUIRE(check.getInputs().size() == 1);
+  CHECK(check.getInputs()[0] == (InputSpec{ { "mo" }, "QTST", "skeletonTask", 0, Lifetime::Sporadic }));
 
-  BOOST_CHECK_EQUAL(check.getOutputSpec(), (OutputSpec{ "CTST", "singleCheck", 0, Lifetime::Sporadic }));
+  CHECK(check.getOutputSpec() == (OutputSpec{ "CTST", "singleCheck", 0, Lifetime::Sporadic }));
 }
 
-BOOST_AUTO_TEST_CASE(test_check_long_description)
+TEST_CASE("test_check_long_description")
 {
   std::string configFilePath = std::string("json://") + getTestDataDirectory() + "testSharedConfig.json";
 
   Check check(getCheckConfig(configFilePath, "singleCheckLongDescription"));
 
-  BOOST_REQUIRE_EQUAL(check.getInputs().size(), 1);
-  BOOST_CHECK_EQUAL(check.getInputs()[0], (InputSpec{ { "mo" }, "QTST", "skeletonTask", 0, Lifetime::Sporadic }));
+  REQUIRE(check.getInputs().size() == 1);
+  CHECK(check.getInputs()[0] == (InputSpec{ { "mo" }, "QTST", "skeletonTask", 0, Lifetime::Sporadic }));
 
-  BOOST_CHECK_EQUAL(check.getOutputSpec(), (OutputSpec{ "CTST", "singleCheckL9fdb", 0, Lifetime::Sporadic }));
+  CHECK(check.getOutputSpec() == (OutputSpec{ "CTST", "singleCheckL9fdb", 0, Lifetime::Sporadic }));
 }
 
 std::shared_ptr<MonitorObject> dummyMO(const std::string& objName)
@@ -88,7 +83,7 @@ std::shared_ptr<MonitorObject> dummyMO(const std::string& objName)
   return obj;
 }
 
-BOOST_AUTO_TEST_CASE(test_check_empty_mo)
+TEST_CASE("test_check_empty_mo")
 {
   std::string configFilePath = std::string("json://") + getTestDataDirectory() + "testSharedConfig.json";
 
@@ -102,7 +97,7 @@ BOOST_AUTO_TEST_CASE(test_check_empty_mo)
     };
 
     auto qos = check.check(moMap);
-    BOOST_CHECK_EQUAL(qos.size(), 0);
+    CHECK(qos.size() == 0);
   }
 
   {
@@ -111,11 +106,11 @@ BOOST_AUTO_TEST_CASE(test_check_empty_mo)
     };
 
     auto qos = check.check(moMap);
-    BOOST_CHECK_EQUAL(qos.size(), 0);
+    CHECK(qos.size() == 0);
   }
 }
 
-BOOST_AUTO_TEST_CASE(test_check_invoke_check)
+TEST_CASE("test_check_invoke_check")
 {
   std::string configFilePath = std::string("json://") + getTestDataDirectory() + "testSharedConfig.json";
 
@@ -128,10 +123,10 @@ BOOST_AUTO_TEST_CASE(test_check_invoke_check)
   };
 
   auto qos = check.check(moMap);
-  BOOST_CHECK_EQUAL(qos.size(), 1);
+  CHECK(qos.size() == 1);
 }
 
-BOOST_AUTO_TEST_CASE(test_check_postprocessing)
+TEST_CASE("test_check_postprocessing")
 {
   std::string configFilePath = std::string("json://") + getTestDataDirectory() + "testSharedConfig.json";
 
@@ -144,10 +139,10 @@ BOOST_AUTO_TEST_CASE(test_check_postprocessing)
   };
 
   auto qos = check.check(moMap);
-  BOOST_CHECK_EQUAL(qos.size(), 1);
+  CHECK(qos.size() == 1);
 }
 
-BOOST_AUTO_TEST_CASE(test_check_activity)
+TEST_CASE("test_check_activity")
 {
   Check check({ "test",
                 "QcSkeleton",
@@ -170,7 +165,7 @@ BOOST_AUTO_TEST_CASE(test_check_activity)
   check.startOfActivity(Activity());
   auto qos = check.check(moMap);
 
-  BOOST_REQUIRE_EQUAL(qos.size(), 1);
+  REQUIRE(qos.size() == 1);
   ValidityInterval correctValidity{ 1, 15 };
-  BOOST_CHECK(qos[0]->getActivity().mValidity == correctValidity);
-}
+  CHECK(qos[0]->getActivity().mValidity == correctValidity);
+}