test coverage

Author: Sun-flow

src/aind_data_schema/rig.py

@@ -149,7 +149,8 @@ def validate_device_names(cls, values):  # noqa: C901
 
         return values
 
-    def validate_modality(cls, v):  # noqa: C901
+    @root_validator
+    def validate_modality(cls, v): 
         """Validator to ensure all expected fields are present, based on given modality"""
 
         modalities = v.get("modalities")

tests/test_imaging.py

@@ -5,14 +5,15 @@
 
 from pydantic import ValidationError
 
-from aind_data_schema.device import Calibration
+from aind_data_schema.device import Calibration, DAQChannel
 from aind_data_schema.imaging import acquisition as acq
 from aind_data_schema.imaging import instrument as inst
 from aind_data_schema.imaging import mri_session as ms
 from aind_data_schema.imaging import tile
 from aind_data_schema.manufacturers import Manufacturer
 from aind_data_schema.processing import Registration
 from aind_data_schema.utils.units import PowerValue
+from aind_data_schema.rig import NeuropixelsBasestation
 
 
 class ImagingTests(unittest.TestCase):
@@ -187,6 +188,51 @@ def test_registration(self):
 
         assert t is not None
 
+    def test_validators(self):
+
+        with self.assertRaises(ValidationError):
+            inst.Instrument(
+            instrument_type="diSPIM",
+            modification_date=datetime.datetime.now(),
+            manufacturer=Manufacturer.LIFECANVAS,
+            objectives=[],
+            detectors=[],
+            light_sources=[],
+            daqs=[
+                NeuropixelsBasestation(
+                basestation_firmware_version="1",
+                bsc_firmware_version="2",
+                slot=0,
+                manufacturer=Manufacturer.IMEC,
+                ports=[],
+                computer_name="foo",
+                channels=[
+                    DAQChannel(
+                        channel_name="123",
+                        device_name="Laser A",
+                        channel_type="Analog Output",
+                    ),
+                    DAQChannel(
+                        channel_name="321",
+                        device_name="Probe A",
+                        channel_type="Analog Output",
+                    ),
+                    DAQChannel(
+                        channel_name="234",
+                        device_name="Camera A",
+                        channel_type="Digital Output",
+                    ),
+                    DAQChannel(
+                        channel_name="2354",
+                        device_name="Disc A",
+                        channel_type="Digital Output",
+                    ),
+                ],
+            ),
+            ]
+        )
+
+
 
 if __name__ == "__main__":
     unittest.main()

tests/test_rig.py

@@ -248,6 +248,48 @@ def test_validator(self):
                 mouse_platform=Disc(name="Disc A", radius=1),
             )
 
+        with self.assertRaises(ValidationError):
+
+            daqs = [
+                NeuropixelsBasestation(
+                    basestation_firmware_version="1",
+                    bsc_firmware_version="2",
+                    slot=0,
+                    manufacturer=Manufacturer.IMEC,
+                    ports=[],
+                    computer_name="foo",
+                    channels=[
+                        DAQChannel(
+                            channel_name="123",
+                            device_name="Laser A",
+                            channel_type="Analog Output",
+                        ),
+                        DAQChannel(
+                            channel_name="321",
+                            device_name="Probe A",
+                            channel_type="Analog Output",
+                        ),
+                        DAQChannel(
+                            channel_name="234",
+                            device_name="Camera A",
+                            channel_type="Digital Output",
+                        ),
+                        DAQChannel(
+                            channel_name="2354",
+                            device_name="Disc A",
+                            channel_type="Digital Output",
+                        ),
+                    ],
+                )
+            ]
+        
+            Rig(
+                rig_id="1234",
+                modification_date=datetime.datetime.now(),
+                modalities=[Modality.ECEPHYS, Modality.FIB],
+                daqs=daqs,
+            )
+
 
 if __name__ == "__main__":
     unittest.main()