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

fix m3 tests

Browse Source
This commit is contained in:
maliakal_d 2022-12-06 10:52:33 +01:00
parent 4614e0873a
commit 8f68e395bd
2 changed files with 76 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp
View File

@ -40,8 +40,10 @@ TEST_CASE("savepattern", "[.cmd]") {
det_type == defs::MYTHEN3) { det_type == defs::MYTHEN3) {
REQUIRE_THROWS( REQUIRE_THROWS(
proxy.Call("savepattern", {"/tmp/pattern.txt"}, -1, GET)); proxy.Call("savepattern", {"/tmp/pattern.txt"}, -1, GET));
if (det.size() == 1) {
REQUIRE_NOTHROW( REQUIRE_NOTHROW(
proxy.Call("savepattern", {"/tmp/pattern.txt"}, -1, PUT)); proxy.Call("savepattern", {"/tmp/pattern.txt"}, -1, PUT));
}
} else { } else {
REQUIRE_THROWS( REQUIRE_THROWS(
proxy.Call("savepattern", {"/tmp/pattern.txt"}, -1, PUT)); proxy.Call("savepattern", {"/tmp/pattern.txt"}, -1, PUT));

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

@ -2302,6 +2302,9 @@ TEST_CASE("scan", "[.cmd]") {
// auto previous = det.getDAC(ind, false); // auto previous = det.getDAC(ind, false);
// auto notImplementedPrevious = det.getDAC(notImplementedInd, false); // auto notImplementedPrevious = det.getDAC(notImplementedInd, false);
if (det_type == defs::MYTHEN3 && det.size() > 1) {
;// scan only allowed for single module due to sync
} else {
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {ToString(ind), "500", "1500", "500"}, -1, PUT, oss); proxy.Call("scan", {ToString(ind), "500", "1500", "500"}, -1, PUT, oss);
@ -2378,6 +2381,7 @@ TEST_CASE("scan", "[.cmd]") {
// det.setDAC(notImplementedInd, notImplementedPrevious[i], false, // det.setDAC(notImplementedInd, notImplementedPrevious[i], false,
// {i}); // {i});
// } // }
}
} }
TEST_CASE("scanerrmsg", "[.cmd]") { TEST_CASE("scanerrmsg", "[.cmd]") {