From e14f6981a023fc593c597f77c34a8cc23dc81e53 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil <33750417+thattil@users.noreply.github.com> Date: Thu, 9 Feb 2023 15:57:05 +0100 Subject: [PATCH] Fix tests (#647) * fixes tests --- slsDetectorSoftware/src/CmdProxy.cpp | 13 +++++++++---- .../tests/test-CmdProxy-pattern.cpp | 18 ++++++++++-------- slsDetectorSoftware/tests/test-CmdProxy.cpp | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index f222c56fd..3f8f4f153 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -2855,7 +2855,8 @@ std::string CmdProxy::PatternLoopAddresses(int action) { if (cmd != "patlimits") { GetLevelAndUpdateArgIndex(action, "patloop", level, iArg, nGetArgs, nPutArgs); - os << level << ' '; + if (cmd != "patloop0" && cmd != "patloop1" && cmd != "patloop2") + os << level << ' '; } if (action == defs::GET_ACTION) { auto t = @@ -2895,7 +2896,8 @@ std::string CmdProxy::PatternLoopCycles(int action) { int level = -1, iArg = 0, nGetArgs = 0, nPutArgs = 1; GetLevelAndUpdateArgIndex(action, "patnloop", level, iArg, nGetArgs, nPutArgs); - os << level << ' '; + if (cmd != "patnloop0" && cmd != "patnloop1" && cmd != "patnloop2") + os << level << ' '; if (action == defs::GET_ACTION) { auto t = det->getPatternLoopCycles(level, std::vector{det_id}); os << OutString(t) << '\n'; @@ -2930,7 +2932,8 @@ std::string CmdProxy::PatternWaitAddress(int action) { int level = -1, iArg = 0, nGetArgs = 0, nPutArgs = 1; GetLevelAndUpdateArgIndex(action, "patwait", level, iArg, nGetArgs, nPutArgs); - os << level << ' '; + if (cmd != "patwait0" && cmd != "patwait1" && cmd != "patwait2") + os << level << ' '; if (action == defs::GET_ACTION) { auto t = det->getPatternWaitAddr(level, std::vector{det_id}); os << OutStringHex(t, 4) << '\n'; @@ -2964,7 +2967,9 @@ std::string CmdProxy::PatternWaitTime(int action) { int level = -1, iArg = 0, nGetArgs = 0, nPutArgs = 1; GetLevelAndUpdateArgIndex(action, "patwaittime", level, iArg, nGetArgs, nPutArgs); - os << level << ' '; + if (cmd != "patwaittime0" && cmd != "patwaittime1" && + cmd != "patwaittime2") + os << level << ' '; if (action == defs::GET_ACTION) { auto t = det->getPatternWaitTime(level, std::vector{det_id}); os << OutString(t) << '\n'; diff --git a/slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp b/slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp index 5e5fc2a67..8110a190f 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp @@ -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}); diff --git a/slsDetectorSoftware/tests/test-CmdProxy.cpp b/slsDetectorSoftware/tests/test-CmdProxy.cpp index 574877b41..eef9abeac 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy.cpp @@ -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"; }