From dde084538cc8874cb571003824a5d96e2d611e04 Mon Sep 17 00:00:00 2001
From: appleb_m <martin.appleby@psi.ch+>
Date: Wed, 17 Jun 2026 11:40:20 +0200
Subject: [PATCH] updated workflows test

---
 tests/unit/daq/test_workflows.py | 43 ++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/tests/unit/daq/test_workflows.py b/tests/unit/daq/test_workflows.py
index 38543aec..067fb655 100644
--- a/tests/unit/daq/test_workflows.py
+++ b/tests/unit/daq/test_workflows.py
@@ -21,6 +21,7 @@ def mock_cfg():
     cfg = MagicMock()
     cfg.abr_meas_pos = "MEAS_POS"
     cfg.dtz = None
+    cfg.dtz_safe_position = None
     return cfg
 
 
@@ -47,6 +48,48 @@ def test_common_2rse(mock_devs, mock_cfg):
     assert mock_devs.aerotech_pos == ABR_POS_MOUNT
 
 
+def test_common_2rse_moves_detector_to_safe_position_when_configured(mock_devs, mock_cfg):
+    mock_cfg.dtz = 200
+    mock_cfg.dtz_safe_position = 600
+
+    common_2rse(mock_devs, mock_cfg)
+
+    mock_devs.bec_worker.det_z.assert_called_once_with(value=600)
+    _assert_bec_moved(mock_devs, BeamlineState.ROBOT_SAMPLE_EXCHANGE)
+
+
+def test_common_2rse_ignores_missing_detector_safe_position(mock_devs, mock_cfg):
+    mock_cfg.dtz = 200
+    mock_cfg.dtz_safe_position = None
+
+    common_2rse(mock_devs, mock_cfg)
+
+    mock_devs.bec_worker.det_z.assert_not_called()
+    _assert_bec_moved(mock_devs, BeamlineState.ROBOT_SAMPLE_EXCHANGE)
+
+
+def test_dc2sa_moves_detector_to_safe_position_when_configured(mock_devs, mock_cfg):
+    mock_cfg.dtz = 200
+    mock_cfg.dtz_safe_position = 600
+
+    dc2sa(mock_devs, mock_cfg)
+
+    mock_devs.bec_worker.det_z.assert_called_once_with(value=600)
+    _assert_bec_moved(mock_devs, BeamlineState.SAMPLE_ALIGNMENT)
+    assert mock_devs.aerotech_pos == mock_cfg.abr_meas_pos
+
+
+def test_dc2sa_ignores_missing_detector_safe_position(mock_devs, mock_cfg):
+    mock_cfg.dtz = 200
+    mock_cfg.dtz_safe_position = None
+
+    dc2sa(mock_devs, mock_cfg)
+
+    mock_devs.bec_worker.det_z.assert_not_called()
+    _assert_bec_moved(mock_devs, BeamlineState.SAMPLE_ALIGNMENT)
+    assert mock_devs.aerotech_pos == mock_cfg.abr_meas_pos
+
+
 def test_sa2se(mock_devs, mock_cfg):
     mock_devs.bec_worker = MagicMock()
     mock_devs.bec_worker.planner = MagicMock()