test: fix warnings

Author: azmeuk

doc/tutorial.rst

@@ -389,11 +389,10 @@ If unset the default values will be :attr:`~scim2_models.Mutability.read_write`
 There is a dedicated type for :rfc:`RFC7643 §2.3.7 <7643#section-2.3.7>` :class:`~scim2_models.Reference`
 that can take type parameters to represent :rfc:`RFC7643 §7 'referenceTypes'<7643#section-7>`:
 
-    >>> from typing import Literal
     >>> class PetOwner(Resource):
-    ...    pet: Reference[Literal["Pet"]]
+    ...    pet: Reference["Pet"]
 
-:class:`~scim2_models.Reference` has two special type parameters :data:`~scim2_models.ExternalReference` and :data:`~scim2_models.URIReference` that matches :rfc:`RFC7643 §7 <7643#section-7>` external and URI reference types.
+:class:`~scim2_models.Reference` has two special type parameters :data:`~scim2_models.External` and :data:`~scim2_models.URI` that matches :rfc:`RFC7643 §7 <7643#section-7>` external and URI reference types.
 
 Dynamic schemas from models
 ===========================

tests/test_dynamic_resources.py

@@ -1,5 +1,5 @@
 import datetime
-from typing import Literal
+from typing import Union
 
 from pydantic import Base64Bytes
 
@@ -9,9 +9,9 @@
 from scim2_models.annotations import Returned
 from scim2_models.annotations import Uniqueness
 from scim2_models.attributes import ComplexAttribute
-from scim2_models.reference import ExternalReference
+from scim2_models.reference import URI
+from scim2_models.reference import External
 from scim2_models.reference import Reference
-from scim2_models.reference import URIReference
 from scim2_models.resources.resource import Extension
 from scim2_models.resources.resource import Resource
 from scim2_models.resources.schema import Attribute
@@ -69,8 +69,7 @@ def test_make_group_model_from_schema(load_sample):
 
     # Members.ref
     assert (
-        Members.get_field_root_type("ref")
-        == Reference[Literal["User"] | Literal["Group"]]
+        Members.get_field_root_type("ref") == Reference[Union["User", "Group"]]  # noqa: F821
     )
     assert not Members.get_field_multiplicity("ref")
     assert (
@@ -292,7 +291,7 @@ def test_make_user_model_from_schema(load_sample):
     assert User.get_field_annotation("nick_name", Uniqueness) == Uniqueness.none
 
     # profile_url
-    assert User.get_field_root_type("profile_url") == Reference[ExternalReference]
+    assert User.get_field_root_type("profile_url") == Reference[External]
     assert not User.get_field_multiplicity("profile_url")
     assert (
         User.model_fields["profile_url"].description
@@ -642,7 +641,7 @@ def test_make_user_model_from_schema(load_sample):
     assert User.get_field_annotation("photos", Uniqueness) == Uniqueness.none
 
     # photo.value
-    assert Photos.get_field_root_type("value") == Reference[ExternalReference]
+    assert Photos.get_field_root_type("value") == Reference[External]
     assert not Photos.get_field_multiplicity("value")
     assert Photos.model_fields["value"].description == "URL of a photo of the User."
     assert Photos.get_field_annotation("value", Required) == Required.false
@@ -859,8 +858,7 @@ def test_make_user_model_from_schema(load_sample):
 
     # group.ref
     assert (
-        Groups.get_field_root_type("ref")
-        == Reference[Literal["User"] | Literal["Group"]]
+        Groups.get_field_root_type("ref") == Reference[Union["User", "Group"]]  # noqa: F821
     )
     assert not Groups.get_field_multiplicity("ref")
     assert (
@@ -1396,7 +1394,7 @@ def test_make_enterprise_user_model_from_schema(load_sample):
     assert Manager.get_field_annotation("value", Uniqueness) == Uniqueness.none
 
     # Manager.ref
-    assert Manager.get_field_root_type("ref") == Reference[Literal["User"]]
+    assert Manager.get_field_root_type("ref") == Reference["User"]
     assert not Manager.get_field_multiplicity("ref")
     assert (
         Manager.model_fields["ref"].description
@@ -1482,7 +1480,7 @@ def test_make_resource_type_model_from_schema(load_sample):
     )
 
     # endpoint
-    assert ResourceType.get_field_root_type("endpoint") == Reference[URIReference]
+    assert ResourceType.get_field_root_type("endpoint") == Reference[URI]
     assert not ResourceType.get_field_multiplicity("endpoint")
     assert (
         ResourceType.model_fields["endpoint"].description
@@ -1498,7 +1496,7 @@ def test_make_resource_type_model_from_schema(load_sample):
     assert ResourceType.get_field_annotation("endpoint", Uniqueness) == Uniqueness.none
 
     # schema
-    assert ResourceType.get_field_root_type("schema_") == Reference[URIReference]
+    assert ResourceType.get_field_root_type("schema_") == Reference[URI]
     assert not ResourceType.get_field_multiplicity("schema_")
     assert (
         ResourceType.model_fields["schema_"].description
@@ -1543,7 +1541,7 @@ def test_make_resource_type_model_from_schema(load_sample):
     )
 
     # SchemaExtensions.schema
-    assert SchemaExtensions.get_field_root_type("schema_") == Reference[URIReference]
+    assert SchemaExtensions.get_field_root_type("schema_") == Reference[URI]
     assert not SchemaExtensions.get_field_multiplicity("schema_")
     assert (
         SchemaExtensions.model_fields["schema_"].description
@@ -1630,7 +1628,7 @@ def test_make_service_provider_config_model_from_schema(load_sample):
     # documentation_uri
     assert (
         ServiceProviderConfig.get_field_root_type("documentation_uri")
-        == Reference[ExternalReference]
+        == Reference[External]
     )
     assert not ServiceProviderConfig.get_field_multiplicity("documentation_uri")
     assert (
@@ -2038,10 +2036,7 @@ def test_make_service_provider_config_model_from_schema(load_sample):
     )
 
     # authentication_schemes.spec_uri
-    assert (
-        AuthenticationSchemes.get_field_root_type("spec_uri")
-        == Reference[ExternalReference]
-    )
+    assert AuthenticationSchemes.get_field_root_type("spec_uri") == Reference[External]
     assert not AuthenticationSchemes.get_field_multiplicity("spec_uri")
     assert (
         AuthenticationSchemes.model_fields["spec_uri"].description
@@ -2071,7 +2066,7 @@ def test_make_service_provider_config_model_from_schema(load_sample):
     # authentication_schemes.documentation_uri
     assert (
         AuthenticationSchemes.get_field_root_type("documentation_uri")
-        == Reference[ExternalReference]
+        == Reference[External]
     )
     assert not AuthenticationSchemes.get_field_multiplicity("documentation_uri")
     assert (

tests/test_dynamic_schemas.py

@@ -1,9 +1,8 @@
 import operator
-from typing import Annotated
 
 import pytest
 
-from scim2_models.annotations import Required
+from scim2_models import URN
 from scim2_models.context import Context
 from scim2_models.resources.enterprise_user import EnterpriseUser
 from scim2_models.resources.group import Group
@@ -116,9 +115,7 @@ def test_inheritance():
     """Check that parent attributes are included in the schema."""
 
     class Foo(Resource):
-        schemas: Annotated[list[str], Required.true] = [
-            "urn:ietf:params:scim:schemas:core:2.0:Foo"
-        ]
+        __schema__ = URN("urn:ietf:params:scim:schemas:core:2.0:Foo")
 
         foo: str | None = None
 

tests/test_errors.py

@@ -1,8 +1,37 @@
+import warnings
+
+from scim2_models.exceptions import InvalidFilterException
+from scim2_models.exceptions import InvalidPathException
+from scim2_models.exceptions import InvalidSyntaxException
+from scim2_models.exceptions import InvalidValueException
+from scim2_models.exceptions import InvalidVersionException
+from scim2_models.exceptions import MutabilityException
+from scim2_models.exceptions import NoTargetException
+from scim2_models.exceptions import SensitiveException
+from scim2_models.exceptions import TooManyException
+from scim2_models.exceptions import UniquenessException
 from scim2_models.messages.error import Error
 
 
 def test_predefined_errors():
-    for gen in (
+    for exc in (
+        InvalidFilterException(),
+        TooManyException(),
+        UniquenessException(),
+        MutabilityException(),
+        InvalidSyntaxException(),
+        InvalidPathException(),
+        NoTargetException(),
+        InvalidValueException(),
+        InvalidVersionException(),
+        SensitiveException(),
+    ):
+        assert isinstance(exc.to_error(), Error)
+
+
+def test_deprecated_make_error_methods():
+    """Test deprecated make_*_error class methods emit warnings."""
+    deprecated_methods = (
         Error.make_invalid_filter_error,
         Error.make_too_many_error,
         Error.make_uniqueness_error,
@@ -13,5 +42,12 @@ def test_predefined_errors():
         Error.make_invalid_value_error,
         Error.make_invalid_version_error,
         Error.make_sensitive_error,
-    ):
-        assert isinstance(gen(), Error)
+    )
+    for method in deprecated_methods:
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter("always")
+            result = method()
+            assert isinstance(result, Error)
+            assert len(w) == 1
+            assert issubclass(w[0].category, DeprecationWarning)
+            assert "deprecated" in str(w[0].message)

tests/test_model_attributes.py

@@ -1,7 +1,7 @@
 import uuid
 from typing import Annotated
 
-from scim2_models.annotations import Required
+from scim2_models import URN
 from scim2_models.annotations import Returned
 from scim2_models.attributes import ComplexAttribute
 from scim2_models.base import BaseModel
@@ -23,7 +23,8 @@ class Sub(ComplexAttribute):
 
 
 class Sup(Resource):
-    schemas: Annotated[list[str], Required.true] = ["urn:example:2.0:Sup"]
+    __schema__ = URN("urn:example:2.0:Sup")
+
     dummy: str
     sub: Sub
     subs: list[Sub]
@@ -51,23 +52,26 @@ class Baz(ComplexAttribute):
 
 
 class Foo(Resource):
-    schemas: Annotated[list[str], Required.true] = ["urn:example:2.0:Foo"]
+    __schema__ = URN("urn:example:2.0:Foo")
+
     sub: Annotated[ReturnedModel, Returned.default]
     bar: str
     snake_case: str
     baz: Baz | None = None
 
 
 class Bar(Resource):
-    schemas: Annotated[list[str], Required.true] = ["urn:example:2.0:Bar"]
+    __schema__ = URN("urn:example:2.0:Bar")
+
     sub: Annotated[ReturnedModel, Returned.default]
     bar: str
     snake_case: str
     baz: Baz | None = None
 
 
 class MyExtension(Extension):
-    schemas: Annotated[list[str], Required.true] = ["urn:example:2.0:MyExtension"]
+    __schema__ = URN("urn:example:2.0:MyExtension")
+
     baz: str
 
 

tests/test_model_serialization.py

@@ -2,6 +2,7 @@
 
 import pytest
 
+from scim2_models import URN
 from scim2_models.annotations import Mutability
 from scim2_models.annotations import Required
 from scim2_models.annotations import Returned
@@ -18,7 +19,7 @@ class SubRetModel(ComplexAttribute):
 
 
 class SupRetResource(Resource):
-    schemas: Annotated[list[str], Required.true] = ["urn:org:example:SupRetResource"]
+    __schema__ = URN("urn:org:example:SupRetResource")
 
     always_returned: Annotated[str | None, Returned.always] = None
     never_returned: Annotated[str | None, Returned.never] = None

tests/test_patch_op_extensions.py

@@ -1,9 +1,9 @@
 from typing import TypeVar
 
 import pytest
-from pydantic import Field
 from pydantic import ValidationError
 
+from scim2_models import URN
 from scim2_models import Group
 from scim2_models import GroupMember
 from scim2_models import InvalidPathException
@@ -262,8 +262,8 @@ def test_create_parent_object_return_none():
     T = TypeVar("T")
 
     class TestResourceTypeVar(Resource):
-        schemas: list[str] = Field(default=["urn:test:TestResource"])
-        # TypeVar is not a class, so _create_parent_object should return None
+        __schema__ = URN("urn:test:TestResource")
+
         typevar_field: T = None
 
     user = TestResourceTypeVar()

tests/test_patch_op_replace.py

@@ -1,9 +1,9 @@
 from typing import Annotated
 
 import pytest
-from pydantic import Field
 from pydantic import ValidationError
 
+from scim2_models import URN
 from scim2_models import PatchOp
 from scim2_models import PatchOperation
 from scim2_models import User
@@ -208,7 +208,8 @@ def test_immutable_field():
     """Test that replace operations on immutable fields raise validation errors."""
 
     class Dummy(Resource):
-        schemas: list[str] = Field(default=["urn:test:TestResource"])
+        __schema__ = URN("urn:test:TestResource")
+
         immutable: Annotated[str, Mutability.immutable]
 
     with pytest.raises(ValidationError, match="mutability"):

tests/test_resource_extension.py

@@ -1,14 +1,13 @@
 import datetime
-from typing import Annotated
 
 import pytest
 
+from scim2_models import URN
 from scim2_models import Context
 from scim2_models import EnterpriseUser
 from scim2_models import Extension
 from scim2_models import Manager
 from scim2_models import Meta
-from scim2_models import Required
 from scim2_models import User
 
 
@@ -252,9 +251,7 @@ def test_invalid_delitem():
 
 
 class SuperHero(Extension):
-    schemas: Annotated[list[str], Required.true] = [
-        "urn:example:extensions:2.0:SuperHero"
-    ]
+    __schema__ = URN("urn:example:extensions:2.0:SuperHero")
 
     superpower: str | None = None
     """The superhero superpower."""

tests/test_resource_type.py

@@ -1,9 +1,7 @@
-from typing import Annotated
-
+from scim2_models import URN
 from scim2_models import EnterpriseUser
 from scim2_models import Extension
 from scim2_models import Reference
-from scim2_models import Required
 from scim2_models import ResourceType
 from scim2_models import User
 
@@ -69,9 +67,7 @@ def test_from_resource_with_extensions():
 
 def test_from_resource_with_mulitple_extensions():
     class TestExtension(Extension):
-        schemas: Annotated[list[str], Required.true] = [
-            "urn:ietf:params:scim:schemas:extension:Test:1.0:User"
-        ]
+        __schema__ = URN("urn:ietf:params:scim:schemas:extension:Test:1.0:User")
 
         test: str | None = None
         test2: list[str] | None = None