More tests

Author: stephen-riggs

src/murfey/workflows/register_experiment_type_update.py

@@ -23,7 +23,7 @@ def run(
         dataCollectionGroupId=message["dcgid"],
         experimentTypeId=message["experiment_type_id"],
     )
-    dcgid = _transport_object.do_insert_data_collection_group(record).get(
+    dcgid = _transport_object.do_update_data_collection_group(record).get(
         "return_value", None
     )
 

tests/workflows/test_register_experiment_type_update.py

@@ -0,0 +1,46 @@
+from unittest.mock import MagicMock
+
+import pytest
+from pytest_mock import MockerFixture
+
+from murfey.workflows.register_experiment_type_update import run
+
+register_experiment_type_update_matrix = (0, 1, None)
+
+
+@pytest.mark.parametrize("insert_dcg", register_experiment_type_update_matrix)
+def test_run(
+    mocker: MockerFixture,
+    insert_dcg: int | None,
+):
+    # Mock the transport object functions
+    mock_transport_object = mocker.patch(
+        "murfey.workflows.register_experiment_type_update._transport_object"
+    )
+    mock_transport_object.do_update_data_collection_group.return_value = {
+        "return_value": insert_dcg,
+    }
+    mock_ispyb = mocker.patch(
+        "murfey.workflows.register_experiment_type_update.ISPyBDB"
+    )
+    mock_ispyb.DataCollectionGroup.return_value = "ispyb_dcg"
+
+    # Mock the Murfey database
+    mock_murfey_db = MagicMock()
+
+    # Run the function and check the results and calls
+    message = {
+        "dcgid": 1,
+        "experiment_type_id": 0,
+    }
+    result = run(message=message, murfey_db=mock_murfey_db)
+    mock_ispyb.DataCollectionGroup.assert_called_once_with(
+        dataCollectionGroupId=1, experimentTypeId=0
+    )
+    mock_transport_object.do_update_data_collection_group.assert_called_once_with(
+        "ispyb_dcg"
+    )
+    if insert_dcg is not None:
+        assert result == {"success": True}
+    else:
+        assert result == {"success": False, "requeue": True}

tests/workflows/tomo/test_tomo_metadata.py

@@ -135,12 +135,12 @@ def test_register_search_map_update_with_all_parameters(
     assert sm_final_parameters.y_location is not None
 
     # Check this would have updated ispyb
-    mock_transport.do_update_search_map.assert_called_with(1, new_parameters)
+    mock_transport.do_update_search_map.assert_any_call(1, new_parameters)
     new_parameters.x_location = sm_final_parameters.x_location
     new_parameters.y_location = sm_final_parameters.y_location
-    new_parameters.height_on_atlas = 40
-    new_parameters.width_on_atlas = 20
-    mock_transport.do_update_search_map.assert_called_with(1, new_parameters)
+    new_parameters.height_on_atlas = int(40 * 7.8)
+    new_parameters.width_on_atlas = int(20 * 7.8)
+    mock_transport.do_update_search_map.assert_any_call(1, new_parameters)
 
 
 @mock.patch("murfey.workflows.tomo.tomo_metadata._transport_object")