-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Increase coverage on hydro common data (hydro.ini) [ANT-1825] (#2634)
# Description
- Split large loading function (time-series / INI file)
- Add coverage on new property `overflow spilled cost difference`
# Summary
```cpp
void CommonFixture::writeValidFile()
{
std::ofstream outfile(hydroIni);
outfile <<
R"([overflow spilled cost difference]
east = 1.00000
west = 2.31000
[reservoir]
east = true)";
}
BOOST_FIXTURE_TEST_CASE(test_read_valid_file, CommonFixture)
{
writeValidFile();
BOOST_CHECK(load());
BOOST_CHECK_EQUAL(east->hydro.overflowSpilledCostDifference, 1.0);
BOOST_CHECK_EQUAL(west->hydro.overflowSpilledCostDifference, 2.31000);
}
```- Loading branch information
Showing
4 changed files
with
232 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
121 changes: 121 additions & 0 deletions
121
src/tests/src/libs/antares/study/parts/hydro/test-hydro-common.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| /* | ||
| * Copyright 2007-2024, RTE (https://www.rte-france.com) | ||
| * See AUTHORS.txt | ||
| * SPDX-License-Identifier: MPL-2.0 | ||
| * This file is part of Antares-Simulator, | ||
| * Adequacy and Performance assessment for interconnected energy networks. | ||
| * | ||
| * Antares_Simulator is free software: you can redistribute it and/or modify | ||
| * it under the terms of the Mozilla Public Licence 2.0 as published by | ||
| * the Mozilla Foundation, either version 2 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * Antares_Simulator is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * Mozilla Public Licence 2.0 for more details. | ||
| * | ||
| * You should have received a copy of the Mozilla Public Licence 2.0 | ||
| * along with Antares_Simulator. If not, see <https://opensource.org/license/mpl-2-0/>. | ||
| */ | ||
|
|
||
| #define BOOST_TEST_MODULE test hydro common | ||
|
|
||
| #define WIN32_LEAN_AND_MEAN | ||
|
|
||
| #include <files-system.h> | ||
| #include <memory> | ||
|
|
||
| #include <boost/test/unit_test.hpp> | ||
|
|
||
| #include <antares/study/study.h> | ||
|
|
||
| #define SEP "/" | ||
|
|
||
| using namespace Antares::Data; | ||
| namespace fs = std::filesystem; | ||
|
|
||
| // ================= | ||
| // The fixture | ||
| // ================= | ||
| struct CommonFixture | ||
| { | ||
| std::filesystem::path path; | ||
| StudyLoadOptions options; | ||
| StudyVersion version = StudyVersion::latest(); | ||
|
|
||
| CommonFixture(): | ||
| tmp(fs::temp_directory_path()), | ||
| hydroIni(tmp / "hydro.ini"), | ||
| study(std::make_unique<Study>()) | ||
| { | ||
| east = new Area("east"); // freed by ~AreaList | ||
| study->areas.add(east); | ||
| west = new Area("west"); // freed by ~AreaList | ||
| study->areas.add(west); | ||
| } | ||
|
|
||
| bool load() | ||
| { | ||
| return east->hydro.LoadIniFile(*study, tmp) && west->hydro.LoadIniFile(*study, tmp); | ||
| } | ||
|
|
||
| ~CommonFixture() | ||
| { | ||
| fs::remove(hydroIni); | ||
| } | ||
|
|
||
| void writeValidFile(); | ||
| void writeInvalidFile(); | ||
|
|
||
| public: | ||
| Area* east; | ||
| Area* west; | ||
|
|
||
| private: | ||
| fs::path tmp; | ||
| fs::path hydroIni; | ||
| std::unique_ptr<Study> study; | ||
| }; | ||
|
|
||
| void CommonFixture::writeValidFile() | ||
| { | ||
| std::ofstream outfile(hydroIni); | ||
| outfile << | ||
| R"([overflow spilled cost difference] | ||
| east = 1.00000 | ||
| west = 2.31000 | ||
| [reservoir] | ||
| east = true)"; | ||
| } | ||
|
|
||
| void CommonFixture::writeInvalidFile() | ||
| { | ||
| std::ofstream outfile(hydroIni); | ||
| outfile << | ||
| R"([overflow spilled cost difference] | ||
| east = 1.00000 | ||
| west = 2.31000 | ||
| wrongarea = 1.414 | ||
| [reservoir] | ||
| east = true)"; | ||
| } | ||
|
|
||
| BOOST_AUTO_TEST_SUITE(s) | ||
|
|
||
| BOOST_FIXTURE_TEST_CASE(test_read_valid_file, CommonFixture) | ||
| { | ||
| writeValidFile(); | ||
| BOOST_CHECK(load()); | ||
| BOOST_CHECK_EQUAL(east->hydro.overflowSpilledCostDifference, 1.0); | ||
| BOOST_CHECK_EQUAL(west->hydro.overflowSpilledCostDifference, 2.31000); | ||
| } | ||
|
|
||
| BOOST_FIXTURE_TEST_CASE(test_read_invalid_file, CommonFixture) | ||
| { | ||
| writeInvalidFile(); | ||
| BOOST_CHECK(!load()); | ||
| } | ||
| BOOST_AUTO_TEST_SUITE_END() |