removed deprecation

Author: sanderegg

services/director-v2/tests/unit/test_models_comp_tasks.py

@@ -2,73 +2,58 @@
 # pylint:disable=unused-argument
 # pylint:disable=redefined-outer-name
 
-from pprint import pformat
 from typing import Any
 
 import pytest
 from models_library.projects_state import RunningState
 from pydantic.main import BaseModel
+from pytest_simcore.pydantic_models import (
+    assert_validation_model,
+    iter_model_examples_in_class,
+)
 from simcore_postgres_database.models.comp_pipeline import StateType
 from simcore_service_director_v2.models.comp_tasks import CompTaskAtDB
 
 
 @pytest.mark.parametrize(
-    "model_cls",
-    (CompTaskAtDB,),
+    "model_cls, example_name, example_data",
+    iter_model_examples_in_class(CompTaskAtDB),
 )
 def test_computation_task_model_examples(
-    model_cls: type[BaseModel], model_cls_examples: dict[str, dict[str, Any]]
-):
-    for name, example in model_cls_examples.items():
-        print(name, ":", pformat(example))
-        model_instance = model_cls(**example)
-        assert model_instance, f"Failed with {name}"
-
-
-@pytest.mark.parametrize(
-    "model_cls",
-    [CompTaskAtDB],
-)
-def test_computation_task_model_export_to_db_model(
-    model_cls: type[BaseModel], model_cls_examples: dict[str, dict[str, Any]]
+    model_cls: type[BaseModel], example_name: str, example_data: dict[str, Any]
 ):
-    for name, example in model_cls_examples.items():
-        print(name, ":", pformat(example))
-        model_instance = model_cls(**example)
-        assert model_instance, f"Failed with {name}"
+    model_instance = assert_validation_model(
+        model_cls, example_name=example_name, example_data=example_data
+    )
 
-        assert isinstance(model_instance, CompTaskAtDB)
-        db_model = model_instance.to_db_model()
+    assert isinstance(model_instance, CompTaskAtDB)
+    db_model = model_instance.to_db_model()
 
-        assert isinstance(db_model, dict)
-        assert StateType(db_model["state"])
+    assert isinstance(db_model, dict)
+    assert StateType(db_model["state"])
 
 
 @pytest.mark.parametrize(
-    "model_cls",
-    [CompTaskAtDB],
+    "model_cls, example_name, example_data",
+    iter_model_examples_in_class(CompTaskAtDB),
 )
 def test_computation_task_model_with_running_state_value_field(
-    model_cls: type[BaseModel], model_cls_examples: dict[str, dict[str, Any]]
+    model_cls: type[BaseModel], example_name: str, example_data: dict[str, Any]
 ):
-    for name, example in model_cls_examples.items():
-        example["state"] = RunningState.WAITING_FOR_RESOURCES.value
-        print(name, ":", pformat(example))
-        model_instance = model_cls(**example)
-        assert model_instance, f"Failed with {name}"
+    example_data["state"] = RunningState.WAITING_FOR_RESOURCES.value
+    model_instance = model_cls(**example_data)
+    assert model_instance, f"Failed with {example_name}"
 
 
 @pytest.mark.parametrize(
-    "model_cls",
-    [CompTaskAtDB],
+    "model_cls, example_name, example_data",
+    iter_model_examples_in_class(CompTaskAtDB),
 )
 def test_computation_task_model_with_wrong_default_value_field(
-    model_cls: type[BaseModel], model_cls_examples: dict[str, dict[str, Any]]
+    model_cls: type[BaseModel], example_name: str, example_data: dict[str, Any]
 ):
-    for name, example in model_cls_examples.items():
-        for output_schema in example.get("schema", {}).get("outputs", {}).values():
-            output_schema["defaultValue"] = None
+    for output_schema in example_data.get("schema", {}).get("outputs", {}).values():
+        output_schema["defaultValue"] = None
 
-        print(name, ":", pformat(example))
-        model_instance = model_cls(**example)
-        assert model_instance, f"Failed with {name}"
+    model_instance = model_cls(**example_data)
+    assert model_instance, f"Failed with {example_name}"