✅ Improve test coverage.

Author: Raphael Krupinski

src/lapidary/runtime/model/params.py

@@ -63,6 +63,11 @@ def apply(self, builder: 'RequestBuilder', value: typing.Any) -> None:
     def http_name(self) -> str:
         return self.alias or self.name
 
+    def __eq__(self, other):
+        if not isinstance(other, type(self)):
+            raise NotImplementedError
+        return self.__dict__ == other.__dict__
+
 
 @dc.dataclass
 class RequestBody(RequestPartHandler, ParameterAnnotation):

tests/test_client.py

@@ -5,12 +5,11 @@
 
 import fastapi
 import httpx
-import httpx_auth
 import pydantic
 import typing_extensions as typing
 from starlette.responses import JSONResponse
 
-from lapidary.runtime import APIKeyAuth, ClientBase, NamedAuth, ParamStyle, Path, RequestBody, Responses, get, post, put
+from lapidary.runtime import ClientBase, ParamStyle, Path, RequestBody, Responses, get, post, put
 from lapidary.runtime.http_consts import MIME_JSON
 
 # model (common to both client and server)
@@ -130,14 +129,11 @@ async def login(
         *,
         body: typing.Annotated[AuthRequest, RequestBody({MIME_JSON: AuthRequest})],
     ) -> typing.Annotated[
-        NamedAuth,
+        AuthResponse,
         Responses(
             {
                 '200': {
-                    MIME_JSON: typing.Annotated[
-                        AuthResponse,
-                        APIKeyAuth('api_key', 'header', 'Authorization', 'Token {body.api_key}'),
-                    ]
+                    MIME_JSON: AuthResponse,
                 }
             }
         ),
@@ -163,12 +159,7 @@ async def test_request(self):
     async def test_response_auth(self):
         response = await client.login(body=AuthRequest(login='login', password='passwd'))
 
-        expected = 'api_key', httpx_auth.HeaderApiKey("Token you're in", 'Authorization')
-        self.assertEqual(expected[0], response[0])
-        self.assertDictEqual(
-            expected[1].__dict__,
-            response[1].__dict__,
-        )
+        self.assertEqual("you're in", response.api_key)
 
     async def test_error(self):
         try:

tests/test_process.py

@@ -0,0 +1,37 @@
+import sys
+from typing import Annotated, Optional
+
+import pytest
+from typing_extensions import Self
+
+from lapidary.runtime import ClientBase, Query, Responses
+from lapidary.runtime.model.op import OperationModel, get_operation_model
+
+
+def test_optional_param():
+    class Client(ClientBase):
+        async def operation(
+            self: Self,
+            param: Annotated[Optional[str], Query()],
+        ) -> Annotated[None, Responses({})]:
+            pass
+
+    op = get_operation_model('GET', '/op', Client.operation)
+    expected_anno = Query()
+    expected_anno.supply_formal('param', Optional[str])
+    assert op == OperationModel('GET', '/op', {'param': expected_anno}, {})
+
+
+@pytest.mark.skipif(sys.version_info < (3, 10), reason='type-or requires python3.10 or higher')
+def test_or_none_param():
+    class Client(ClientBase):
+        async def operation(
+            self: Self,
+            param: Annotated[str | None, Query()],
+        ) -> Annotated[None, Responses({})]:
+            pass
+
+    op = get_operation_model('GET', '/op', Client.operation)
+    expected_anno = Query()
+    expected_anno.supply_formal('param', Optional[str])
+    assert op == OperationModel('GET', '/op', {'param': expected_anno}, {})