removed deprecation

Author: sanderegg

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

@@ -8,35 +8,33 @@
 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_service_director_v2.models.comp_runs import CompRunsAtDB
 
 
 @pytest.mark.parametrize(
-    "model_cls",
-    [
-        CompRunsAtDB,
-    ],
+    "model_cls, example_name, example_data",
+    iter_model_examples_in_class(CompRunsAtDB),
 )
 def test_computation_run_model_examples(
-    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}"
+    assert_validation_model(
+        model_cls, example_name=example_name, example_data=example_data
+    )
 
 
 @pytest.mark.parametrize(
-    "model_cls",
-    [
-        CompRunsAtDB,
-    ],
+    "model_cls, example_name, example_data",
+    iter_model_examples_in_class(CompRunsAtDB),
 )
 def test_computation_run_model_with_run_result_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["result"] = RunningState.WAITING_FOR_RESOURCES.value
-        print(name, ":", pformat(example))
-        model_instance = model_cls(**example)
-        assert model_instance, f"Failed with {name}"
+    example_data["result"] = RunningState.WAITING_FOR_RESOURCES.value
+    print(example_name, ":", pformat(example_data))
+    model_instance = model_cls(**example_data)
+    assert model_instance, f"Failed with {example_name}"