fix tests

AntaresSimulatorTeam · Feb 4, 2025 · 45157ae · 45157ae
1 parent 940f29e
commit 45157ae
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/tests/antares/integration/test_local_client.py b/tests/antares/integration/test_local_client.py
@@ -20,9 +20,9 @@
 from antares.craft.model.commons import FilterOption
 from antares.craft.model.link import Link, LinkProperties, LinkUi
 from antares.craft.model.renewable import RenewableClusterGroup, RenewableClusterProperties
-from antares.craft.model.settings.general import GeneralParametersLocal, Mode
-from antares.craft.model.settings.playlist_parameters import PlaylistParameters
-from antares.craft.model.settings.study_settings import StudySettingsLocal
+from antares.craft.model.settings.advanced_parameters import AdvancedParameters, UnitCommitmentMode
+from antares.craft.model.settings.general import GeneralParameters
+from antares.craft.model.settings.study_settings import StudySettings
 from antares.craft.model.st_storage import STStorageGroup, STStorageProperties
 from antares.craft.model.study import Study, create_study_local
 from antares.craft.model.thermal import ThermalCluster, ThermalClusterGroup, ThermalClusterProperties
@@ -248,13 +248,9 @@ def test_local_study(self, tmp_path, unknown_area):
         }
 
         # test study creation with settings
-        settings = StudySettingsLocal()
-        settings.general_parameters = GeneralParametersLocal(mode="Adequacy")
-        settings.general_parameters.year_by_year = False
-        settings.playlist_parameters = PlaylistParameters()
-        settings.playlist_parameters.playlist = [{"status": False, "weight": 1}]
+        settings = StudySettings()
+        settings.general_parameters = GeneralParameters(nb_years=4)
+        settings.advanced_parameters = AdvancedParameters(unit_commitment_mode=UnitCommitmentMode.MILP)
         new_study = create_study_local("second_study", "880", tmp_path, settings)
-        settings = new_study.get_settings()
-        assert settings.general_parameters.mode == Mode.ADEQUACY.value
-        assert not settings.general_parameters.year_by_year
-        assert settings.playlist_parameters.model_dump() == {1: {"status": False, "weight": 1}}
+        assert new_study.get_settings().general_parameters.nb_years == 4
+        assert new_study.get_settings().advanced_parameters.unit_commitment_mode == UnitCommitmentMode.MILP.value
diff --git a/tests/integration/test_web_client.py b/tests/integration/test_web_client.py
@@ -494,7 +494,7 @@ def test_creation_lifecycle(self, antares_web: AntaresWebDesktop):
         settings.playlist_parameters = {1: PlaylistParameters(status=False, weight=1)}
         new_study = create_study_api("second_study", "880", api_config, settings)
         settings = new_study.get_settings()
-        assert settings.general_parameters.mode == Mode.ADEQUACY
+        assert settings.general_parameters.mode == Mode.ADEQUACY.value
         assert not settings.general_parameters.year_by_year
         assert settings.playlist_parameters == {1: PlaylistParameters(status=False, weight=1)}
 
@@ -504,9 +504,9 @@ def test_creation_lifecycle(self, antares_web: AntaresWebDesktop):
         new_settings.advanced_parameters = AdvancedParameters()
         new_settings.advanced_parameters.unit_commitment_mode = UnitCommitmentMode.MILP
         new_study.update_settings(new_settings)
-        assert new_study.get_settings().general_parameters.mode == Mode.ADEQUACY
+        assert new_study.get_settings().general_parameters.mode == Mode.ADEQUACY.value
         assert new_study.get_settings().general_parameters.nb_years == 4
-        assert new_study.get_settings().advanced_parameters.unit_commitment_mode == UnitCommitmentMode.MILP
+        assert new_study.get_settings().advanced_parameters.unit_commitment_mode == UnitCommitmentMode.MILP.value
 
         old_settings = new_study.get_settings()
         empty_settings = StudySettings()