Extend Process{Configration,History}_t tests to cover HardwareResourcesDescription

Author: makortel

FWCore/Integration/test/ProcessConfiguration_t.cpp

@@ -9,8 +9,6 @@
 #include <iostream>
 #include <string>
 
-// TODO: add tests for HardwareResourcesDescription
-
 TEST_CASE("test ProcessConfiguration", "[ProcessConfiguration]") {
   edm::ParameterSet dummyPset;
   dummyPset.registerIt();
@@ -54,4 +52,47 @@ TEST_CASE("test ProcessConfiguration", "[ProcessConfiguration]") {
       REQUIRE(id4 == id2);
     }
   }
+
+  SECTION("reduced") {
+    SECTION("Release version") {
+      edm::ProcessConfiguration pc1("reco", id, "CMSSW_15_0_0", edm::HardwareResourcesDescription());
+      edm::ProcessConfiguration pc2("reco", id, "CMSSW_15_1_0", edm::HardwareResourcesDescription());
+      edm::ProcessConfiguration pc3("reco", id, "CMSSW_15_0_1", edm::HardwareResourcesDescription());
+
+      REQUIRE(pc1.id() != pc2.id());
+      REQUIRE(pc1.id() != pc3.id());
+      REQUIRE(pc2.id() != pc3.id());
+
+      pc1.reduce();
+      pc2.reduce();
+      pc3.reduce();
+
+      CHECK(pc1.id() != pc2.id());
+      CHECK(pc1.id() == pc3.id());
+
+      // following behavior was originally tested in ProcessHistory_t
+      edm::ProcessConfiguration pc1Expected("reco", id, "CMSSW_15_0", edm::HardwareResourcesDescription());
+      CHECK(pc1 == pc1Expected);
+      CHECK(pc1.id() == pc1Expected.id());
+    }
+
+    SECTION("Hardware resources") {
+      edm::HardwareResourcesDescription hrd;
+      edm::ProcessConfiguration pc1("reco", id, "CMSSW_15_0_0", hrd);
+      hrd.microarchitecture = "fred";
+      edm::ProcessConfiguration pc2("reco", id, "CMSSW_15_0_0", hrd);
+
+      REQUIRE(pc1.id() != pc2.id());
+
+      pc1.reduce();
+      pc2.reduce();
+
+      CHECK(pc1.id() == pc2.id());
+
+      // following behavior was originally tested in ProcessHistory_t
+      edm::ProcessConfiguration pc2Expected("reco", id, "CMSSW_15_0", edm::HardwareResourcesDescription());
+      CHECK(pc2 == pc2Expected);
+      CHECK(pc2.id() == pc2Expected.id());
+    }
+  }
 }

FWCore/Integration/test/ProcessHistory_t.cpp

@@ -40,8 +40,6 @@ bool checkRunOrLumiEntry(edm::IndexIntoFile::RunOrLumiEntry const& rl,
   return true;
 }
 
-// TODO: add tests for HardwareResourcesDescription
-
 TEST_CASE("test ProcessHistory", "[ProcessHistory]") {
   edm::ProcessHistoryRegistry processHistoryRegistry;
   edm::ParameterSet dummyPset;
@@ -93,6 +91,9 @@ TEST_CASE("test ProcessHistory", "[ProcessHistory]") {
       edm::ProcessConfiguration pc6("HLT", psetID, "500yz872djk999patch10", edm::HardwareResourcesDescription());
       edm::ProcessConfiguration pc7("HLT", psetID, "xb500yz872djk999patch10", edm::HardwareResourcesDescription());
       edm::ProcessConfiguration pc8("HLT", psetID, "CMSSW_4_4_0_pre5", edm::HardwareResourcesDescription());
+      edm::HardwareResourcesDescription hrd;
+      hrd.microarchitecture = "fred";
+      edm::ProcessConfiguration pc9("HLT", psetID, "CMSSW_4_4_0_pre5", hrd);
 
       pc1.setProcessConfigurationID();
       pc2.setProcessConfigurationID();
@@ -102,6 +103,9 @@ TEST_CASE("test ProcessHistory", "[ProcessHistory]") {
       pc6.setProcessConfigurationID();
       pc7.setProcessConfigurationID();
       pc8.setProcessConfigurationID();
+      pc9.setProcessConfigurationID();
+
+      REQUIRE(pc9.id() != pc8.id());
 
       pc1.reduce();
       pc2.reduce();
@@ -111,6 +115,9 @@ TEST_CASE("test ProcessHistory", "[ProcessHistory]") {
       pc6.reduce();
       pc7.reduce();
       pc8.reduce();
+      pc9.reduce();
+
+      REQUIRE(pc9.id() == pc8.id());
 
       edm::ProcessConfiguration pc1expected("HLT", psetID, "", edm::HardwareResourcesDescription());
       edm::ProcessConfiguration pc2expected("HLT", psetID, "a", edm::HardwareResourcesDescription());
@@ -120,6 +127,7 @@ TEST_CASE("test ProcessHistory", "[ProcessHistory]") {
       edm::ProcessConfiguration pc6expected("HLT", psetID, "500yz872", edm::HardwareResourcesDescription());
       edm::ProcessConfiguration pc7expected("HLT", psetID, "xb500yz872", edm::HardwareResourcesDescription());
       edm::ProcessConfiguration pc8expected("HLT", psetID, "CMSSW_4_4", edm::HardwareResourcesDescription());
+      edm::ProcessConfiguration pc9expected = pc8expected;
 
       REQUIRE(pc1 == pc1expected);
       REQUIRE(pc2 == pc2expected);
@@ -129,6 +137,7 @@ TEST_CASE("test ProcessHistory", "[ProcessHistory]") {
       REQUIRE(pc6 == pc6expected);
       REQUIRE(pc7 == pc7expected);
       REQUIRE(pc8 == pc8expected);
+      REQUIRE(pc9 == pc9expected);
 
       REQUIRE(pc1.id() == pc1expected.id());
       REQUIRE(pc2.id() == pc2expected.id());
@@ -138,6 +147,7 @@ TEST_CASE("test ProcessHistory", "[ProcessHistory]") {
       REQUIRE(pc6.id() == pc6expected.id());
       REQUIRE(pc7.id() == pc7expected.id());
       REQUIRE(pc8.id() == pc8expected.id());
+      REQUIRE(pc9.id() == pc9expected.id());
 
       REQUIRE(pc7.id() != pc8expected.id());
     }