✨ Add unit tests for JobService, SolverService, and CatalogService with fixtures

Author: pcrespov

services/api-server/tests/unit/test_service_solvers.py renamed to services/api-server/tests/unit/service/conftest.py

@@ -9,7 +9,6 @@
 from pytest_mock import MockerFixture, MockType
 from simcore_service_api_server._service_jobs import JobService
 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
 
@@ -23,7 +22,7 @@ def job_service(
     user_id: UserID,
 ) -> JobService:
     return JobService(
-        web_rest_api=mocker.MagicMock(),
+        web_rest_api=mocker.MagicMock(),  # TODO: might want to return the real one
         web_rpc_api=WbApiRpcClient(_client=mocker.MagicMock()),
         user_id=user_id,
         product_name=product_name,
@@ -44,34 +43,3 @@ def solver_service(
     job_service: JobService,
 ) -> SolverService:
     return SolverService(catalog_service=catalog_service, job_service=job_service)
-
-
-async def test_get_solver(
-    solver_service: SolverService,
-    mocked_catalog_rpc_api: dict[str, MockType],
-    product_name: ProductName,
-    user_id: UserID,
-):
-    solver = await solver_service.get_solver(
-        user_id=user_id,
-        solver_key="simcore/services/comp/solver-1",
-        solver_version="1.0.0",
-        product_name=product_name,
-    )
-
-    assert isinstance(solver, Solver)
-    mocked_catalog_rpc_api["get_service"].assert_called_once()
-
-
-async def test_list_jobs(
-    solver_service: SolverService,
-    mocked_webserver_rpc_api: dict[str, MockType],
-):
-    # Test default parameters
-    jobs, page_meta = await solver_service.list_jobs()
-    assert isinstance(jobs, list)
-    mocked_webserver_rpc_api["list_projects_marked_as_jobs"].assert_called_once()
-    assert page_meta.total >= 0
-    assert page_meta.limit == 49
-    assert page_meta.offset == 0
-    assert page_meta.count > 0

services/api-server/tests/unit/test_service_jobs.py renamed to services/api-server/tests/unit/service/test_service_jobs.py

@@ -0,0 +1,41 @@
+# pylint: disable=protected-access
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+
+from models_library.products import ProductName
+from models_library.users import UserID
+from pytest_mock import MockType
+from simcore_service_api_server._service_solvers import SolverService
+from simcore_service_api_server.models.schemas.solvers import Solver
+
+
+async def test_get_solver(
+    solver_service: SolverService,
+    mocked_catalog_rpc_api: dict[str, MockType],
+    product_name: ProductName,
+    user_id: UserID,
+):
+    solver = await solver_service.get_solver(
+        user_id=user_id,
+        solver_key="simcore/services/comp/solver-1",
+        solver_version="1.0.0",
+        product_name=product_name,
+    )
+
+    assert isinstance(solver, Solver)
+    mocked_catalog_rpc_api["get_service"].assert_called_once()
+
+
+async def test_list_jobs(
+    solver_service: SolverService,
+    mocked_webserver_rpc_api: dict[str, MockType],
+):
+    # Test default parameters
+    jobs, page_meta = await solver_service.list_jobs()
+    assert isinstance(jobs, list)
+    mocked_webserver_rpc_api["list_projects_marked_as_jobs"].assert_called_once()
+    assert page_meta.total >= 0
+    assert page_meta.limit == 49
+    assert page_meta.offset == 0
+    assert page_meta.count > 0

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

@@ -4,13 +4,12 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
-from fastapi import FastAPI
 from models_library.api_schemas_catalog.services import LatestServiceGet, ServiceGetV2
 from models_library.products import ProductName
 from models_library.services_history import ServiceRelease
 from models_library.users import UserID
 from pydantic import HttpUrl
-from pytest_mock import MockerFixture, MockType
+from pytest_mock import MockType
 from simcore_service_api_server.models.schemas.solvers import Solver
 from simcore_service_api_server.services_rpc.catalog import CatalogService
 
@@ -30,14 +29,11 @@ def to_solver(
 
 
 async def test_catalog_service_read_solvers(
-    app: FastAPI,
     product_name: ProductName,
     user_id: UserID,
-    mocker: MockerFixture,
     mocked_catalog_rpc_api: dict[str, MockType],
+    catalog_service: CatalogService,
 ):
-    catalog_service = CatalogService(client=mocker.MagicMock())
-
     # Step 1: List latest releases in a page
     latest_releases, meta = await catalog_service.list_latest_releases(
         product_name=product_name, user_id=user_id