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 for tests ctb

Browse Source
This commit is contained in:
maliakal_d 2022-12-06 11:08:49 +01:00
parent 3a89c2a61e
commit 3d54a4aa26
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp
View File

@ -112,23 +112,23 @@ TEST_CASE("adcvpp", "[.cmd]") {
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("adcvpp", {"1"}, -1, PUT, oss); proxy.Call("adcvpp", {"1"}, -1, PUT, oss);
REQUIRE(oss.str() == "dac adcvpp 1\n"); REQUIRE(oss.str() == "adcvpp 1\n");
} }
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("adcvpp", {"1140", "mv"}, -1, PUT, oss); proxy.Call("adcvpp", {"1140", "mv"}, -1, PUT, oss);
REQUIRE(oss.str() == "dac adcvpp 1140 mV\n"); REQUIRE(oss.str() == "adcvpp 1140 mV\n");
} }
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("adcvpp", {"mv"}, -1, GET, oss); proxy.Call("adcvpp", {"mv"}, -1, GET, oss);
REQUIRE(oss.str() == "dac adcvpp 1140 mV\n"); REQUIRE(oss.str() == "adcvpp 1140 mV\n");
} }
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {
det.setADCVpp(prev_val[i], false, {i}); det.setADCVpp(prev_val[i], false, {i});
} }
} else { } else {
REQUIRE_THROWS(proxy.Call("dac adcvpp", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("adcvpp", {}, -1, GET));
} }
} }

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

@ -1867,7 +1867,7 @@ TEST_CASE("temp_fpga", "[.cmd]") {
Detector det; Detector det;
CmdProxy proxy(&det); CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
if (det_type != defs::MOENCH) { if (det_type != defs::MOENCH && det_type != defs::CHIPTESTBOARD) {
REQUIRE_NOTHROW(proxy.Call("temp_fpga", {}, -1, GET)); REQUIRE_NOTHROW(proxy.Call("temp_fpga", {}, -1, GET));
std::ostringstream oss; std::ostringstream oss;
REQUIRE_NOTHROW(proxy.Call("temp_fpga", {}, 0, GET, oss)); REQUIRE_NOTHROW(proxy.Call("temp_fpga", {}, 0, GET, oss));
@ -2098,7 +2098,7 @@ TEST_CASE("start", "[.cmd]") {
proxy.Call("start", {}, -1, PUT, oss); proxy.Call("start", {}, -1, PUT, oss);
REQUIRE(oss.str() == "start successful\n"); REQUIRE(oss.str() == "start successful\n");
} }
{ if (det_type != defs::CHIPTESTBOARD) {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("status", {}, -1, GET, oss); proxy.Call("status", {}, -1, GET, oss);
REQUIRE(oss.str() == "status running\n"); REQUIRE(oss.str() == "status running\n");
@ -2133,7 +2133,7 @@ TEST_CASE("stop", "[.cmd]") {
det.setPeriod(std::chrono::milliseconds(1)); det.setPeriod(std::chrono::milliseconds(1));
det.setNumberOfFrames(2000); det.setNumberOfFrames(2000);
det.startDetector(); det.startDetector();
{ if (det_type != defs::CHIPTESTBOARD) {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("status", {}, -1, GET, oss); proxy.Call("status", {}, -1, GET, oss);
REQUIRE(oss.str() == "status running\n"); REQUIRE(oss.str() == "status running\n");
@ -2176,7 +2176,7 @@ TEST_CASE("status", "[.cmd]") {
det.setPeriod(std::chrono::milliseconds(1)); det.setPeriod(std::chrono::milliseconds(1));
det.setNumberOfFrames(2000); det.setNumberOfFrames(2000);
det.startDetector(); det.startDetector();
{ if (det_type != defs::CHIPTESTBOARD) {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("status", {}, -1, GET, oss); proxy.Call("status", {}, -1, GET, oss);
REQUIRE(oss.str() == "status running\n"); REQUIRE(oss.str() == "status running\n");