Generate AfidSet for testing

afids_utils/afids.py

@@ -19,7 +19,7 @@ class AfidPosition:
     x: float = attrs.field()
     y: float = attrs.field()
     z: float = attrs.field()
-    desc: str = attrs.field()
+    desc: str = attrs.field(default="")
 
 
 @attrs.define

afids_utils/tests/strategies.py

@@ -5,27 +5,29 @@
 from hypothesis.extra.numpy import arrays
 from numpy.typing import NDArray
 
-from afids_utils.afids import AfidPosition
+from afids_utils.afids import AfidPosition, AfidSet
 
 
 @st.composite
-def afid_coords(
+def afid_set(
     draw: st.DrawFn,
     min_value: float = -50.0,
     max_value: float = 50.0,
     width: int = 16,
     bad_range: bool = False,
 ) -> list[AfidPosition]:
-    # Set (in)valid number of Afid coordinates for array containing AFID coords
+    slicer_version = draw(st.from_regex(r"\d+\.\d+"))
+    coord_system = draw(st.sampled_from(["LPS", "RAS", "0", "1"]))
+
+    # Set (in)valid number of Afid coordinates in a list
+    afid_pos = []
     num_afids = (
         32
         if not bad_range
         else draw(
             st.integers(min_value=0, max_value=100).filter(lambda x: x != 32)
         )
     )
-
-    afid_pos = []
     for afid in range(num_afids):
         afid_pos.append(
             AfidPosition(
@@ -49,7 +51,14 @@ def afid_coords(
             )
         )
 
-    return afid_pos
+    # Create AfidSet
+    st_afid_set = AfidSet(
+        slicer_version=slicer_version,
+        coord_system=coord_system,
+        afids=afid_pos,
+    )
+
+    return st_afid_set
 
 
 @st.composite

afids_utils/tests/test_ext.py

@@ -10,15 +10,15 @@
 from hypothesis import HealthCheck, assume, given, settings
 from hypothesis import strategies as st
 
-from afids_utils.afids import AfidPosition
+from afids_utils.afids import AfidPosition, AfidSet
 from afids_utils.exceptions import InvalidFileError
 from afids_utils.ext.fcsv import (
     FCSV_FIELDNAMES,
     _get_afids,
     _get_metadata,
     save_fcsv,
 )
-from afids_utils.tests.strategies import afid_coords
+from afids_utils.tests.strategies import afid_set
 
 
 @pytest.fixture
@@ -164,32 +164,29 @@ def test_valid_get_afids(self, valid_fcsv_file: PathLike[str], label: int):
 
 
 class TestSaveFcsv:
-    @given(afids_coords=afid_coords())
+    @given(afids_set=afid_set())
     @settings(
         suppress_health_check=[HealthCheck.function_scoped_fixture],
     )
     def test_save_fcsv_invalid_template(
         self,
-        afids_coords: list[AfidPosition],
-        valid_fcsv_file: PathLike[str],
+        afids_set: AfidSet,
     ):
         with pytest.raises(FileNotFoundError):
-            save_fcsv(afids_coords, "/invalid/template/path.fcsv")
+            save_fcsv(afids_set.afids, "/invalid/template/path.fcsv")
 
-    @given(afids_coords=afid_coords())
+    @given(afids_set=afid_set())
     @settings(
         suppress_health_check=[HealthCheck.function_scoped_fixture],
     )
     def test_save_fcsv_valid_template(
-        self,
-        afids_coords: list[AfidPosition],
-        valid_fcsv_file: PathLike[str],
+        self, afids_set: list[AfidPosition], valid_fcsv_file: PathLike[str]
     ):
         with tempfile.NamedTemporaryFile(
             mode="w", prefix="sub-test_desc-", suffix="_afids.fcsv"
         ) as out_fcsv_file:
             # Create and check output file
-            save_fcsv(afids_coords, out_fcsv_file.name)
+            save_fcsv(afids_set.afids, out_fcsv_file.name)
 
             # Load files
             with open(
@@ -211,17 +208,21 @@ def test_save_fcsv_valid_template(
             # Check contents
             for idx, row in enumerate(output_fcsv):
                 assert (row["x"], row["y"], row["z"]) == (
-                    str(afids_coords[idx].x),
-                    str(afids_coords[idx].y),
-                    str(afids_coords[idx].z),
+                    str(afids_set.afids[idx].x),
+                    str(afids_set.afids[idx].y),
+                    str(afids_set.afids[idx].z),
                 )
 
-    @given(afids_coords=afid_coords(bad_range=True))
-    def test_invalid_num_afids(self, afids_coords: list[AfidPosition]) -> None:
+            # Check to see if file can be loaded with afids-utils
+            test_load = AfidSet.load(out_fcsv_file.name)
+            assert isinstance(test_load, AfidSet)
+
+    @given(afids_set=afid_set(bad_range=True))
+    def test_invalid_num_afids(self, afids_set: list[AfidPosition]) -> None:
         with tempfile.NamedTemporaryFile(
             mode="w", prefix="sub-test_desc-", suffix="_afids.fcsv"
         ) as out_fcsv_file:
             with pytest.raises(TypeError) as err:
-                save_fcsv(afids_coords, out_fcsv_file)
+                save_fcsv(afids_set.afids, out_fcsv_file)
 
             assert "AFIDs, but received" in str(err.value)