Add set and frozenset tests.

Signed-off-by: Michael Johansen <[email protected]>

Author: Michael Johansen

src/nipanel/_convert.py

@@ -92,7 +92,7 @@ def _get_best_matching_type(python_value: object) -> str:
             underlying_parents = type(working_python_value).mro()
 
             # If this element is a collection, we want to continue traversing. Once we find a
-            # non-collection, underlying_elements will refer to the candidates for the non-
+            # non-collection, underlying_parents will refer to the candidates for the non-
             # collection type.
             value_is_collection = any(
                 _CONVERTIBLE_COLLECTION_TYPES.intersection(underlying_parents)

tests/unit/test_convert.py

@@ -86,6 +86,10 @@
         (((1.0, 2.0), (3.0, 4.0)), "Collection.Collection.float"),
         ((set([1.0, 2.0]), set([3.0, 4.0])), "Collection.Collection.float"),
         ((frozenset([1.0, 2.0]), frozenset([3.0, 4.0])), "Collection.Collection.float"),
+        (set([(1.0, 2.0), (3.0, 4.0)]), "Collection.Collection.float"),
+        (set([frozenset([1.0, 2.0]), frozenset([3.0, 4.0])]), "Collection.Collection.float"),
+        (frozenset([(1.0, 2.0), (3.0, 4.0)]), "Collection.Collection.float"),
+        (frozenset([frozenset([1.0, 2.0]), frozenset([3.0, 4.0])]), "Collection.Collection.float"),
     ],
 )
 def test___various_python_objects___get_best_matching_type___returns_correct_type_string(
@@ -224,8 +228,6 @@ def test___python_analog_waveform___to_any___valid_double_analog_waveform() -> N
         (((1.0, 2.0), (3.0, 4.0))),
         ((set([1.0, 2.0]), set([3.0, 4.0]))),
         ((frozenset([1.0, 2.0]), frozenset([3.0, 4.0]))),
-        # sets and frozensets of collections don't preserve order,
-        # so they need to be tested separately.
     ],
 )
 def test___python_2dcollection_of_float___to_any___valid_double2darray(
@@ -244,6 +246,32 @@ def test___python_2dcollection_of_float___to_any___valid_double2darray(
     assert unpack_dest.data == expected_data
 
 
+@pytest.mark.parametrize(
+    "python_value",
+    [
+        (set([(1.0, 2.0), (3.0, 4.0)])),
+        (set([frozenset([1.0, 2.0]), frozenset([3.0, 4.0])])),
+        (frozenset([(1.0, 2.0), (3.0, 4.0)])),
+        (frozenset([frozenset([1.0, 2.0]), frozenset([3.0, 4.0])])),
+    ],
+)
+def test___python_set_of_collection_of_float___to_any___valid_double2darray(
+    python_value: Collection[Collection[float]],
+) -> None:
+    expected_data = [1.0, 2.0, 3.0, 4.0]
+    expected_rows = 2
+    expected_columns = 2
+    result = nipanel._convert.to_any(python_value)
+    unpack_dest = Double2DArray()
+    _assert_any_and_unpack(result, unpack_dest)
+
+    assert isinstance(unpack_dest, Double2DArray)
+    assert unpack_dest.rows == expected_rows
+    assert unpack_dest.columns == expected_columns
+    # Sets and frozensets don't maintain order, so sort before comparing.
+    assert sorted(unpack_dest.data) == sorted(expected_data)
+
+
 # ========================================================
 # Protobuf Types: Protobuf to Python
 # ========================================================