minor refactoring

Author: bisgaard-itis

clients/python/test/test_osparc/conftest.py

@@ -53,3 +53,27 @@ def _sideeffect(
         mocker.patch("urllib3.PoolManager.request", side_effect=_sideeffect)
 
     yield _mock_server
+
+
+@pytest.fixture
+def job_metadata_update(faker: Faker):
+    return osparc.JobMetadataUpdate(
+        metadata={
+            "boolean": faker.boolean(),
+            "float": faker.pyfloat(),
+            "int": faker.pyint(),
+            "str": faker.text(),
+            "None": None,
+        }
+    )
+
+
+@pytest.fixture
+def job_metadata(
+    faker: Faker, job_metadata_update: osparc.JobMetadataUpdate
+) -> osparc.JobMetadata:
+    return osparc.JobMetadata(
+        job_id=f"{faker.uuid4()}",
+        metadata=job_metadata_update.metadata,
+        url=faker.url(),
+    )

clients/python/test/test_osparc/test_solvers_api.py

@@ -1,36 +1,9 @@
-import pytest
 from osparc import JobMetadata, ApiClient, SolversApi, JobMetadataUpdate
 from faker import Faker
 from typing import Callable
 from pydantic import BaseModel
 
 
-@pytest.fixture
-def job_metadata(faker: Faker) -> JobMetadata:
-    _job_id = f"{faker.uuid4()}"
-    return JobMetadata(
-        job_id=_job_id,
-        metadata={
-            "job_id": _job_id,
-            "job_name": f"{faker.text()}",
-            "node_id": f"{faker.uuid4()}",
-        },
-        url=faker.url(),
-    )
-
-
-@pytest.fixture
-def job_metadata_update(faker: Faker):
-    return JobMetadataUpdate(
-        metadata={
-            "var1": faker.boolean(),
-            "var2": faker.pyfloat(),
-            "var3": faker.pyint(),
-            "var4": faker.text(),
-        }
-    )
-
-
 def test_get_job_custom_metadata(
     create_server_mock: Callable[[int, BaseModel], None],
     job_metadata: JobMetadata,
@@ -44,3 +17,22 @@ def test_get_job_custom_metadata(
         solver_key="mysolver", version="1.2.3", job_id=f"{faker.uuid4()}"
     )
     assert metadata == job_metadata
+
+
+def test_replace_job_custom_metadata(
+    create_server_mock: Callable[[int, BaseModel], None],
+    job_metadata: JobMetadata,
+    job_metadata_update: JobMetadataUpdate,
+    api_client: ApiClient,
+    faker: Faker,
+):
+    create_server_mock(200, job_metadata)
+
+    _solvers_api = SolversApi(api_client=api_client)
+    _job_metadata = _solvers_api.replace_job_custom_metadata(
+        solver_key="mysolver",
+        version="1.2.3",
+        job_id=f"{faker.uuid4()}",
+        job_metadata_update=job_metadata_update,
+    )
+    assert _job_metadata == job_metadata