little refactor

AntaresSimulatorTeam · Sep 20, 2024 · d7adb0f · d7adb0f
1 parent fcdd05b
commit d7adb0f
Showing 1 changed file with 11 additions and 24 deletions.
diff --git a/tests/antares/services/local_services/test_study.py b/tests/antares/services/local_services/test_study.py
@@ -387,7 +387,7 @@ def test_area_optimization_ini_content(self, tmp_path, local_study):
             actual_optimization_ini_content = file.read()
 
         # Then
-        # assert actual_optimization_ini == expected_optimization_ini
+        assert actual_optimization_ini == expected_optimization_ini
         assert actual_optimization_ini_content == expected_optimization_ini_content
 
     def test_custom_area_optimization_ini_content(self, tmp_path, local_study):
@@ -541,9 +541,8 @@ def test_areas_have_default_properties(self, tmp_path, local_study_w_areas):
 
         # When
         actual_area_properties = local_study_w_areas.get_areas()["fr"].properties
-        actual_properties = AreaPropertiesLocal.model_validate(
-            actual_area_properties.model_dump(mode="json", exclude_none=True)
-        ).yield_local_dict()
+        created_properties = actual_area_properties.model_dump(mode="json", exclude_none=True)
+        actual_properties = AreaPropertiesLocal.model_validate(created_properties).yield_local_dict()
 
         assert expected_default_properties == actual_properties
 
@@ -574,10 +573,8 @@ def test_areas_with_custom_properties(self, tmp_path, local_study):
 
         # When
         created_area = local_study.create_area(area_name=area_to_create, properties=area_properties)
-        actual_properties = AreaPropertiesLocal.model_validate(
-            created_area.properties.model_dump(mode="json")
-        ).yield_local_dict()
-
+        created_properties = created_area.properties.model_dump(mode="json", exclude_none=True)
+        actual_properties = AreaPropertiesLocal.model_validate(created_properties).yield_local_dict()
         assert expected_properties == actual_properties
 
     def test_areas_ini_has_correct_sections(self, actual_thermal_areas_ini):
@@ -838,12 +835,8 @@ def test_created_link_has_custom_properties(self, tmp_path, local_study_w_areas)
 
         # Then
         assert actual_ini_content == expected_ini_content
-        assert (
-            link_created.properties
-            == LinkPropertiesLocal.model_validate(
-                link_properties.model_dump(mode="json", exclude_none=True)
-            ).yield_link_properties()
-        )
+        created_properties = link_properties.model_dump(mode="json", exclude_none=True)
+        assert link_created.properties == LinkPropertiesLocal.model_validate(created_properties).yield_link_properties()
         assert expected_ini == actual_ini
 
     def test_multiple_links_created_from_same_area(self, tmp_path, local_study_w_areas):
@@ -1077,13 +1070,7 @@ def test_created_link_with_custom_ui_values(self, tmp_path, local_study_w_areas)
         assert isinstance(local_study_w_areas.get_links()[link_to_create].ui, LinkUi)
         assert actual_ini == expected_ini
         assert actual_ini_string == expected_ini_string
-        assert (
-            actual_properties
-            == LinkPropertiesLocal.model_validate(
-                expected_properties.model_dump(mode="json", exclude_none=True)
-            ).yield_link_properties()
-        )
-        assert (
-            actual_ui
-            == LinkUiLocal.model_validate(expected_ui.model_dump(mode="json", exclude_none=True)).yield_link_ui()
-        )
+        created_properties = expected_properties.model_dump(mode="json", exclude_none=True)
+        assert actual_properties == LinkPropertiesLocal.model_validate(created_properties).yield_link_properties()
+        created_ui = expected_ui.model_dump(mode="json", exclude_none=True)
+        assert actual_ui == LinkUiLocal.model_validate(created_ui).yield_link_ui()