test: adapt tests for grouping by field feature

acdh-oeaw · Dec 2, 2024 · 0dc3085 · 0dc3085
1 parent cfd3f83
commit 0dc3085
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/tests/data/models/author_array_collection_model.py b/tests/data/models/author_array_collection_model.py
@@ -5,14 +5,14 @@
 
 
 class Work(BaseModel):
-    model_config = ConfigDict(group_by="work_name")
+    model_config = ConfigDict(group_by="name")
 
     name: Annotated[str, SPARQLBinding("work_name")]
     viafs: Annotated[list[str], SPARQLBinding("viaf")]
 
 
 class Author(BaseModel):
-    model_config = ConfigDict(group_by="nameLabel")
+    model_config = ConfigDict(group_by="surname")
 
     gnd: str
     surname: Annotated[str, SPARQLBinding("nameLabel")]

diff --git a/tests/data/models/author_work_title_model.py b/tests/data/models/author_work_title_model.py
@@ -18,7 +18,7 @@ class Work(BaseModel):
 
 
 class Author(BaseModel):
-    model_config = ConfigDict(group_by="author")
+    model_config = ConfigDict(group_by="name")
 
     name: Annotated[str, SPARQLBinding("author")]
     works: list[Work]
diff --git a/tests/data/models/grouping_model.py b/tests/data/models/grouping_model.py
@@ -1,6 +1,6 @@
 """Grouping model for RDFProxy testing."""
 
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, Field
 
 
 class GroupingSimpleModel(BaseModel):
@@ -16,5 +16,7 @@ class GroupingNestedModel(BaseModel):
 class GroupingComplexModel(BaseModel):
     model_config = ConfigDict(group_by="x")
 
+    x: int = Field(exclude=True)
+
     p: str
     q: list[GroupingNestedModel]
diff --git a/tests/data/models/nested_grouping_model.py b/tests/data/models/nested_grouping_model.py
@@ -1,6 +1,6 @@
 """Nested grouping model for RDFProxy testing."""
 
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, Field
 
 
 class NestedGroupingSimpleModel(BaseModel):
@@ -11,12 +11,16 @@ class NestedGroupingSimpleModel(BaseModel):
 class NestedGroupingNestedModel(BaseModel):
     model_config = ConfigDict(group_by="y")
 
+    y: int = Field(exclude=True)
+
     a: str
     b: list[NestedGroupingSimpleModel]
 
 
 class NestedGroupingComplexModel(BaseModel):
     model_config = ConfigDict(group_by="a")
 
+    a: str = Field(exclude=True)
+
     p: str
     q: list[NestedGroupingNestedModel]
diff --git a/tests/tests_mapper/test_sad_path_mapper_grouped_models.py b/tests/tests_mapper/test_sad_path_mapper_grouped_models.py
@@ -1,10 +1,9 @@
-import pytest
-
 from pydantic import BaseModel, ConfigDict
+import pytest
 from rdfproxy import ModelBindingsMapper
 from rdfproxy.utils._exceptions import (
+    InvalidGroupingKeyException,
     MissingModelConfigException,
-    UnboundGroupingKeyException,
 )
 
 
@@ -24,5 +23,5 @@ def test_sad_path_adapter_missing_grouping_config():
 
 
 def test_sad_path_adapter_missing_grouping_value():
-    with pytest.raises(UnboundGroupingKeyException):
+    with pytest.raises(InvalidGroupingKeyException):
         ModelBindingsMapper(ModelMissingGroupByValue, {"x": 1}).get_models()