Install tests under tests (#187)

* Install tests under tests

* update path to test file

* fix config file for testInfrastructureGenerator.cxx

Author: Barthelemy

CMakeLists.txt

@@ -108,7 +108,7 @@ find_package(
 set(ENABLE_MYSQL ON)
 if(NOT (MYSQL_FOUND AND TARGET ROOT::RMySQL))
   set(ENABLE_MYSQL OFF)
-  message(WARNING "MySQL or ROOT::RMySQL not found, the corresponding classes won't be built.")
+  message(STATUS "MySQL or ROOT::RMySQL not found, the corresponding classes won't be built.")
 endif()
 
 # ---- Subdirectories ----

Framework/CMakeLists.txt

@@ -237,15 +237,10 @@ foreach(test ${TEST_SRCS})
   add_executable(${test_name} ${test})
   target_link_libraries(${test_name} PRIVATE QualityControl Boost::unit_test_framework )
   add_test(NAME ${test_name} COMMAND ${test_name})
-  set_tests_properties(${test_name} PROPERTIES TIMEOUT 60)
+  set_tests_properties(${test_name} PROPERTIES TIMEOUT 30)
+  install(TARGETS ${test_name} DESTINATION tests)
 endforeach()
 
-install(
-  FILES
-  test/testQCFactory.json
-  DESTINATION test
-)
-
 # ---- Install ----
 
 # Build targets with install rpath on Mac to dramatically speed up installation
@@ -322,6 +317,7 @@ install(
     streamerinfos.root
   DESTINATION etc
 )
+
 install(
   PROGRAMS
     script/RepoCleaner/1_per_hour.py
@@ -331,3 +327,9 @@ install(
   DESTINATION
     bin
 )
+
+install(
+  FILES
+  test/testQCFactory.json
+  DESTINATION tests
+)

Framework/test/testInfrastructureGenerator.cxx

@@ -29,14 +29,14 @@ using namespace o2::framework;
 
 BOOST_AUTO_TEST_CASE(qc_factory_local_test)
 {
-  std::string configFilePath = std::string("json:/") + getenv("QUALITYCONTROL_ROOT") + "/test/testQCFactory.json";
+  std::string configFilePath = std::string("json:/") + getenv("QUALITYCONTROL_ROOT") + "/tests/testQCFactory.json";
 
   {
     auto workflow = InfrastructureGenerator::generateLocalInfrastructure(configFilePath, "o2flp1");
 
     BOOST_REQUIRE_EQUAL(workflow.size(), 1);
 
-    BOOST_CHECK_EQUAL(workflow[0].name, "skeletonTask");
+    BOOST_CHECK_EQUAL(workflow[0].name, "QC-TASK-RUNNER-skeletonTask");
     BOOST_CHECK_EQUAL(workflow[0].inputs.size(), 1);
     BOOST_CHECK_EQUAL(workflow[0].outputs.size(), 1);
     BOOST_CHECK_EQUAL(DataSpecUtils::getOptionalSubSpec(workflow[0].outputs[0]).value_or(-1), 1);
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE(qc_factory_local_test)
 
     BOOST_REQUIRE_EQUAL(workflow.size(), 1);
 
-    BOOST_CHECK_EQUAL(workflow[0].name, "skeletonTask");
+    BOOST_CHECK_EQUAL(workflow[0].name, "QC-TASK-RUNNER-skeletonTask");
     BOOST_CHECK_EQUAL(workflow[0].inputs.size(), 1);
     BOOST_CHECK_EQUAL(workflow[0].outputs.size(), 1);
     BOOST_CHECK_EQUAL(DataSpecUtils::getOptionalSubSpec(workflow[0].outputs[0]).value_or(-1), 2);
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE(qc_factory_local_test)
 
 BOOST_AUTO_TEST_CASE(qc_factory_remote_test)
 {
-  std::string configFilePath = std::string("json:/") + getenv("QUALITYCONTROL_ROOT") + "/test/testQCFactory.json";
+  std::string configFilePath = std::string("json:/") + getenv("QUALITYCONTROL_ROOT") + "/tests/testQCFactory.json";
   auto workflow = InfrastructureGenerator::generateRemoteInfrastructure(configFilePath);
 
   // the infrastructure should consist of a merger and checker for the 'skeletonTask' (its taskRunner is declared to be

Framework/test/testQCFactory.json

@@ -15,12 +15,15 @@
     },
     "tasks": {
       "skeletonTask": {
-        "active": true,
+        "active": "true",
         "className": "o2::quality_control_modules::skeleton::SkeletonTask",
         "moduleName": "QcSkeleton",
-        "dataSamplingPolicy": "tpcclust",
         "cycleDurationSeconds": "10",
         "maxNumberCycles": "-1",
+        "dataSource": {
+          "type": "dataSamplingPolicy",
+          "name": "tpcclust"
+        },
         "taskParameters": {
           "parameter1": 100001,
           "parameter2": "qu'est-ce que c'est que ce truc la"
@@ -35,7 +38,10 @@
         "active": true,
         "className": "o2::quality_control_modules::skeleton::SkeletonTask",
         "moduleName": "QcSkeleton",
-        "dataSamplingPolicy": "tpcclust",
+        "dataSource": {
+          "type": "dataSamplingPolicy",
+          "name": "tpcclust"
+        },
         "cycleDurationSeconds": "10",
         "maxNumberCycles": "-1",
         "taskParameters": {
@@ -45,7 +51,7 @@
         "location": "remote"
       },
       "defTask": {
-        "active": false
+        "active": "false"
       }
     }
   },