test: refactor and parameterize for clarity

Author: par4m

python/cocoindex/tests/test_convert.py

@@ -101,31 +101,28 @@ def test_make_engine_value_converter_basic_types():
         converter = build_engine_value_converter(engine_type_in_py)
         assert converter(value) == value
 
-def test_make_engine_value_converter_struct():
-    converter = build_engine_value_converter(Order)
-    # All fields match
-    engine_val = ["O123", "mixed nuts", 25.0, "default_extra"]
-    assert converter(engine_val) == Order("O123", "mixed nuts", 25.0, "default_extra")
-    # Extra field in Python dataclass (should ignore extra)
-    engine_val_extra = ["O123", "mixed nuts", 25.0, "default_extra", "unexpected"]
-    assert converter(engine_val_extra) == Order("O123", "mixed nuts", 25.0, "default_extra")
-    # Fewer fields in engine value (should fill with default, so provide all fields)
-    engine_val_short = ["O123", "mixed nuts", 0.0, "default_extra"]
-    assert converter(engine_val_short) == Order("O123", "mixed nuts", 0.0, "default_extra")
-    # More fields in engine value (should ignore extra)
-    engine_val_long = ["O123", "mixed nuts", 25.0, "unexpected"]
-    assert converter(engine_val_long) == Order("O123", "mixed nuts", 25.0, "unexpected")
-    # Truly extra field (should ignore the fifth field)
-    engine_val_extra_long = ["O123", "mixed nuts", 25.0, "default_extra", "ignored"]
-    assert converter(engine_val_extra_long) == Order("O123", "mixed nuts", 25.0, "default_extra")
-
-def test_make_engine_value_converter_struct_field_order():
-    # Engine fields in different order
-    # Use encode_enriched_type to avoid manual mistakes
-    converter = build_engine_value_converter(Order)
-    # Provide all fields in the correct order
-    engine_val = ["O123", "mixed nuts", 25.0, "default_extra"]
-    assert converter(engine_val) == Order("O123", "mixed nuts", 25.0, "default_extra")
+@pytest.mark.parametrize(
+    "converter_type, engine_val, expected",
+    [
+        # All fields match
+        (Order, ["O123", "mixed nuts", 25.0, "default_extra"], Order("O123", "mixed nuts", 25.0, "default_extra")),
+        # Extra field in engine value (should ignore extra)
+        (Order, ["O123", "mixed nuts", 25.0, "default_extra", "unexpected"], Order("O123", "mixed nuts", 25.0, "default_extra")),
+        # Fewer fields in engine value (should fill with default)
+        (Order, ["O123", "mixed nuts", 0.0, "default_extra"], Order("O123", "mixed nuts", 0.0, "default_extra")),
+        # More fields in engine value (should ignore extra)
+        (Order, ["O123", "mixed nuts", 25.0, "unexpected"], Order("O123", "mixed nuts", 25.0, "unexpected")),
+        # Truly extra field (should ignore the fifth field)
+        (Order, ["O123", "mixed nuts", 25.0, "default_extra", "ignored"], Order("O123", "mixed nuts", 25.0, "default_extra")),
+        # Missing optional field in engine value (tags=None)
+        (Customer, ["Alice", ["O1", "item1", 10.0, "default_extra"], None], Customer("Alice", Order("O1", "item1", 10.0, "default_extra"), None)),
+        # Extra field in engine value for Customer (should ignore)
+        (Customer, ["Alice", ["O1", "item1", 10.0, "default_extra"], [["vip"]], "extra"], Customer("Alice", Order("O1", "item1", 10.0, "default_extra"), [Tag("vip")])),
+    ]
+)
+def test_struct_conversion_cases(converter_type, engine_val, expected):
+    converter = build_engine_value_converter(converter_type)
+    assert converter(engine_val) == expected
 
 def test_make_engine_value_converter_collections():
     # List of structs
@@ -152,74 +149,6 @@ def test_make_engine_value_converter_collections():
         2
     )
 
-def test_make_engine_value_converter_defaults_and_missing_fields():
-    # Missing optional field in engine value
-    converter = build_engine_value_converter(Customer)
-    engine_val = ["Alice", ["O1", "item1", 10.0, "default_extra"], None]  # tags explicitly None
-    assert converter(engine_val) == Customer("Alice", Order("O1", "item1", 10.0, "default_extra"), None)
-    # Extra field in engine value (should ignore)
-    engine_val = ["Alice", ["O1", "item1", 10.0, "default_extra"], [["vip"]], "extra"]
-    assert converter(engine_val) == Customer("Alice", Order("O1", "item1", 10.0, "default_extra"), [Tag("vip")])
-
-def test_engine_python_schema_field_order():
-    """
-    Engine and Python dataclasses have the same fields but different order.
-    Converter should map by field name, not order.
-    """
-    @dataclass
-    class EngineOrder:
-        id: str
-        name: str
-        price: float
-    @dataclass
-    class PythonOrder:
-        name: str
-        id: str
-        price: float
-        extra: str = "default"
-    converter = build_engine_value_converter(EngineOrder, PythonOrder)
-    engine_val = ["O123", "mixed nuts", 25.0]  # matches EngineOrder order
-    assert converter(engine_val) == PythonOrder("mixed nuts", "O123", 25.0, "default")
-
-def test_engine_python_schema_extra_field():
-    """
-    Python dataclass has an extra field not present in engine schema.
-    Converter should fill with default value.
-    """
-    @dataclass
-    class EngineOrder:
-        id: str
-        name: str
-    @dataclass
-    class PythonOrder:
-        id: str
-        name: str
-        price: float = 0.0
-    converter = build_engine_value_converter(EngineOrder, PythonOrder)
-    engine_val = ["O123", "mixed nuts"]
-    assert converter(engine_val) == PythonOrder("O123", "mixed nuts", 0.0)
-
-def test_engine_python_schema_missing_field():
-    """
-    Engine dataclass has a field missing in Python dataclass.
-    Converter should ignore the missing field.
-    """
-    from dataclasses import dataclass
-    @dataclass
-    class EngineOrder:
-        id: str
-        name: str
-        price: float
-    @dataclass
-    class PythonOrder:
-        id: str
-        name: str
-    converter = build_engine_value_converter(EngineOrder, PythonOrder)
-    engine_val = ["O123", "mixed nuts", 25.0]
-    assert converter(engine_val) == PythonOrder("O123", "mixed nuts")
-
-
-
 def make_engine_order(fields):
     return make_dataclass('EngineOrder', fields)
 
@@ -269,6 +198,30 @@ def make_python_order(fields, defaults=None):
             ["unexpected", "mixed nuts", 25.0],
             ("mixed nuts", 25.0),
         ),
+        # Field order difference (should map by name)
+        (
+            [("id", str), ("name", str), ("price", float)],
+            [("name", str), ("id", str), ("price", float), ("extra", str)],
+            {"extra": "default"},
+            ["O123", "mixed nuts", 25.0],
+            ("mixed nuts", "O123", 25.0, "default"),
+        ),
+        # Extra field (Python has extra field with default)
+        (
+            [("id", str), ("name", str)],
+            [("id", str), ("name", str), ("price", float)],
+            {"price": 0.0},
+            ["O123", "mixed nuts"],
+            ("O123", "mixed nuts", 0.0),
+        ),
+        # Missing field (Engine has extra field)
+        (
+            [("id", str), ("name", str), ("price", float)],
+            [("id", str), ("name", str)],
+            {},
+            ["O123", "mixed nuts", 25.0],
+            ("O123", "mixed nuts"),
+        ),
     ]
 )
 def test_field_position_cases(engine_fields, python_fields, python_defaults, engine_val, expected_python_val):