detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 17:19:20 +01:00
Code Issues Actions Packages Releases Activity

Fix tests (#647)

Browse Source 
* fixes tests
This commit is contained in:
Dhanya Thattil
2023-02-09 15:57:05 +01:00
committed by GitHub
parent 8158ef876c
commit e14f6981a0
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,12 +186,14 @@ TEST_CASE("patloop", "[.cmd]") {
{
std::ostringstream oss;
proxy.Call("patloop", {sLoop, "0x20", "0x5c"}, -1, PUT, oss);
REQUIRE(oss.str() == "patloop [0x0020, 0x005c]\n");
REQUIRE(oss.str() ==
"patloop " + sLoop + " [0x0020, 0x005c]\n");
}
{
std::ostringstream oss;
proxy.Call("patloop", {sLoop}, -1, GET, oss);
REQUIRE(oss.str() == "patloop [0x0020, 0x005c]\n");
REQUIRE(oss.str() ==
"patloop " + sLoop + " [0x0020, 0x005c]\n");
}
for (int iDet = 0; iDet != det.size(); ++iDet) {
det.setPatternLoopAddresses(iLoop, prev_val[iDet][0],
@@ -233,12 +235,12 @@ TEST_CASE("patnloop", "[.cmd]") {
{
std::ostringstream oss;
proxy.Call("patnloop", {sLoop, "5"}, -1, PUT, oss);
REQUIRE(oss.str() == "patnloop 5\n");
REQUIRE(oss.str() == "patnloop " + sLoop + " 5\n");
}
{
std::ostringstream oss;
proxy.Call("patnloop", {sLoop}, -1, GET, oss);
REQUIRE(oss.str() == "patnloop 5\n");
REQUIRE(oss.str() == "patnloop " + sLoop + " 5\n");
}
for (int iDet = 0; iDet != det.size(); ++iDet) {
det.setPatternLoopCycles(iLoop, prev_val[iDet], {iDet});
@@ -279,12 +281,12 @@ TEST_CASE("patwait", "[.cmd]") {
{
std::ostringstream oss;
proxy.Call("patwait", {sLoop, "0x5c"}, -1, PUT, oss);
REQUIRE(oss.str() == "patwait 0x005c\n");
REQUIRE(oss.str() == "patwait " + sLoop + " 0x005c\n");
}
{
std::ostringstream oss;
proxy.Call("patwait", {sLoop}, -1, GET, oss);
REQUIRE(oss.str() == "patwait 0x005c\n");
REQUIRE(oss.str() == "patwait " + sLoop + " 0x005c\n");
}
for (int iDet = 0; iDet != det.size(); ++iDet) {
det.setPatternWaitAddr(iLoop, prev_val[iDet], {iDet});
@@ -325,12 +327,12 @@ TEST_CASE("patwaittime", "[.cmd]") {
{
std::ostringstream oss;
proxy.Call("patwaittime", {sLoop, "8589936640"}, -1, PUT, oss);
REQUIRE(oss.str() == "patwaittime 8589936640\n");
REQUIRE(oss.str() == "patwaittime " + sLoop + " 8589936640\n");
}
{
std::ostringstream oss;
proxy.Call("patwaittime", {sLoop}, -1, GET, oss);
REQUIRE(oss.str() == "patwaittime 8589936640\n");
REQUIRE(oss.str() == "patwaittime " + sLoop + " 8589936640\n");
}
for (int iDet = 0; iDet != det.size(); ++iDet) {
det.setPatternWaitTime(iLoop, prev_val[iDet], {iDet});

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

@@ -1269,7 +1269,7 @@ TEST_CASE("clkphase", "[.cmd]") {
}
std::string s_deg_val = "15";
if (det_type == defs::MYTHEN3) {
s_deg_val = "15";
s_deg_val = "14";
} else if (det_type == defs::GOTTHARD2) {
s_deg_val = "23";
}