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

fixed tests

Browse Source
This commit is contained in:
Erik Frojdh 2020-07-24 15:45:21 +02:00
parent cf2e1c1dfc
commit 21c8b77e2c
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@ TEST_CASE("rx_version", "[.cmd][.rx][.new]") {
TEST_CASE("rx_start", "[.cmd][.rx][.new]") { TEST_CASE("rx_start", "[.cmd][.rx][.new]") {
Detector det; Detector det;
CmdProxy proxy(&det); CmdProxy proxy(&det);
det.setFileWrite(false); //avoid writing or error on file creation
// PUT only command // PUT only command
REQUIRE_THROWS(proxy.Call("rx_start", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("rx_start", {}, -1, GET));
{ {
@ -69,6 +70,7 @@ TEST_CASE("rx_stop", "[.cmd][.rx][.new]") {
TEST_CASE("rx_status", "[.cmd][.rx][.new]") { TEST_CASE("rx_status", "[.cmd][.rx][.new]") {
Detector det; Detector det;
det.setFileWrite(false); //avoid writing or error on file creation
CmdProxy proxy(&det); CmdProxy proxy(&det);
det.startReceiver(); det.startReceiver();
{ {
@ -89,6 +91,7 @@ TEST_CASE("rx_framescaught", "[.cmd][.rx][.new]") {
CmdProxy proxy(&det); CmdProxy proxy(&det);
// This ensures 0 caught frames // This ensures 0 caught frames
det.setFileWrite(false); //avoid writing or error on file creation
det.startReceiver(); det.startReceiver();
det.stopReceiver(); det.stopReceiver();
{ {
@ -110,6 +113,7 @@ TEST_CASE("rx_framescaught", "[.cmd][.rx][.new]") {
TEST_CASE("rx_missingpackets", "[.cmd][.rx][.new]") { TEST_CASE("rx_missingpackets", "[.cmd][.rx][.new]") {
Detector det; Detector det;
det.setFileWrite(false); //avoid writing or error on file creation
CmdProxy proxy(&det); CmdProxy proxy(&det);
{ {
// some missing packets // some missing packets

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

@ -1267,53 +1267,53 @@ TEST_CASE("scan", "[.cmd][.new]") {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {sls::ToString(ind), "500", "1500", "500"}, -1, PUT, proxy.Call("scan", {sls::ToString(ind), "500", "1500", "500"}, -1, PUT,
oss); oss);
REQUIRE(oss.str() == CHECK(oss.str() ==
"scan [" + sls::ToString(ind) + ", 500, 1500, 500]\n"); "scan [" + sls::ToString(ind) + ", 500, 1500, 500]\n");
} }
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {}, -1, GET, oss); proxy.Call("scan", {}, -1, GET, oss);
REQUIRE(oss.str() == "scan [[enabled\ndac " + sls::ToString(ind) + CHECK(oss.str() == "scan [enabled\ndac " + sls::ToString(ind) +
"\nstart 500\nstop 1500\nstep " "\nstart 500\nstop 1500\nstep "
"500\nsettleTime 1ms\n]]\n"); "500\nsettleTime 1ms\n]\n");
} }
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {sls::ToString(ind), "500", "1500", "500", "2s"}, -1, proxy.Call("scan", {sls::ToString(ind), "500", "1500", "500", "2s"}, -1,
PUT, oss); PUT, oss);
REQUIRE(oss.str() == CHECK(oss.str() ==
"scan [" + sls::ToString(ind) + ", 500, 1500, 500, 2s]\n"); "scan [" + sls::ToString(ind) + ", 500, 1500, 500, 2s]\n");
} }
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {}, -1, GET, oss); proxy.Call("scan", {}, -1, GET, oss);
REQUIRE(oss.str() == "scan [[enabled\ndac " + sls::ToString(ind) + CHECK(oss.str() == "scan [enabled\ndac " + sls::ToString(ind) +
"\nstart 500\nstop 1500\nstep " "\nstart 500\nstop 1500\nstep "
"500\nsettleTime 2s\n]]\n"); "500\nsettleTime 2s\n]\n");
} }
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {"0"}, -1, PUT, oss); proxy.Call("scan", {"0"}, -1, PUT, oss);
REQUIRE(oss.str() == "scan [0]\n"); CHECK(oss.str() == "scan [0]\n");
} }
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {}, -1, GET, oss); proxy.Call("scan", {}, -1, GET, oss);
REQUIRE(oss.str() == "scan [[disabled]]\n"); CHECK(oss.str() == "scan [disabled]\n");
} }
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {sls::ToString(ind), "1500", "500", "-500"}, -1, PUT, proxy.Call("scan", {sls::ToString(ind), "1500", "500", "-500"}, -1, PUT,
oss); oss);
REQUIRE(oss.str() == CHECK(oss.str() ==
"scan [" + sls::ToString(ind) + ", 1500, 500, -500]\n"); "scan [" + sls::ToString(ind) + ", 1500, 500, -500]\n");
} }
REQUIRE_THROWS(proxy.Call( CHECK_THROWS(proxy.Call(
"scan", {sls::ToString(notImplementedInd), "500", "1500", "500"}, -1, "scan", {sls::ToString(notImplementedInd), "500", "1500", "500"}, -1,
PUT)); PUT));
REQUIRE_THROWS(proxy.Call( CHECK_THROWS(proxy.Call(
"scan", {sls::ToString(ind), "500", "1500", "-500"}, -1, PUT)); "scan", {sls::ToString(ind), "500", "1500", "-500"}, -1, PUT));
REQUIRE_THROWS(proxy.Call( CHECK_THROWS(proxy.Call(
"scan", {sls::ToString(ind), "1500", "500", "500"}, -1, PUT)); "scan", {sls::ToString(ind), "1500", "500", "500"}, -1, PUT));
if (det_type == defs::MYTHEN3 || defs::EIGER) { if (det_type == defs::MYTHEN3 || defs::EIGER) {
@ -1321,16 +1321,19 @@ TEST_CASE("scan", "[.cmd][.new]") {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {"trimbit_scan", "0", "63", "16", "2s"}, -1, PUT, proxy.Call("scan", {"trimbit_scan", "0", "63", "16", "2s"}, -1, PUT,
oss); oss);
REQUIRE(oss.str() == "scan [trimbit_scan, 0, 63, 16, 2s]\n"); CHECK(oss.str() == "scan [trimbit_scan, 0, 63, 16, 2s]\n");
} }
{ {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("scan", {}, -1, GET, oss); proxy.Call("scan", {}, -1, GET, oss);
REQUIRE(oss.str() == CHECK(oss.str() ==
"scan [[enabled\ndac trimbit_scan\nstart 0\nstop 48\nstep " "scan [enabled\ndac trimbit_scan\nstart 0\nstop 48\nstep "
"16\nsettleTime 2s\n]]\n"); "16\nsettleTime 2s\n]\n");
} }
} }
//Switch off scan for future tests
det.setScan(defs::scanParameters());
// acquire for each? // acquire for each?
// when taking acquisition // when taking acquisition
@ -1825,7 +1828,7 @@ TEST_CASE("adcreg", "[.cmd]") {
if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD || if (det_type == defs::JUNGFRAU || det_type == defs::CHIPTESTBOARD ||
det_type == defs::MOENCH || det_type == defs::GOTTHARD) { det_type == defs::MOENCH || det_type == defs::GOTTHARD) {
std::ostringstream oss; std::ostringstream oss;
proxy.Call("adcreg", {"0x08", "0x3"}, -1, PUT, oss); proxy.Call("adcreg", {"0x8", "0x3"}, -1, PUT, oss);
REQUIRE(oss.str() == "adcreg [0x8, 0x3]\n"); REQUIRE(oss.str() == "adcreg [0x8, 0x3]\n");
// This is a put only command // This is a put only command
REQUIRE_THROWS(proxy.Call("adcreg", {}, -1, GET)); REQUIRE_THROWS(proxy.Call("adcreg", {}, -1, GET));