From 3d54a4aa2642ecf1bcbf14fb7f936e2d684f1f5a Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Tue, 6 Dec 2022 11:08:49 +0100
Subject: [PATCH] fix for tests ctb

---
 slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp | 8 ++++----
 slsDetectorSoftware/tests/test-CmdProxy.cpp               | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp b/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp
index 5bbe38e1e..3ead23a64 100644
--- a/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp
@@ -112,23 +112,23 @@ TEST_CASE("adcvpp", "[.cmd]") {
         {
             std::ostringstream oss;
             proxy.Call("adcvpp", {"1"}, -1, PUT, oss);
-            REQUIRE(oss.str() == "dac adcvpp 1\n");
+            REQUIRE(oss.str() == "adcvpp 1\n");
         }
         {
             std::ostringstream 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;
             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) {
             det.setADCVpp(prev_val[i], false, {i});
         }
     } else {
-        REQUIRE_THROWS(proxy.Call("dac adcvpp", {}, -1, GET));
+        REQUIRE_THROWS(proxy.Call("adcvpp", {}, -1, GET));
     }
 }
 
diff --git a/slsDetectorSoftware/tests/test-CmdProxy.cpp b/slsDetectorSoftware/tests/test-CmdProxy.cpp
index 74f06ba46..722a35ad6 100644
--- a/slsDetectorSoftware/tests/test-CmdProxy.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy.cpp
@@ -1867,7 +1867,7 @@ TEST_CASE("temp_fpga", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);
     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));
         std::ostringstream oss;
         REQUIRE_NOTHROW(proxy.Call("temp_fpga", {}, 0, GET, oss));
@@ -2098,7 +2098,7 @@ TEST_CASE("start", "[.cmd]") {
         proxy.Call("start", {}, -1, PUT, oss);
         REQUIRE(oss.str() == "start successful\n");
     }
-    {
+    if (det_type != defs::CHIPTESTBOARD) {
         std::ostringstream oss;
         proxy.Call("status", {}, -1, GET, oss);
         REQUIRE(oss.str() == "status running\n");
@@ -2133,7 +2133,7 @@ TEST_CASE("stop", "[.cmd]") {
     det.setPeriod(std::chrono::milliseconds(1));
     det.setNumberOfFrames(2000);
     det.startDetector();
-    {
+    if (det_type != defs::CHIPTESTBOARD) {
         std::ostringstream oss;
         proxy.Call("status", {}, -1, GET, oss);
         REQUIRE(oss.str() == "status running\n");
@@ -2176,7 +2176,7 @@ TEST_CASE("status", "[.cmd]") {
     det.setPeriod(std::chrono::milliseconds(1));
     det.setNumberOfFrames(2000);
     det.startDetector();
-    {
+    if (det_type != defs::CHIPTESTBOARD) {
         std::ostringstream oss;
         proxy.Call("status", {}, -1, GET, oss);
         REQUIRE(oss.str() == "status running\n");