update testTrackAnalyzers catch2 unit tests

cms-sw · Feb 2, 2023 · 9b92404 · 9b92404
1 parent 7cc01f8
commit 9b92404
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 12 deletions.
diff --git a/Alignment/OfflineValidation/plugins/DMRChecker.cc b/Alignment/OfflineValidation/plugins/DMRChecker.cc
@@ -1395,8 +1395,8 @@ class DMRChecker : public edm::one::EDAnalyzer<edm::one::WatchRuns, edm::one::Sh
     edm::LogPrint("DMRChecker") << "n. tracks: " << itrks << std::endl;
     edm::LogPrint("DMRChecker") << "*******************************" << std::endl;
 
-    int nFiringTriggers = triggerMap_.size();
-    edm::LogPrint("DMRChecker") << "firing triggers: " << nFiringTriggers << std::endl;
+    int nFiringTriggers = !triggerMap_.empty() ? triggerMap_.size() : 1;
+    edm::LogPrint("DMRChecker") << "firing triggers: " << triggerMap_.size() << std::endl;
     edm::LogPrint("DMRChecker") << "*******************************" << std::endl;
 
     tksByTrigger_ =

diff --git a/Alignment/OfflineValidation/test/testTrackAnalyzers.cc b/Alignment/OfflineValidation/test/testTrackAnalyzers.cc
@@ -1,5 +1,6 @@
 #include "FWCore/TestProcessor/interface/TestProcessor.h"
 #include "FWCore/Utilities/interface/Exception.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 
 #define CATCH_CONFIG_MAIN
@@ -14,6 +15,7 @@ process = TestProcess()
 process.trackAnalyzer = generalPurposeTrackAnalyzer
 process.moduleToTest(process.trackAnalyzer)
 process.add_(cms.Service('MessageLogger'))
+process.add_(cms.Service('JobReportService'))
 process.add_(cms.Service('TFileService',fileName=cms.string('tesTrackAnalyzer1.root')))
 )_"};
 
@@ -26,18 +28,18 @@ process.add_(cms.Service('TFileService',fileName=cms.string('tesTrackAnalyzer1.r
   // }
 
   // SECTION("beginJob and endJob only") {
-  //   edm::test::TestProcessor tester(config);
-  //   REQUIRE_NOTHROW(tester.testBeginAndEndJobOnly());
+  //  edm::test::TestProcessor tester(config);
+  //  REQUIRE_NOTHROW(tester.testBeginAndEndJobOnly());
   // }
 
   // SECTION("Run with no LuminosityBlocks") {
-  //   edm::test::TestProcessor tester(config);
-  //   REQUIRE_NOTHROW(tester.testRunWithNoLuminosityBlocks());
+  //  edm::test::TestProcessor tester(config);
+  //  REQUIRE_NOTHROW(tester.testRunWithNoLuminosityBlocks());
   // }
 
   // SECTION("LuminosityBlock with no Events") {
-  //   edm::test::TestProcessor tester(config);
-  //   REQUIRE_NOTHROW(tester.testLuminosityBlockWithNoEvents());
+  //  edm::test::TestProcessor tester(config);
+  //  REQUIRE_NOTHROW(tester.testLuminosityBlockWithNoEvents());
   // }
 }
 
@@ -50,6 +52,7 @@ process = TestProcess()
 process.dmrAnalyzer = dmrChecker
 process.moduleToTest(process.dmrAnalyzer)
 process.add_(cms.Service('MessageLogger'))
+process.add_(cms.Service('JobReportService'))
 process.add_(cms.Service('TFileService',fileName=cms.string('tesTrackAnalyzer2.root')))
 )_"};
 
@@ -61,10 +64,10 @@ process.add_(cms.Service('TFileService',fileName=cms.string('tesTrackAnalyzer2.r
   //   REQUIRE_NOTHROW(tester.test());
   // }
 
-  // SECTION("beginJob and endJob only") {
-  //   edm::test::TestProcessor tester(config);
-  //   REQUIRE_NOTHROW(tester.testBeginAndEndJobOnly());
-  // }
+  SECTION("beginJob and endJob only") {
+    edm::test::TestProcessor tester(config);
+    REQUIRE_NOTHROW(tester.testBeginAndEndJobOnly());
+  }
 
   // SECTION("Run with no LuminosityBlocks") {
   //   edm::test::TestProcessor tester(config);
@@ -76,3 +79,29 @@ process.add_(cms.Service('TFileService',fileName=cms.string('tesTrackAnalyzer2.r
   //   REQUIRE_NOTHROW(tester.testLuminosityBlockWithNoEvents());
   // }
 }
+
+TEST_CASE("JetHTAnalyzer tests", "[JetHTAnalyzer]") {
+  //The python configuration
+  edm::test::TestProcessor::Config config{
+      R"_(import FWCore.ParameterSet.Config as cms
+from FWCore.TestProcessor.TestProcess import *
+from Alignment.OfflineValidation.jetHTAnalyzer_cfi import jetHTAnalyzer
+process = TestProcess()
+process.JetHTAnalyzer = jetHTAnalyzer
+process.moduleToTest(process.JetHTAnalyzer)
+process.add_(cms.Service('JobReportService'))
+process.add_(cms.Service('TFileService',fileName=cms.string('tesTrackAnalyzer3.root')))
+)_"};
+
+  SECTION("base configuration is OK") { REQUIRE_NOTHROW(edm::test::TestProcessor(config)); }
+
+  SECTION("beginJob and endJob only") {
+    edm::test::TestProcessor tester(config);
+    REQUIRE_NOTHROW(tester.testBeginAndEndJobOnly());
+  }
+
+  // SECTION("No event data") {
+  //  edm::test::TestProcessor tester(config);
+  //  REQUIRE_NOTHROW(tester.test());
+  //}
+}