Slightly improve condition coverage on parameters.cpp (#2640)

See https://sonarcloud.io/component_measures?metric=conditions_to_cover&selected=AntaresSimulatorTeam_Antares_Simulator%3Asrc%2Flibs%2Fantares%2Fstudy%2Fparameters.cpp&view=list&id=AntaresSimulatorTeam_Antares_Simulator
AntaresSimulatorTeam · Feb 19, 2025 · 98f3a22 · 98f3a22
1 parent faf310f
commit 98f3a22
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/libs/antares/study/include/antares/study/parameters.h b/src/libs/antares/study/include/antares/study/parameters.h
@@ -77,6 +77,9 @@ class Parameters final
     */
     bool loadFromFile(const std::filesystem::path& filename, const StudyVersion& version);
 
+    //! Load data from an INI file
+    bool loadFromINI(const IniFile& ini, const StudyVersion& version);
+
     /*!
     ** \brief Prepare all settings for a simulation
     **
@@ -507,9 +510,6 @@ class Parameters final
     Antares::Solver::Optimization::OptimizationOptions optOptions;
 
 private:
-    //! Load data from an INI file
-    bool loadFromINI(const IniFile& ini, const StudyVersion& version);
-
     void resetPlayedYears(uint nbOfYears);
 
     //! MC year weight for MC synthesis

diff --git a/src/tests/src/libs/antares/study/parameters/parameters-tests.cpp b/src/tests/src/libs/antares/study/parameters/parameters-tests.cpp
@@ -124,6 +124,26 @@ BOOST_FIXTURE_TEST_CASE(hydroPmax, Fixture)
     BOOST_CHECK(!StringToCompatibilityHydroPmax(p.compatibility.hydroPmax, "abc"));
 }
 
+BOOST_AUTO_TEST_CASE(saveLoadGeneralData)
+{
+    IniFile ini;
+    Parameters parameters;
+    parameters.reset();
+    parameters.timeSeriesToGenerate = timeSeriesLoad | timeSeriesHydro | timeSeriesWind
+                                      | timeSeriesThermal | timeSeriesSolar | timeSeriesRenewable;
+
+    parameters.timeSeriesToRefresh = parameters.timeSeriesToGenerate;
+    parameters.resultFormat = zipArchive;
+
+    parameters.saveToINI(ini);
+
+    Parameters loaded;
+    loaded.loadFromINI(ini, StudyVersion::latest());
+    BOOST_CHECK_EQUAL(parameters.timeSeriesToGenerate, loaded.timeSeriesToGenerate);
+    BOOST_CHECK_EQUAL(parameters.timeSeriesToRefresh, loaded.timeSeriesToRefresh);
+    BOOST_CHECK_EQUAL(parameters.resultFormat, loaded.resultFormat);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 void Fixture::writeInvalidFile()