make tests happy

Author: Fokko

pyiceberg/table/name_mapping.py

@@ -25,7 +25,7 @@
 from abc import ABC, abstractmethod
 from collections import ChainMap
 from functools import cached_property, singledispatch
-from typing import Any, Dict, Generic, List, Set, TypeVar, Union
+from typing import Any, Dict, Generic, List, TypeVar, Union
 
 from pydantic import Field, conlist, model_serializer
 
@@ -36,7 +36,7 @@
 
 class MappedField(IcebergBaseModel):
     field_id: int = Field(alias="field-id")
-    names: Set[str] = conlist(str, min_length=1)
+    names: List[str] = conlist(str, min_length=1)
     fields: List[MappedField] = Field(default_factory=list)
 
     @model_serializer

tests/table/test_name_mapping.py

@@ -72,53 +72,53 @@ def table_name_mapping_nested() -> NameMapping:
 def test_json_deserialization() -> None:
     name_mapping = """
 [
-    [
+    {
         "field-id": 1,
         "names": [
             "id",
             "record_id"
         ]
-    ],
-    [
+    },
+    {
         "field-id": 2,
         "names": [
             "data"
         ]
-    ],
-    [
+    },
+    {
         "field-id": 3,
         "names": [
             "location"
         ],
         "fields": [
-            [
+            {
                 "field-id": 4,
                 "names": [
                     "latitude",
                     "lat"
                 ]
-            ],
-            [
+            },
+            {
                 "field-id": 5,
                 "names": [
                     "longitude",
                     "long"
                 ]
-            ]
+            }
         ]
-    ]
+    }
 ]
     """
 
     assert load_mapping_from_json(name_mapping) == NameMapping(
         [
-            MappedField(field_id=1, names=['record_id', 'id']),
+            MappedField(field_id=1, names=['id', 'record_id']),
             MappedField(field_id=2, names=['data']),
             MappedField(
                 names=['location'],
                 field_id=3,
                 fields=[
-                    MappedField(field_id=4, names=['lat', 'latitude']),
+                    MappedField(field_id=4, names=['latitude', 'lat']),
                     MappedField(field_id=5, names=['longitude', 'long']),
                 ],
             ),
@@ -129,21 +129,21 @@ def test_json_deserialization() -> None:
 def test_json_serialization(table_name_mapping_nested: NameMapping) -> None:
     assert (
         table_name_mapping_nested.model_dump_json()
-        == """[["field-id":1,"names":["foo"]],["field-id":2,"names":["bar"]],["field-id":3,"names":["baz"]],["field-id":4,"names":["qux"],"fields":[["field-id":5,"names":["element"]]]],["field-id":6,"names":["quux"],"fields":[["field-id":7,"names":["key"]],["field-id":8,"names":["value"],"fields":[["field-id":9,"names":["key"]],["field-id":10,"names":["value"]]]]]],["field-id":11,"names":["location"],"fields":[["field-id":12,"names":["element"],"fields":[["field-id":13,"names":["latitude"]],["field-id":14,"names":["longitude"]]]]]],["field-id":15,"names":["person"],"fields":[["field-id":16,"names":["name"]],["field-id":17,"names":["age"]]]]]"""
+        == """[{"field-id":1,"names":["foo"]},{"field-id":2,"names":["bar"]},{"field-id":3,"names":["baz"]},{"field-id":4,"names":["qux"],"fields":[{"field-id":5,"names":["element"]}]},{"field-id":6,"names":["quux"],"fields":[{"field-id":7,"names":["key"]},{"field-id":8,"names":["value"],"fields":[{"field-id":9,"names":["key"]},{"field-id":10,"names":["value"]}]}]},{"field-id":11,"names":["location"],"fields":[{"field-id":12,"names":["element"],"fields":[{"field-id":13,"names":["latitude"]},{"field-id":14,"names":["longitude"]}]}]},{"field-id":15,"names":["person"],"fields":[{"field-id":16,"names":["name"]},{"field-id":17,"names":["age"]}]}]"""
     )
 
 
 def test_name_mapping_to_string() -> None:
     nm = NameMapping(
         [
-            MappedField(field_id=1, names=['record_id', 'id']),
+            MappedField(field_id=1, names=['id', 'record_id']),
             MappedField(field_id=2, names=['data']),
             MappedField(
                 names=['location'],
                 field_id=3,
                 fields=[
                     MappedField(field_id=4, names=['lat', 'latitude']),
-                    MappedField(field_id=5, names=['longitude', 'long']),
+                    MappedField(field_id=5, names=['long', 'longitude']),
                 ],
             ),
         ]