Update tests

Author: stephen-riggs

recipes/em-tomo-align.json

@@ -6,8 +6,8 @@
       "ispyb_command": "insert_tomogram",
       "program_id": "{appid}",
       "store_result": "ispyb_tomogram_id",
-      "x_location": "{x_location}",
-      "y_location": "{y_location}",
+      "pixel_location_x": "{x_location}",
+      "pixel_location_y": "{y_location}",
       "grid_square_id": "{search_map_id}"
     },
     "queue": "ispyb_connector",

tests/util/test_ispyb_commands.py

@@ -3,9 +3,15 @@
 from datetime import datetime
 from unittest import mock
 
+from sqlalchemy.exc import SQLAlchemyError
+
 from cryoemservices.util import ispyb_commands
 
 
+def raise_sql_error(mock_call):
+    raise SQLAlchemyError("Mock error")
+
+
 @mock.patch("cryoemservices.util.ispyb_commands.models")
 def test_insert_movie_id_notime(mock_models):
     def mock_movie_parameters(p):
@@ -699,6 +705,9 @@ def mock_tomogram_parameters(p):
             "proj_xy": "/path/to/xy",
             "proj_xz": "/path/to/xz",
             "alignment_quality": 0.2,
+            "grid_square_id": 12345,
+            "pixel_location_x": 200,
+            "pixel_location_y": 400,
         }
         return tomogram_parameters[p]
 
@@ -738,6 +747,9 @@ def mock_tomogram_parameters(p):
         projXY="/path/to/xy",
         projXZ="/path/to/xz",
         globalAlignmentQuality=0.2,
+        gridSquareId=12345,
+        pixelLocationX=200,
+        pixelLocationY=400,
     )
     mock_session.add.assert_called()
     mock_session.commit.assert_called()
@@ -767,6 +779,9 @@ def mock_tomogram_parameters(p):
             "proj_xy": "/path/to/xy",
             "proj_xz": "/path/to/xz",
             "alignment_quality": 0.2,
+            "grid_square_id": 12345,
+            "pixel_location_x": 200,
+            "pixel_location_y": 400,
         }
         return tomogram_parameters[p]
 
@@ -807,12 +822,30 @@ def mock_tomogram_parameters(p):
             "projXY": "/path/to/xy",
             "projXZ": "/path/to/xz",
             "globalAlignmentQuality": 0.2,
+            "gridSquareId": 12345,
+            "pixelLocationX": 200,
+            "pixelLocationY": 400,
         }
     )
     mock_session.add.assert_not_called()
     mock_session.commit.assert_called()
 
 
+def test_insert_tomogram_failure():
+    def mock_tomogram_parameters(p):
+        return None
+
+    # Mock which returns an existing object
+    mock_session = mock.MagicMock()
+    mock_session.add.side_effect = raise_sql_error
+
+    return_value = ispyb_commands.insert_tomogram(
+        {}, mock_tomogram_parameters, mock_session
+    )
+    assert return_value is False
+    mock_session.add.assert_called()
+
+
 @mock.patch("cryoemservices.util.ispyb_commands.models")
 def test_insert_processed_tomogram(mock_models):
     def mock_tomogram_parameters(p):
@@ -839,6 +872,21 @@ def mock_tomogram_parameters(p):
     mock_session.commit.assert_called()
 
 
+def test_insert_processed_tomogram_failure():
+    def mock_tomogram_parameters(p):
+        return None
+
+    # Mock which returns an existing object
+    mock_session = mock.MagicMock()
+    mock_session.add.side_effect = raise_sql_error
+
+    return_value = ispyb_commands.insert_processed_tomogram(
+        {}, mock_tomogram_parameters, mock_session
+    )
+    assert return_value is False
+    mock_session.add.assert_called()
+
+
 @mock.patch("cryoemservices.util.ispyb_commands.models")
 def test_insert_tilts_has_movie(mock_models):
     def mock_tilt_parameters(p):