Update tests

Author: jacob720

src/daq_config_server/converters/_converters.py

@@ -55,7 +55,7 @@ def check_zoom_levels_match_required(self):
         ):
             raise ValueError(
                 f"Zoom levels {set(self.zoom_levels.keys())} "
-                + "do not match required zoom levels: {self.required_zoom_levels}"
+                f"do not match required zoom levels: {self.required_zoom_levels}"
             )
         return self
 

tests/conftest.py

@@ -7,7 +7,7 @@
 from daq_config_server.converters._converters import (
     beamline_parameters_to_dict,
     display_config_to_dict,
-    undulator_energy_gap_lut_to_dict,
+    undulator_energy_gap_lut,
     xml_to_dict,
 )
 from tests.constants import ServerFilePaths, TestDataPaths
@@ -22,9 +22,9 @@ def mock_file_converter_map() -> Generator[dict[str, Callable[[str], Any]], None
             str(
                 TestDataPaths.TEST_BEAMLINE_PARAMETERS_PATH
             ): beamline_parameters_to_dict,
-            str(TestDataPaths.TEST_GOOD_LUT_PATH): undulator_energy_gap_lut_to_dict,
+            str(TestDataPaths.TEST_GOOD_LUT_PATH): undulator_energy_gap_lut,
             str(TestDataPaths.TEST_GOOD_DISPLAY_CONFIG_PATH): display_config_to_dict,
-            str(ServerFilePaths.GOOD_LUT): undulator_energy_gap_lut_to_dict,
+            str(ServerFilePaths.GOOD_LUT): undulator_energy_gap_lut,
         },
     ) as mock_map:
         yield mock_map

tests/system_tests/test_client.py

@@ -5,9 +5,12 @@
 
 import pytest
 import requests
+from pydantic import ValidationError
 
 import daq_config_server.converters._file_converter_map as file_converter_map
 from daq_config_server.client import ConfigServer
+from daq_config_server.converters._converter_utils import GenericLut
+from daq_config_server.converters._converters import DisplayConfig
 from tests.constants import (
     ServerFilePaths,
     TestDataPaths,
@@ -111,12 +114,33 @@ def test_request_with_file_not_on_whitelist(server: ConfigServer):
 def test_request_for_file_with_converter_works(server: ConfigServer):
     expected = {
         "column_names": ["energy_eV", "gap_mm"],
-        "data": [[5700, 5.4606], [5760, 5.5], [6000, 5.681], [6500, 6.045]],
+        "rows": [[5700, 5.4606], [5760, 5.5], [6000, 5.681], [6500, 6.045]],
     }
     result = server.get_file_contents(ServerFilePaths.GOOD_LUT, dict)
     assert result == expected
 
 
+@pytest.mark.requires_local_server
+def test_request_for_file_with_converter_works_with_pydantic_model(
+    server: ConfigServer,
+):
+    expected = GenericLut(
+        column_names=["energy_eV", "gap_mm"],
+        rows=[[5700, 5.4606], [5760, 5.5], [6000, 5.681], [6500, 6.045]],
+    )
+    result = server.get_file_contents(ServerFilePaths.GOOD_LUT, GenericLut)
+    assert isinstance(result, GenericLut)
+    assert result == expected
+
+
+@pytest.mark.requires_local_server
+def test_request_for_file_with_converter_with_wrong_pydantic_model_errors(
+    server: ConfigServer,
+):
+    with pytest.raises(ValidationError):
+        server.get_file_contents(ServerFilePaths.GOOD_LUT, DisplayConfig)
+
+
 @pytest.mark.requires_local_server
 def test_all_files_in_file_converter_map_can_be_converted_to_dict(server: ConfigServer):
     for filename in file_converter_map.FILE_TO_CONVERTER_MAP.keys():

tests/unit_tests/test_converters.py

@@ -7,11 +7,14 @@
 
 from daq_config_server.converters._converter_utils import (
     ConverterParseError,
-    parse_lut_to_dict,
+    GenericLut,
+    parse_lut,
     parse_value,
     remove_comments,
 )
 from daq_config_server.converters._converters import (
+    DisplayConfig,
+    DisplayConfigData,
     beamline_parameters_to_dict,
     display_config_to_dict,
     xml_to_dict,
@@ -45,46 +48,48 @@ def test_error_is_raised_if_file_cant_be_parsed(
 def test_parse_lut_to_dict_gives_expected_result_and_can_be_jsonified():
     with open(TestDataPaths.TEST_GOOD_LUT_PATH) as f:
         contents = f.read()
-    expected = {
-        "column_names": ["energy_eV", "gap_mm"],
-        "data": [[5700, 5.4606], [5760, 5.5], [6000, 5.681], [6500, 6.045]],
-    }
-    result = parse_lut_to_dict(contents, ("energy_eV", int), ("gap_mm", float))
+    expected = GenericLut(
+        column_names=["energy_eV", "gap_mm"],
+        rows=[[5700, 5.4606], [5760, 5.5], [6000, 5.681], [6500, 6.045]],
+    )
+    result = parse_lut(contents, ("energy_eV", int), ("gap_mm", float))
     assert result == expected
-    json.dumps(result)
+    result.model_dump_json()
 
 
 def test_parsing_bad_lut_causes_error():
     with open(TestDataPaths.TEST_BAD_LUT_PATH) as f:
         contents = f.read()
     with pytest.raises(IndexError):
-        parse_lut_to_dict(contents, ("energy_eV", int), ("gap_mm", float))
+        parse_lut(contents, ("energy_eV", int), ("gap_mm", float))
 
 
 def test_display_config_to_dict_gives_expected_result_and_can_be_jsonified():
     with open(TestDataPaths.TEST_GOOD_DISPLAY_CONFIG_PATH) as f:
         contents = f.read()
-    expected = {
-        "1.0": {
-            "bottomRightX": 410,
-            "bottomRightY": 278,
-            "crosshairX": 541,
-            "crosshairY": 409,
-            "topLeftX": 383,
-            "topLeftY": 253,
-        },
-        "2.5": {
-            "bottomRightX": 388,
-            "bottomRightY": 322,
-            "crosshairX": 551,
-            "crosshairY": 410,
-            "topLeftX": 340,
-            "topLeftY": 283,
-        },
-    }
+    expected = DisplayConfig(
+        zoom_levels={
+            1.0: DisplayConfigData(
+                bottomRightX=410,
+                bottomRightY=278,
+                crosshairX=541,
+                crosshairY=409,
+                topLeftX=383,
+                topLeftY=253,
+            ),
+            2.5: DisplayConfigData(
+                bottomRightX=388,
+                bottomRightY=322,
+                crosshairX=551,
+                crosshairY=410,
+                topLeftX=340,
+                topLeftY=283,
+            ),
+        }
+    )
     result = display_config_to_dict(contents)
     assert result == expected
-    json.dumps(result)
+    json.dumps(result.model_dump())
 
 
 def test_xml_to_dict_gives_expected_result_and_can_be_jsonified():