refactor: rename mock_function_factory to create_fake_function_obj for clarity

Author: pcrespov

services/web/server/tests/unit/with_dbs/04/functions/conftest.py

@@ -26,9 +26,7 @@
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.webserver_login import LoggedUser, UserInfoDict
 from servicelib.rabbitmq import RabbitMQRPCClient
-from servicelib.rabbitmq.rpc_interfaces.webserver.functions import (
-    functions_rpc_interface as functions_rpc,
-)
+from servicelib.rabbitmq.rpc_interfaces.webserver.v1.client import WebServerRpcClient
 from settings_library.rabbit import RabbitSettings
 from simcore_postgres_database.models.funcapi_api_access_rights_table import (
     funcapi_api_access_rights_table,
@@ -86,7 +84,7 @@ async def rpc_client(
 
 
 @pytest.fixture
-def mock_function_factory() -> Callable[[FunctionClass], Function]:
+def create_fake_function_obj() -> Callable[[FunctionClass], Function]:
     def _(function_class: FunctionClass) -> Function:
         if function_class == FunctionClass.PROJECT:
             return ProjectFunction(
@@ -152,23 +150,21 @@ async def user_without_function_api_access_rights(
 @pytest.fixture
 async def clean_functions(
     client: TestClient,
-    rpc_client: RabbitMQRPCClient,
+    webserver_rpc_client: WebServerRpcClient,
     logged_user: UserInfoDict,
     osparc_product_name: ProductName,
 ) -> None:
     assert client.app
 
-    functions, _ = await functions_rpc.list_functions(
-        rabbitmq_rpc_client=rpc_client,
+    functions, _ = await webserver_rpc_client.functions.list_functions(
         pagination_limit=100,
         pagination_offset=0,
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )
     for function in functions:
         assert function.uid is not None
-        await functions_rpc.delete_function(
-            rabbitmq_rpc_client=rpc_client,
+        await webserver_rpc_client.functions.delete_function(
             function_id=function.uid,
             user_id=logged_user["id"],
             product_name=osparc_product_name,
@@ -178,23 +174,23 @@ async def clean_functions(
 @pytest.fixture
 async def clean_function_job_collections(
     client: TestClient,
-    rpc_client: RabbitMQRPCClient,
+    webserver_rpc_client: WebServerRpcClient,
     logged_user: UserInfoDict,
     osparc_product_name: ProductName,
 ) -> None:
     assert client.app
 
-    job_collections, _ = await functions_rpc.list_function_job_collections(
-        rabbitmq_rpc_client=rpc_client,
-        pagination_limit=100,
-        pagination_offset=0,
-        user_id=logged_user["id"],
-        product_name=osparc_product_name,
+    job_collections, _ = (
+        await webserver_rpc_client.functions.list_function_job_collections(
+            pagination_limit=100,
+            pagination_offset=0,
+            user_id=logged_user["id"],
+            product_name=osparc_product_name,
+        )
     )
     for function_job_collection in job_collections:
         assert function_job_collection.uid is not None
-        await functions_rpc.delete_function_job_collection(
-            rabbitmq_rpc_client=rpc_client,
+        await webserver_rpc_client.functions.delete_function_job_collection(
             function_job_collection_id=function_job_collection.uid,
             user_id=logged_user["id"],
             product_name=osparc_product_name,

services/web/server/tests/unit/with_dbs/04/functions/test_functions_service.py

@@ -29,13 +29,13 @@ async def test_set_and_remove_group_permissions(
     logged_user: UserInfoDict,
     other_logged_user: UserInfoDict,
     osparc_product_name: ProductName,
-    mock_function_factory: Callable[[FunctionClass], RegisteredFunction],
+    create_fake_function_obj: Callable[[FunctionClass], RegisteredFunction],
     clean_functions: None,
 ) -> None:
     # Register the function
     registered_function = await _functions_service.register_function(
         app=client.app,
-        function=mock_function_factory(FunctionClass.PROJECT),
+        function=create_fake_function_obj(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )

services/web/server/tests/unit/with_dbs/04/functions/wb-api-server/test_function_job_collections_controller_rpc.py

@@ -38,7 +38,7 @@
 async def test_function_job_collection(
     client: TestClient,
     add_user_function_api_access_rights: None,
-    mock_function_factory: Callable[[FunctionClass], Function],
+    create_fake_function_obj: Callable[[FunctionClass], Function],
     webserver_rpc_client: WebServerRpcClient,
     logged_user: UserInfoDict,
     other_logged_user: UserInfoDict,
@@ -47,7 +47,7 @@ async def test_function_job_collection(
 ):
     # Register the function first
     registered_function = await webserver_rpc_client.functions.register_function(
-        function=mock_function_factory(FunctionClass.PROJECT),
+        function=create_fake_function_obj(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )
@@ -166,7 +166,7 @@ async def test_function_job_collection(
 async def test_list_function_job_collections(
     client: TestClient,
     add_user_function_api_access_rights: None,
-    mock_function_factory: Callable[[FunctionClass], Function],
+    create_fake_function_obj: Callable[[FunctionClass], Function],
     webserver_rpc_client: WebServerRpcClient,
     clean_functions: None,
     clean_function_job_collections: None,
@@ -191,7 +191,7 @@ async def test_list_function_job_collections(
 
     # Register the function first
     registered_function = await webserver_rpc_client.functions.register_function(
-        function=mock_function_factory(FunctionClass.PROJECT),
+        function=create_fake_function_obj(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )
@@ -269,20 +269,20 @@ async def test_list_function_job_collections_filtered_function_id(
     client: TestClient,
     add_user_function_api_access_rights: None,
     webserver_rpc_client: WebServerRpcClient,
-    mock_function_factory: Callable[[FunctionClass], Function],
+    create_fake_function_obj: Callable[[FunctionClass], Function],
     clean_functions: None,
     clean_function_job_collections: None,
     logged_user: UserInfoDict,
     osparc_product_name: ProductName,
 ):
     # Register the function first
     registered_function = await webserver_rpc_client.functions.register_function(
-        function=mock_function_factory(FunctionClass.PROJECT),
+        function=create_fake_function_obj(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )
     other_registered_function = await webserver_rpc_client.functions.register_function(
-        function=mock_function_factory(FunctionClass.PROJECT),
+        function=create_fake_function_obj(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )

services/web/server/tests/unit/with_dbs/04/functions/wb-api-server/test_function_jobs_controller_rpc.py

@@ -49,14 +49,14 @@ async def test_register_get_delete_function_job(
     client: TestClient,
     add_user_function_api_access_rights: None,
     webserver_rpc_client: WebServerRpcClient,
-    mock_function_factory: Callable[[FunctionClass], Function],
+    create_fake_function_obj: Callable[[FunctionClass], Function],
     logged_user: UserInfoDict,
     other_logged_user: UserInfoDict,
     osparc_product_name: ProductName,
 ):
     # Register the function first
     registered_function = await webserver_rpc_client.functions.register_function(
-        function=mock_function_factory(FunctionClass.PROJECT),
+        function=create_fake_function_obj(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )
@@ -168,13 +168,13 @@ async def test_list_function_jobs(
     client: TestClient,
     add_user_function_api_access_rights: None,
     webserver_rpc_client: WebServerRpcClient,
-    mock_function_factory: Callable[[FunctionClass], Function],
+    create_fake_function_obj: Callable[[FunctionClass], Function],
     logged_user: UserInfoDict,
     osparc_product_name: ProductName,
 ):
     # Register the function first
     registered_function = await webserver_rpc_client.functions.register_function(
-        function=mock_function_factory(FunctionClass.PROJECT),
+        function=create_fake_function_obj(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )
@@ -218,13 +218,13 @@ async def test_list_function_jobs_with_status(
     client: TestClient,
     add_user_function_api_access_rights: None,
     webserver_rpc_client: WebServerRpcClient,
-    mock_function_factory: Callable[[FunctionClass], Function],
+    create_fake_function_obj: Callable[[FunctionClass], Function],
     logged_user: UserInfoDict,
     osparc_product_name: ProductName,
 ):
     # Register the function first
     registered_function = await webserver_rpc_client.functions.register_function(
-        function=mock_function_factory(FunctionClass.PROJECT),
+        function=create_fake_function_obj(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )
@@ -268,19 +268,19 @@ async def test_list_function_jobs_with_status(
 async def test_list_function_jobs_filtering(
     client: TestClient,
     webserver_rpc_client: WebServerRpcClient,
-    mock_function_factory: Callable[[FunctionClass], Function],
+    create_fake_function_obj: Callable[[FunctionClass], Function],
     logged_user: UserInfoDict,
     osparc_product_name: ProductName,
     add_user_function_api_access_rights: None,
 ):
     # Register the function first
     first_registered_function = await webserver_rpc_client.functions.register_function(
-        function=mock_function_factory(FunctionClass.PROJECT),
+        function=create_fake_function_obj(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )
     second_registered_function = await webserver_rpc_client.functions.register_function(
-        function=mock_function_factory(FunctionClass.PROJECT),
+        function=create_fake_function_obj(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )
@@ -410,12 +410,12 @@ async def test_find_cached_function_jobs(
     logged_user: UserInfoDict,
     other_logged_user: UserInfoDict,
     osparc_product_name: ProductName,
-    mock_function_factory: Callable[[FunctionClass], Function],
+    create_fake_function_obj: Callable[[FunctionClass], Function],
     clean_functions: None,
 ):
     # Register the function first
     registered_function = await webserver_rpc_client.functions.register_function(
-        function=mock_function_factory(FunctionClass.PROJECT),
+        function=create_fake_function_obj(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )
@@ -521,12 +521,12 @@ async def test_patch_registered_function_jobs(
     logged_user: UserInfoDict,
     other_logged_user: UserInfoDict,
     osparc_product_name: ProductName,
-    mock_function_factory: Callable[[FunctionClass], Function],
+    create_fake_function_obj: Callable[[FunctionClass], Function],
     clean_functions: None,
     function_job: RegisteredFunctionJob,
     patch: RegisteredFunctionJobPatch,
 ):
-    function = mock_function_factory(function_job.function_class)
+    function = create_fake_function_obj(function_job.function_class)
 
     registered_function = await webserver_rpc_client.functions.register_function(
         function=function,
@@ -597,12 +597,12 @@ async def test_incompatible_patch_model_error(
     logged_user: UserInfoDict,
     other_logged_user: UserInfoDict,
     osparc_product_name: ProductName,
-    mock_function_factory: Callable[[FunctionClass], Function],
+    create_fake_function_obj: Callable[[FunctionClass], Function],
     clean_functions: None,
     function_job: RegisteredFunctionJob,
     patch: RegisteredFunctionJobPatch,
 ):
-    function = mock_function_factory(function_job.function_class)
+    function = create_fake_function_obj(function_job.function_class)
 
     registered_function = await webserver_rpc_client.functions.register_function(
         function=function,
@@ -644,7 +644,7 @@ async def test_update_function_job_status_output(
     add_user_function_api_access_rights: None,
     logged_user: UserInfoDict,
     other_logged_user: UserInfoDict,
-    mock_function_factory: Callable[[FunctionClass], Function],
+    create_fake_function_obj: Callable[[FunctionClass], Function],
     osparc_product_name: ProductName,
     access_by_other_user: bool,
     check_write_permissions: bool,
@@ -653,7 +653,7 @@ async def test_update_function_job_status_output(
 ):
     # Register the function first
     registered_function = await webserver_rpc_client.functions.register_function(
-        function=mock_function_factory(FunctionClass.PROJECT),
+        function=create_fake_function_obj(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )
@@ -738,12 +738,12 @@ async def test_update_function_job_outputs(
     webserver_rpc_client: WebServerRpcClient,
     add_user_function_api_access_rights: None,
     logged_user: UserInfoDict,
-    mock_function_factory: Callable[[FunctionClass], Function],
+    create_fake_function_obj: Callable[[FunctionClass], Function],
     osparc_product_name: ProductName,
 ):
     # Register the function first
     registered_function = await webserver_rpc_client.functions.register_function(
-        function=mock_function_factory(FunctionClass.PROJECT),
+        function=create_fake_function_obj(FunctionClass.PROJECT),
         user_id=logged_user["id"],
         product_name=osparc_product_name,
     )