drafting tests

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/helpers/catalog_rpc_server.py

@@ -25,15 +25,17 @@
 )
 from models_library.services_types import ServiceKey, ServiceVersion
 from models_library.users import UserID
-from pydantic import NonNegativeInt, TypeAdapter
+from pydantic import NonNegativeInt, TypeAdapter, validate_call
+from pytest_mock import MockType
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 
 
 class CatalogRpcSideEffects:
     # pylint: disable=no-self-use
+    @validate_call(config={"arbitrary_types_allowed": True})
     async def list_services_paginated(
         self,
-        rpc_client: RabbitMQRPCClient,
+        rpc_client: RabbitMQRPCClient | MockType,
         *,
         product_name: ProductName,
         user_id: UserID,
@@ -58,9 +60,10 @@ async def list_services_paginated(
             offset=offset,
         )
 
+    @validate_call(config={"arbitrary_types_allowed": True})
     async def get_service(
         self,
-        rpc_client: RabbitMQRPCClient,
+        rpc_client: RabbitMQRPCClient | MockType,
         *,
         product_name: ProductName,
         user_id: UserID,
@@ -87,9 +90,10 @@ async def get_service(
 
         return got
 
+    @validate_call(config={"arbitrary_types_allowed": True})
     async def update_service(
         self,
-        rpc_client: RabbitMQRPCClient,
+        rpc_client: RabbitMQRPCClient | MockType,
         *,
         product_name: ProductName,
         user_id: UserID,
@@ -108,9 +112,10 @@ async def update_service(
         got.key = service_key
         return got.model_copy(update=update.model_dump(exclude_unset=True))
 
+    @validate_call(config={"arbitrary_types_allowed": True})
     async def list_my_service_history_paginated(
         self,
-        rpc_client: RabbitMQRPCClient,
+        rpc_client: RabbitMQRPCClient | MockType,
         *,
         product_name: ProductName,
         user_id: UserID,
@@ -138,9 +143,10 @@ async def list_my_service_history_paginated(
             offset=offset,
         )
 
+    @validate_call(config={"arbitrary_types_allowed": True})
     async def get_service_ports(
         self,
-        rpc_client: RabbitMQRPCClient,
+        rpc_client: RabbitMQRPCClient | MockType,
         *,
         product_name: ProductName,
         user_id: UserID,

services/api-server/src/simcore_service_api_server/_service_solvers.py

@@ -14,8 +14,9 @@
 from models_library.services_history import ServiceRelease
 from models_library.users import UserID
 from packaging.version import Version
-from simcore_service_api_server.models.schemas.jobs import Job
 
+from .api.dependencies.webserver_rpc import get_wb_api_rpc_client
+from .models.schemas.jobs import Job
 from .models.schemas.solvers import Solver, SolverKeyId
 from .services_rpc.catalog import CatalogService
 from .services_rpc.wb_api_server import WbApiRpcClient
@@ -30,7 +31,7 @@ class SolverService:
     def __init__(
         self,
         catalog_service: Annotated[CatalogService, Depends()],
-        webserver_client: Annotated[WbApiRpcClient, Depends()],
+        webserver_client: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
     ):
         self._catalog_service = catalog_service
         self._webserver_client = webserver_client

services/api-server/tests/unit/conftest.py

@@ -31,6 +31,7 @@
 from models_library.api_schemas_webserver.projects import ProjectGet
 from models_library.app_diagnostics import AppStatusCheck
 from models_library.generics import Envelope
+from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import BaseFileLink, SimcoreS3FileID
 from models_library.users import UserID
@@ -54,6 +55,11 @@
 from simcore_service_api_server.services_http.solver_job_outputs import ResultsTypes
 
 
+@pytest.fixture
+def product_name() -> ProductName:
+    return "osparc"
+
+
 @pytest.fixture
 def mocked_rpc_catalog_service_api(
     app: FastAPI, mocker: MockerFixture

services/api-server/tests/unit/test_service_solvers.py

@@ -0,0 +1,41 @@
+# pylint: disable=protected-access
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+
+import pytest
+from models_library.products import ProductName
+from models_library.users import UserID
+from pytest_mock import MockerFixture, MockType
+from simcore_service_api_server._service_solvers import SolverService
+from simcore_service_api_server.models.schemas.solvers import Solver
+from simcore_service_api_server.services_rpc.catalog import CatalogService
+from simcore_service_api_server.services_rpc.wb_api_server import WbApiRpcClient
+
+
+@pytest.fixture
+def solver_service(
+    mocker: MockerFixture,
+    mocked_rpc_catalog_service_api: dict[str, MockType],
+) -> SolverService:
+    return SolverService(
+        catalog_service=CatalogService(client=mocker.MagicMock()),
+        webserver_client=WbApiRpcClient(_client=mocker.MagicMock()),
+    )
+
+
+async def test_get_solver(
+    solver_service: SolverService,
+    mocked_rpc_catalog_service_api: dict[str, MockType],
+    product_name: ProductName,
+    user_id: UserID,
+):
+    solver = await solver_service.get_solver(
+        user_id=user_id,
+        name="simcore/services/comp/solver-1",
+        version="1.0.0",
+        product_name=product_name,
+    )
+
+    assert isinstance(solver, Solver)
+    mocked_rpc_catalog_service_api["get_service"].assert_called_once()

services/api-server/tests/unit/test_services_catalog.py

@@ -4,7 +4,6 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
-import pytest
 from fastapi import FastAPI
 from models_library.api_schemas_catalog.services import LatestServiceGet, ServiceGetV2
 from models_library.products import ProductName
@@ -16,11 +15,6 @@
 from simcore_service_api_server.services_rpc.catalog import CatalogService
 
 
-@pytest.fixture
-def product_name() -> ProductName:
-    return "osparc"
-
-
 def to_solver(
     service: LatestServiceGet | ServiceGetV2, href_self: HttpUrl | None = None
 ) -> Solver: