Skip to content

Commit bcd230a

Browse files
authored
[QC-1316] Shorten IL facility field (#2621)
* [QC-1316] Shorten IL facility field * fix tests * format
1 parent 5aa8355 commit bcd230a

File tree

2 files changed

+29
-4
lines changed

2 files changed

+29
-4
lines changed

Framework/src/CheckRunner.cxx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ std::string CheckRunner::createCheckRunnerFacility(std::string deviceName)
114114

115115
std::string CheckRunner::createSinkCheckRunnerName(InputSpec input)
116116
{
117-
std::string name(CheckRunner::createCheckRunnerIdString() + "-sink-");
117+
// we need a shorter name, thus we only use "qc-sink" and not "qc-check-sink"
118+
std::string name("qc-sink-");
118119
name += DataSpecUtils::label(input);
119120
return name;
120121
}

Framework/test/testInfrastructureGenerator.cxx

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,15 @@ TEST_CASE("qc_factory_remote_test")
190190
return d.name.find("qc-check") != std::string::npos &&
191191
d.inputs.size() == 1;
192192
});
193-
REQUIRE(checkRunnerCount == 6);
193+
REQUIRE(checkRunnerCount == 4);
194+
195+
auto checkSinkCount = std::count_if(
196+
workflow.begin(), workflow.end(),
197+
[](const DataProcessorSpec& d) {
198+
return d.name.find("qc-sink") != std::string::npos &&
199+
d.inputs.size() == 1;
200+
});
201+
REQUIRE(checkSinkCount == 2);
194202

195203
auto postprocessingTask = std::find_if(
196204
workflow.begin(), workflow.end(),
@@ -272,7 +280,15 @@ TEST_CASE("qc_factory_standalone_test")
272280
return d.name.find("qc-check") != std::string::npos &&
273281
d.inputs.size() == 1;
274282
});
275-
REQUIRE(checkRunnerCount == 5);
283+
REQUIRE(checkRunnerCount == 4);
284+
285+
auto checkSinkCount = std::count_if(
286+
workflow.begin(), workflow.end(),
287+
[](const DataProcessorSpec& d) {
288+
return d.name.find("qc-sink") != std::string::npos &&
289+
d.inputs.size() == 1;
290+
});
291+
REQUIRE(checkSinkCount == 1);
276292

277293
auto postprocessingTask = std::find_if(
278294
workflow.begin(), workflow.end(),
@@ -411,7 +427,15 @@ TEST_CASE("qc_infrastructure_remote_batch_test")
411427
return d.name.find("qc-check") != std::string::npos &&
412428
d.inputs.size() == 1;
413429
});
414-
REQUIRE(checkRunnerCount == 6);
430+
REQUIRE(checkRunnerCount == 4);
431+
432+
auto checkSinkCount = std::count_if(
433+
workflow.begin(), workflow.end(),
434+
[](const DataProcessorSpec& d) {
435+
return d.name.find("qc-sink") != std::string::npos &&
436+
d.inputs.size() == 1;
437+
});
438+
REQUIRE(checkSinkCount == 2);
415439

416440
auto postprocessingTask = std::find_if(
417441
workflow.begin(), workflow.end(),

0 commit comments

Comments
 (0)