From 18cd363f8f861132bd2c0284466728aaa6516b89 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Wed, 23 Sep 2020 16:34:18 +0200 Subject: [PATCH] tests in --- .../tests/test-CmdProxy-rx.cpp | 44 +++++++++---------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp b/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp index 464edaaa9..c3e7117be 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp @@ -495,29 +495,27 @@ TEST_CASE("fwrite", "[.cmd][.new]") { } } -// TEST_CASE("fmaster", "[.cmd][.new]") { -// Detector det; -// CmdProxy proxy(&det); -// auto prev_val = det.getMasterFileWrite(); -// { -// std::ostringstream oss; -// proxy.Call("fmaster", {"0"}, -1, PUT, oss); -// REQUIRE(oss.str() == "fmaster 0\n"); -// } -// { -// std::ostringstream oss; -// proxy.Call("fmaster", {}, -1, GET, oss); -// REQUIRE(oss.str() == "fmaster 0\n"); -// } -// { -// std::ostringstream oss; -// proxy.Call("fmaster", {"1"}, -1, PUT, oss); -// REQUIRE(oss.str() == "fmaster 1\n"); -// } -// for (int i = 0; i != det.size(); ++i) { -// det.setMasterFileWrite(prev_val[i], {i}); -// } -// } +TEST_CASE("fmaster", "[.cmd]") { + Detector det; + CmdProxy proxy(&det); + auto prev_val = det.getMasterFileWrite(); + { + std::ostringstream oss; + proxy.Call("fmaster", {"0"}, -1, PUT, oss); + REQUIRE(oss.str() == "fmaster 0\n"); + } + { + std::ostringstream oss; + proxy.Call("fmaster", {}, -1, GET, oss); + REQUIRE(oss.str() == "fmaster 0\n"); + } + { + std::ostringstream oss; + proxy.Call("fmaster", {"1"}, -1, PUT, oss); + REQUIRE(oss.str() == "fmaster 1\n"); + } + det.setMasterFileWrite(prev_val); +} TEST_CASE("foverwrite", "[.cmd][.new]") { Detector det;