more involved test updates

cms-sw · Sep 14, 2023 · 5c19593 · 5c19593
1 parent bdbdddd
commit 5c19593
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/FWCore/Integration/test/ProcessAccelerator_t.cpp b/FWCore/Integration/test/ProcessAccelerator_t.cpp
@@ -128,12 +128,14 @@ TEST_CASE("Configuration with SwitchProducer", s_tag) {
   const std::string baseConfigTest2Disabled_test2 = makeSwitchConfig(false, test1, test2, "test2");
 
   SECTION("Configuration hash is not changed") {
-    auto pset_auto = edm::readConfig(baseConfig_auto);
-    auto pset_test1 = edm::readConfig(baseConfig_test1);
-    auto pset_test2 = edm::readConfig(baseConfig_test2);
-    auto psetTest2Disabled_auto = edm::readConfig(baseConfigTest2Disabled_auto);
-    auto psetTest2Disabled_test1 = edm::readConfig(baseConfigTest2Disabled_test1);
-    auto psetTest2Disabled_test2 = edm::readConfig(baseConfigTest2Disabled_test2);
+    std::unique_ptr<edm::ParameterSet> pset_auto, pset_test1, pset_test2;
+    std::unique_ptr<edm::ParameterSet> psetTest2Disabled_auto, psetTest2Disabled_test1, psetTest2Disabled_test2;
+    edm::makeParameterSets(baseConfig_auto, pset_auto);
+    edm::makeParameterSets(baseConfig_test1, pset_test1);
+    edm::makeParameterSets(baseConfig_test2, pset_test2);
+    edm::makeParameterSets(baseConfigTest2Disabled_auto, psetTest2Disabled_auto);
+    edm::makeParameterSets(baseConfigTest2Disabled_test1, psetTest2Disabled_test1);
+    edm::makeParameterSets(baseConfigTest2Disabled_test2, psetTest2Disabled_test2);
     pset_auto->registerIt();
     pset_test1->registerIt();
     pset_test2->registerIt();
@@ -224,14 +226,16 @@ TEST_CASE("Configuration with ModuleTypeResolver", s_tag) {
   const std::string baseConfigOtherDisabled_other = makeResolverConfig(false, "other", "");
 
   SECTION("Configuration hash is not changed") {
-    auto pset_auto = edm::readConfig(baseConfig_auto);
-    auto pset_cpu = edm::readConfig(baseConfig_cpu);
-    auto pset_other = edm::readConfig(baseConfig_other);
-    auto pset_cpuExplicit = edm::readConfig(baseConfig_cpuExplicit);
-    auto pset_otherExplicit = edm::readConfig(baseConfig_otherExplicit);
-    auto psetOtherDisabled_auto = edm::readConfig(baseConfigOtherDisabled_auto);
-    auto psetOtherDisabled_cpu = edm::readConfig(baseConfigOtherDisabled_cpu);
-    REQUIRE_THROWS_WITH(edm::readConfig(baseConfigOtherDisabled_other), Catch::Contains("UnavailableAccelerator"));
+    std::unique_ptr<edm::ParameterSet> pset_auto, pset_cpu, pset_other, pset_cpuExplicit;
+    std::unique_ptr<edm::ParameterSet> pset_otherExplicit, psetOtherDisabled_auto, psetOtherDisabled_cpu, psetOtherDisabled_other;
+    edm::makeParameterSets(baseConfig_auto, pset_auto);
+    edm::makeParameterSets(baseConfig_cpu, pset_cpu);
+    edm::makeParameterSets(baseConfig_other, pset_other);
+    edm::makeParameterSets(baseConfig_cpuExplicit, pset_cpuExplicit);
+    edm::makeParameterSets(baseConfig_otherExplicit, pset_otherExplicit);
+    edm::makeParameterSets(baseConfigOtherDisabled_auto, psetOtherDisabled_auto);
+    edm::makeParameterSets(baseConfigOtherDisabled_cpu, psetOtherDisabled_cpu);
+    REQUIRE_THROWS_WITH(edm::makeParameterSets(baseConfigOtherDisabled_other, psetOtherDisabled_other), Catch::Contains("UnavailableAccelerator"));
     pset_auto->registerIt();
     pset_cpu->registerIt();
     pset_other->registerIt();

diff --git a/FWCore/Integration/test/SwitchProducer_t.cpp b/FWCore/Integration/test/SwitchProducer_t.cpp
@@ -51,8 +51,9 @@ TEST_CASE("Configuration", s_tag) {
   const std::string baseConfigTest2Disabled = makeConfig(false, test1, test2);
 
   SECTION("Configuration hash is not changed") {
-    auto pset = edm::readConfig(baseConfig);
-    auto psetTest2Disabled = edm::readConfig(baseConfigTest2Disabled);
+    std::unique_ptr<edm::ParameterSet> pset, psetTest2Disabled;
+    edm::makeParameterSets(baseConfig, pset);
+    edm::makeParameterSets(baseConfigTest2Disabled, psetTest2Disabled);
     pset->registerIt();
     psetTest2Disabled->registerIt();
     REQUIRE(pset->id() == psetTest2Disabled->id());
@@ -107,8 +108,9 @@ TEST_CASE("Configuration with EDAlias", s_tag) {
   const std::string baseConfigTest2Disabled = makeConfig(false, test1, test2, otherprod, othername);
 
   SECTION("Configuration hash is not changed") {
-    auto pset = edm::readConfig(baseConfig);
-    auto psetTest2Disabled = edm::readConfig(baseConfigTest2Disabled);
+    std::unique_ptr<edm::ParameterSet> pset, psetTest2Disabled;
+    edm::makeParameterSets(baseConfig, pset);
+    edm::makeParameterSets(baseConfigTest2Disabled, psetTest2Disabled);
     pset->registerIt();
     psetTest2Disabled->registerIt();
     REQUIRE(pset->id() == psetTest2Disabled->id());

diff --git a/HeterogeneousCore/CUDACore/test/test_ProcessAcceleratorCUDA.cc b/HeterogeneousCore/CUDACore/test/test_ProcessAcceleratorCUDA.cc
@@ -42,9 +42,10 @@ TEST_CASE("Configuration", s_tag) {
   const std::string baseConfig_cuda = makeConfig(test1, test2, "'gpu-nvidia'");
 
   SECTION("Configuration hash is not changed") {
-    auto pset_auto = edm::readConfig(baseConfig_auto);
-    auto pset_cpu = edm::readConfig(baseConfig_cpu);
-    auto pset_cuda = edm::readConfig(baseConfig_cuda);
+    std::unique_ptr<edm::ParameterSet> pset_auto, pset_cpu, pset_cuda;
+    edm::makeParameterSets(baseConfig_auto, pset_auto);
+    edm::makeParameterSets(baseConfig_cpu, pset_cpu);
+    edm::makeParameterSets(baseConfig_cuda, pset_cuda);
     pset_auto->registerIt();
     pset_cpu->registerIt();
     pset_cuda->registerIt();