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

fix tests to not allow setting udp interfaces at a single module level

Browse Source
This commit is contained in:
maliakal_d 2022-12-06 10:08:23 +01:00
parent 1cc7d512e0
commit f8a612c0e2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/tests/test-CmdProxy-rx.cpp
View File

@ -163,6 +163,7 @@ TEST_CASE("rx_missingpackets", "[.cmd][.rx]") {
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {
det.setFileWrite(prev_val[i], {i}); det.setFileWrite(prev_val[i], {i});
} }
det.setNumberOfFrames(prev_frames);
} }
TEST_CASE("rx_frameindex", "[.cmd][.rx]") { TEST_CASE("rx_frameindex", "[.cmd][.rx]") {
@ -797,7 +798,7 @@ TEST_CASE("rx_zmqport", "[.cmd][.rx]") {
Detector det; Detector det;
CmdProxy proxy(&det); CmdProxy proxy(&det);
auto prev_val_zmqport = det.getRxZmqPort(); auto prev_val_zmqport = det.getRxZmqPort();
auto prev_val_numinterfaces = det.getNumberofUDPInterfaces(); auto prev_val_numinterfaces = det.getNumberofUDPInterfaces().tsquash("inconsistent number of udp interfaces to test");
int socketsperdetector = 1; int socketsperdetector = 1;
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
@ -827,9 +828,9 @@ TEST_CASE("rx_zmqport", "[.cmd][.rx]") {
} }
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {
det.setRxZmqPort(prev_val_zmqport[i], i); det.setRxZmqPort(prev_val_zmqport[i], i);
if (det_type == defs::JUNGFRAU) {
det.setNumberofUDPInterfaces(prev_val_numinterfaces[i], {i});
} }
if (det_type == defs::JUNGFRAU) {
det.setNumberofUDPInterfaces(prev_val_numinterfaces);
} }
} }

7
slsDetectorSoftware/tests/test-CmdProxy.cpp
View File

@ -28,7 +28,6 @@ TEST_CASE("Calling help doesn't throw or cause segfault") {
} }
TEST_CASE("Unknown command", "[.cmd]") { TEST_CASE("Unknown command", "[.cmd]") {
Detector det; Detector det;
CmdProxy proxy(&det); CmdProxy proxy(&det);
REQUIRE_THROWS(proxy.Call("vsaevrreavv", {}, -1, PUT)); REQUIRE_THROWS(proxy.Call("vsaevrreavv", {}, -1, PUT));
@ -572,7 +571,7 @@ TEST_CASE("fliprows", "[.cmd]") {
} }
if (det_type == defs::EIGER || jungfrauhw2) { if (det_type == defs::EIGER || jungfrauhw2) {
auto previous = det.getFlipRows(); auto previous = det.getFlipRows();
auto previous_numudp = det.getNumberofUDPInterfaces(); auto previous_numudp = det.getNumberofUDPInterfaces().tsquash("inconsistent number of udp interfaces to test");
if (det_type == defs::JUNGFRAU) { if (det_type == defs::JUNGFRAU) {
det.setNumberofUDPInterfaces(2); det.setNumberofUDPInterfaces(2);
} }
@ -585,9 +584,9 @@ TEST_CASE("fliprows", "[.cmd]") {
REQUIRE(oss3.str() == "fliprows 0\n"); REQUIRE(oss3.str() == "fliprows 0\n");
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {
det.setFlipRows(previous[i], {i}); det.setFlipRows(previous[i], {i});
if (det_type == defs::JUNGFRAU) {
det.setNumberofUDPInterfaces(previous_numudp[i], {i});
} }
if (det_type == defs::JUNGFRAU) {
det.setNumberofUDPInterfaces(previous_numudp);
} }
} else { } else {
REQUIRE_THROWS(proxy.Call("fliprows", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("fliprows", {}, -1, GET));