fix: use ComplexAttribute instead of MultiValuedComplexAttribute to generate data

Author: azmeuk

doc/changelog.rst

@@ -7,6 +7,7 @@ Changelog
 Fixed
 ^^^^^
 - Error and critical check results directly raise an exception when ``raise_exceptions=True``.
+- Use ``ComplexAttribute`` instead of ``MultiValuedComplexAttribute`` to generate data.
 
 [0.2.2] - 2025-08-13
 --------------------

scim2_tester/filling.py

@@ -11,7 +11,6 @@
 from scim2_models import ComplexAttribute
 from scim2_models import Extension
 from scim2_models import ExternalReference
-from scim2_models import MultiValuedComplexAttribute
 from scim2_models import Mutability
 from scim2_models import Reference
 from scim2_models import Resource
@@ -124,11 +123,8 @@ def generate_random_value(
     elif isclass(field_type) and issubclass(field_type, Enum):
         value = random.choice(list(field_type))
 
-    elif isclass(field_type) and issubclass(field_type, MultiValuedComplexAttribute):
-        value = fill_mvca_with_random_values(context, field_type())  # type: ignore[arg-type]
-
     elif isclass(field_type) and issubclass(field_type, ComplexAttribute):
-        value = fill_with_random_values(context, field_type())  # type: ignore[arg-type]
+        value = fill_complex_attribute_with_random_values(context, field_type())  # type: ignore[arg-type]
 
     elif isclass(field_type) and issubclass(field_type, Extension):
         value = fill_with_random_values(context, field_type())  # type: ignore[arg-type]
@@ -178,22 +174,23 @@ def fill_with_random_values(
     return obj
 
 
-def fill_mvca_with_random_values(
+def fill_complex_attribute_with_random_values(
     context: "CheckContext",
-    obj: MultiValuedComplexAttribute,
+    obj: ComplexAttribute,
 ) -> Resource[Any] | None:
-    """Fill a MultiValuedComplexAttribute with random values.
+    """Fill a ComplexAttribute with random values.
 
     For SCIM reference fields, correctly sets the value field to match
     the ID extracted from the reference URL.
     """
     fill_with_random_values(context, obj)
-    ref_type = type(obj).get_field_root_type("ref")
-    if (
-        get_origin(ref_type) is Reference
-        and get_args(ref_type)
-        and get_args(ref_type)[0] not in (URIReference, ExternalReference, Any)
-        and (ref := getattr(obj, "ref", None))
-    ):
-        obj.value = ref.rsplit("/", 1)[-1]
+    if "ref" in type(obj).model_fields and "value" in type(obj).model_fields:
+        ref_type = type(obj).get_field_root_type("ref")
+        if (
+            get_origin(ref_type) is Reference
+            and get_args(ref_type)
+            and get_args(ref_type)[0] not in (URIReference, ExternalReference, Any)
+            and (ref := getattr(obj, "ref", None))
+        ):
+            obj.value = ref.rsplit("/", 1)[-1]
     return obj

tests/test_urn.py

@@ -57,25 +57,21 @@ def test_iter_urns_resource():
     assert "emails.primary" in urns
     assert "emails.display" in urns
     assert "emails.value" in urns
-    assert "emails.ref" in urns
     assert "phoneNumbers" in urns
     assert "phoneNumbers.type" in urns
     assert "phoneNumbers.primary" in urns
     assert "phoneNumbers.display" in urns
     assert "phoneNumbers.value" in urns
-    assert "phoneNumbers.ref" in urns
     assert "ims" in urns
     assert "ims.type" in urns
     assert "ims.primary" in urns
     assert "ims.display" in urns
     assert "ims.value" in urns
-    assert "ims.ref" in urns
     assert "photos" in urns
     assert "photos.type" in urns
     assert "photos.primary" in urns
     assert "photos.display" in urns
     assert "photos.value" in urns
-    assert "photos.ref" in urns
     assert "addresses" in urns
     assert "addresses.type" in urns
     assert "addresses.primary" in urns