add parser tests using catch2

Author: kpedro88

FWCore/Framework/bin/cmsRun.cpp

@@ -85,7 +85,7 @@ namespace {
   };
 }  // namespace
 
-int main(int argc, char* argv[]) {
+int main(int argc, const char* argv[]) {
   edm::TimingServiceBase::jobStarted();
 
   int returnCode = 0;

FWCore/Framework/interface/CmsRunParser.h

@@ -10,7 +10,7 @@ namespace edm {
   public:
     using MapOrExit = std::variant<boost::program_options::variables_map, int>;
     CmsRunParser(const char* name);
-    MapOrExit parse(int argc, char* argv[]) const;
+    MapOrExit parse(int argc, const char* argv[]) const;
     //variant helpers
     static bool hasVM(const MapOrExit& output) {
       return std::holds_alternative<boost::program_options::variables_map>(output);

FWCore/Framework/src/CmsRunParser.cc

@@ -87,7 +87,7 @@ namespace edm {
 
     all_options_.add(desc_).add(hidden);
   }
-  CmsRunParser::MapOrExit CmsRunParser::parse(int argc, char* argv[]) const {
+  CmsRunParser::MapOrExit CmsRunParser::parse(int argc, const char* argv[]) const {
     boost::program_options::variables_map vm;
     try {
       store(boost::program_options::command_line_parser(argc, argv)

FWCore/Framework/test/BuildFile.xml

@@ -379,7 +379,13 @@
 <test name="testFWCoreFrameworkWrongOptionsNumberOfStreamsType" command="run_wrongOptionsType.sh numberOfStreams 'cms.untracked.int32(1)'"/>
 <test name="testFWCoreFrameworkWrongOptionssizeOfStackForThreadsInKBType" command="run_wrongOptionsType.sh sizeOfStackForThreadsInKB 'cms.untracked.int32(1024)'"/>
 
-<test name="testFWCoreFrameworkCmsRunParser" command="run_cmsRun_parser.sh"/>
+<bin file="test_catch2_main.cc,test_catch2_CmsRunParser.cc" name="TestFWCoreFrameworkCmsRunParser">
+  <use name="catch2"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/Utilities"/>
+</bin>
+
+<test name="testFWCoreFrameworkCmsRunParsing" command="run_cmsRun_parsing.sh"/>
 <test name="testFWCoreFrameworkCmsRunVarparsing" command="run_cmsRun_varparsing.sh"/>
 <test name="testFWCoreFrameworkCmsRunArgparse" command="run_cmsRun_argparse.sh"/>
 <test name="testFWCoreFrameworkCmsRunArgv" command="run_cmsRun_argv.sh"/>

FWCore/Framework/test/run_cmsRun_parser.sh renamed to FWCore/Framework/test/run_cmsRun_parsing.sh

@@ -0,0 +1,94 @@
+#include "catch.hpp"
+
+#include "FWCore/Framework/interface/CmsRunParser.h"
+#include "FWCore/Utilities/interface/EDMException.h"
+
+#include <string>
+
+TEST_CASE("test cmsRun command line parsing", "[commandline]") {
+  edm::CmsRunParser parser("cmsRun");
+
+  SECTION("No arguments") {
+    constexpr int kSize = 1;
+    const char* args[kSize] = {"cmsRun"};
+    const auto& output = parser.parse(kSize, args);
+
+    REQUIRE(edm::CmsRunParser::hasVM(output));
+    auto vm = edm::CmsRunParser::getVM(output);
+
+    REQUIRE(not vm.count(edm::CmsRunParser::kHelpOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kParameterSetOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kStrictOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kJobreportOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kEnableJobreportOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kNumberOfThreadsOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kSizeOfStackForThreadOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kJobModeOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kPythonOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kCmdOpt));
+  }
+
+  SECTION("help") {
+    constexpr int kSize = 2;
+    const char* args[kSize] = {"cmsRun", "-h"};
+    const auto& output = parser.parse(kSize, args);
+
+    REQUIRE(not edm::CmsRunParser::hasVM(output));
+    REQUIRE(edm::CmsRunParser::getExit(output) == 0);
+  }
+
+  SECTION("wrong") {
+    constexpr int kSize = 2;
+    const char* args[kSize] = {"cmsRun", "--wrong"};
+    const auto& output = parser.parse(kSize, args);
+
+    REQUIRE(not edm::CmsRunParser::hasVM(output));
+    REQUIRE(edm::CmsRunParser::getExit(output) == edm::errors::CommandLineProcessing);
+  }
+
+  SECTION("Config file only") {
+    constexpr int kSize = 2;
+    const std::string arg("config.py");
+    const char* args[kSize] = {"cmsRun", arg.c_str()};
+    const auto& output = parser.parse(kSize, args);
+
+    REQUIRE(edm::CmsRunParser::hasVM(output));
+    auto vm = edm::CmsRunParser::getVM(output);
+
+    REQUIRE(vm.count(edm::CmsRunParser::kParameterSetOpt));
+    REQUIRE(vm[edm::CmsRunParser::kParameterSetOpt].as<std::string>() == arg);
+    REQUIRE(not vm.count(edm::CmsRunParser::kHelpOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kStrictOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kJobreportOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kEnableJobreportOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kNumberOfThreadsOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kSizeOfStackForThreadOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kJobModeOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kPythonOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kCmdOpt));
+  }
+
+  SECTION("Command line input only") {
+    constexpr int kSize = 3;
+    const std::string arg(
+        "import FWCore.ParameterSet.Config as cms; process = cms.Process('Test'); "
+        "process.source=cms.Source('EmptySource'); process.maxEvents.input=10; print('Test3')");
+    const char* args[kSize] = {"cmsRun", "-c", arg.c_str()};
+    const auto& output = parser.parse(kSize, args);
+
+    REQUIRE(edm::CmsRunParser::hasVM(output));
+    auto vm = edm::CmsRunParser::getVM(output);
+
+    REQUIRE(not vm.count(edm::CmsRunParser::kParameterSetOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kHelpOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kStrictOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kJobreportOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kEnableJobreportOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kNumberOfThreadsOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kSizeOfStackForThreadOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kJobModeOpt));
+    REQUIRE(not vm.count(edm::CmsRunParser::kPythonOpt));
+    REQUIRE(vm.count(edm::CmsRunParser::kCmdOpt));
+    REQUIRE(vm[edm::CmsRunParser::kCmdOpt].as<std::string>() == arg);
+  }
+}