detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 15:20:02 +02:00
Code Issues Actions Packages Releases Activity

fix tests to not allow setting veto stream at a single module level

Browse Source
This commit is contained in:
maliakal_d 2022-12-06 10:21:45 +01:00
parent e02b11fd1e
commit 984a59a9d7
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp
View File

@ -33,7 +33,7 @@ TEST_CASE("timegotthard2", "[.cmd]") {
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("exptime", {}, -1, GET, oss); proxy.Call("exptime", {}, -1, GET, oss);
REQUIRE(oss.str() == "exptime 222ns\n"); REQUIRE(oss.str() == "exptime 221ns\n");
} }
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {
det.setExptime(prev_val[i], {i}); det.setExptime(prev_val[i], {i});
@ -48,7 +48,7 @@ TEST_CASE("timegotthard2", "[.cmd]") {
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("burstperiod", {}, -1, GET, oss); proxy.Call("burstperiod", {}, -1, GET, oss);
REQUIRE(oss.str() == "burstperiod 222ns\n"); REQUIRE(oss.str() == "burstperiod 221ns\n");
} }
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {
det.setBurstPeriod(prev_val[i], {i}); det.setBurstPeriod(prev_val[i], {i});
@ -63,7 +63,7 @@ TEST_CASE("timegotthard2", "[.cmd]") {
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("delay", {}, -1, GET, oss); proxy.Call("delay", {}, -1, GET, oss);
REQUIRE(oss.str() == "delay 222ns\n"); REQUIRE(oss.str() == "delay 221ns\n");
} }
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {
det.setDelayAfterTrigger(prev_val[i], {i}); det.setDelayAfterTrigger(prev_val[i], {i});
@ -80,7 +80,7 @@ TEST_CASE("timegotthard2", "[.cmd]") {
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("period", {}, -1, GET, oss); proxy.Call("period", {}, -1, GET, oss);
REQUIRE(oss.str() == "period 222ns\n"); REQUIRE(oss.str() == "period 221ns\n");
} }
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {
det.setPeriod(prev_val[i], {i}); det.setPeriod(prev_val[i], {i});
@ -96,7 +96,7 @@ TEST_CASE("timegotthard2", "[.cmd]") {
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("period", {}, -1, GET, oss); proxy.Call("period", {}, -1, GET, oss);
REQUIRE(oss.str() == "period 222ns\n"); REQUIRE(oss.str() == "period 221ns\n");
} }
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {
det.setPeriod(prev_val[i], {i}); det.setPeriod(prev_val[i], {i});
@ -586,7 +586,7 @@ TEST_CASE("vetostream", "[.cmd]") {
CmdProxy proxy(&det); CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
if (det_type == defs::GOTTHARD2) { if (det_type == defs::GOTTHARD2) {
auto prev_val = det.getVetoStream(); auto prev_val = det.getVetoStream().tsquash("inconsistent veto stream to test");
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("vetostream", {"none"}, -1, PUT, oss); proxy.Call("vetostream", {"none"}, -1, PUT, oss);
@ -618,9 +618,7 @@ TEST_CASE("vetostream", "[.cmd]") {
REQUIRE(oss.str() == "vetostream lll, 10gbe\n"); REQUIRE(oss.str() == "vetostream lll, 10gbe\n");
} }
REQUIRE_THROWS(proxy.Call("vetostream", {"lll", "none"}, -1, PUT)); REQUIRE_THROWS(proxy.Call("vetostream", {"lll", "none"}, -1, PUT));
for (int i = 0; i != det.size(); ++i) { det.setVetoStream(prev_val);
det.setVetoStream(prev_val[i], {i});
}
} else { } else {
REQUIRE_THROWS(proxy.Call("vetostream", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("vetostream", {}, -1, GET));
REQUIRE_THROWS(proxy.Call("vetostream", {"none"}, -1, PUT)); REQUIRE_THROWS(proxy.Call("vetostream", {"none"}, -1, PUT));