Simplify some tests to reduce missing code coverage, and move utils a…

…round.

strawberry/private.py

@@ -1,5 +1,7 @@
 from typing import TypeVar
-from typing_extensions import Annotated, get_args, get_origin
+from typing_extensions import Annotated
+
+from strawberry.utils.typing import type_has_annotation
 
 
 class StrawberryPrivate:
@@ -22,9 +24,4 @@ class StrawberryPrivate:
 
 
 def is_private(type_: object) -> bool:
-    if get_origin(type_) is Annotated:
-        return any(
-            isinstance(argument, StrawberryPrivate) for argument in get_args(type_)
-        )
-
-    return False
+    return type_has_annotation(type_, StrawberryPrivate)

strawberry/type.py

@@ -13,7 +13,7 @@
     Union,
     overload,
 )
-from typing_extensions import Annotated, Literal, Protocol, Self, get_args, get_origin
+from typing_extensions import Literal, Protocol, Self
 
 from strawberry.utils.typing import is_concrete_generic
 
@@ -229,10 +229,3 @@ def get_object_definition(
     if strict and definition is None:
         raise TypeError(f"{obj!r} does not have a StrawberryObjectDefinition")
     return definition
-
-
-def is_annotated_type(type_: object, annotated: Type) -> bool:
-    if get_origin(type_) is Annotated:
-        return any(isinstance(argument, annotated) for argument in get_args(type_))
-
-    return False

strawberry/types/fields/resolver.py

@@ -27,9 +27,10 @@
     MissingArgumentsAnnotationsError,
 )
 from strawberry.parent import StrawberryParent
-from strawberry.type import StrawberryType, has_object_definition, is_annotated_type
+from strawberry.type import StrawberryType, has_object_definition
 from strawberry.types.info import Info
 from strawberry.utils.cached_property import cached_property
+from strawberry.utils.typing import type_has_annotation
 
 if TYPE_CHECKING:
     import builtins
@@ -140,7 +141,7 @@ def is_reserved_type(self, other: builtins.type) -> bool:
         origin = cast(type, get_origin(other)) or other
         if origin is Annotated:
             # Handle annotated arguments such as Private[str] and DirectiveValue[str]
-            return is_annotated_type(other, self.type)
+            return type_has_annotation(other, self.type)
         else:
             # Handle both concrete and generic types (i.e Info, and Info[Any, Any])
             return (

strawberry/utils/typing.py

@@ -182,6 +182,14 @@ def is_classvar(cls: type, annotation: Union[ForwardRef, str]) -> bool:
     )
 
 
+def type_has_annotation(type_: object, annotation: Type) -> bool:
+    """Returns True if the type_ has been annotated with annotation."""
+    if get_origin(type_) is Annotated:
+        return any(isinstance(argument, annotation) for argument in get_args(type_))
+
+    return False
+
+
 def get_parameters(annotation: Type) -> Union[Tuple[object], Tuple[()]]:
     if (
         isinstance(annotation, _GenericAlias)

tests/schema/test_resolvers.py

@@ -593,12 +593,12 @@ def user(self, user_id: str) -> User:
     assert result.data["user"]["name"] == "User 🍓"
 
 
-def multiple_parents(user: Parent[UserLiteral], user2: Parent[UserLiteral]) -> str:
-    return f"User {user.id}"
+def multiple_parents(user: Parent[Any], user2: Parent[Any]) -> str:
+    raise AssertionError("Unreachable code.")
 
 
 def multiple_infos(root, info1: Info, info2: Info) -> str:
-    return f"User {root.id}"
+    raise AssertionError("Unreachable code.")
 
 
 @pytest.mark.parametrize(
@@ -609,18 +609,9 @@ def multiple_infos(root, info1: Info, info2: Info) -> str:
     ),
 )
 def test_multiple_conflicting_reserved_arguments(resolver):
-    @strawberry.type
-    class User:
-        id: str
-
-        name: str = strawberry.field(resolver=resolver)
-
     @strawberry.type
     class Query:
-        @strawberry.field
-        @staticmethod
-        def user(self, user_id: str) -> User:
-            return UserLiteral(user_id)
+        name: str = strawberry.field(resolver=resolver)
 
     # Would be awesome to give a more helpful error here, but c'est la vie.
     with pytest.raises(TypeError):