Skip to content

Commit

Permalink
feat(storage): add missing folders in empty_study_850.zip (#1363)
Browse files Browse the repository at this point in the history
Co-authored-by: Laurent LAPORTE <[email protected]>
  • Loading branch information
MartinBelthle and laurent-laporte-pro committed Mar 3, 2023
1 parent 9742be1 commit fb9e4ce
Show file tree
Hide file tree
Showing 12 changed files with 87 additions and 0 deletions.
Binary file modified resources/empty_study_613.zip
Binary file not shown.
Binary file modified resources/empty_study_700.zip
Binary file not shown.
Binary file modified resources/empty_study_710.zip
Binary file not shown.
Binary file modified resources/empty_study_720.zip
Binary file not shown.
Binary file modified resources/empty_study_803.zip
Binary file not shown.
Binary file modified resources/empty_study_810.zip
Binary file not shown.
Binary file modified resources/empty_study_820.zip
Binary file not shown.
Binary file modified resources/empty_study_830.zip
Binary file not shown.
Binary file modified resources/empty_study_840.zip
Binary file not shown.
Binary file modified resources/empty_study_850.zip
Binary file not shown.
Binary file removed resources/templates/empty_study_840.zip
Binary file not shown.
87 changes: 87 additions & 0 deletions tests/test_resources.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
import pathlib
import zipfile
from typing import Sequence

import pytest

# fmt: off
HERE = pathlib.Path(__file__).parent.resolve()
PROJECT_DIR = next(iter(p for p in HERE.parents if p.joinpath("antarest").exists()))
RESOURCES_DIR = PROJECT_DIR.joinpath("resources")
# fmt: on

# All ZIP files have the same file tree structure because empty studies are similar.
# There are only real differences when the user sets up the study or runs simulations
# (e.g. the outputs are different).
STUDY_FILES = [
"Desktop.ini",
"input/",
"input/areas/",
"input/areas/list.txt",
"input/areas/sets.ini",
"input/bindingconstraints/",
"input/bindingconstraints/bindingconstraints.ini",
"input/hydro/",
"input/hydro/allocation/",
"input/hydro/common/",
"input/hydro/common/capacity/",
"input/hydro/hydro.ini",
"input/hydro/prepro/",
"input/hydro/prepro/correlation.ini",
"input/hydro/series/",
"input/links/",
"input/load/",
"input/load/prepro/",
"input/load/prepro/correlation.ini",
"input/load/series/",
"input/misc-gen/",
"input/reserves/",
"input/solar/",
"input/solar/prepro/",
"input/solar/prepro/correlation.ini",
"input/solar/series/",
"input/thermal/",
"input/thermal/areas.ini",
"input/thermal/clusters/",
"input/thermal/prepro/",
"input/thermal/series/",
"input/wind/",
"input/wind/prepro/",
"input/wind/prepro/correlation.ini",
"input/wind/series/",
"layers/",
"layers/layers.ini",
"logs/",
"output/",
"settings/",
"settings/comments.txt",
"settings/generaldata.ini",
"settings/resources/",
"settings/resources/study.ico",
"settings/scenariobuilder.dat",
"settings/simulations/",
"study.antares",
"user/",
]


@pytest.mark.parametrize(
"filename, expected_list",
[
("empty_study_850.zip", STUDY_FILES),
("empty_study_840.zip", STUDY_FILES),
("empty_study_830.zip", STUDY_FILES),
("empty_study_820.zip", STUDY_FILES),
("empty_study_810.zip", STUDY_FILES),
("empty_study_803.zip", STUDY_FILES),
("empty_study_720.zip", STUDY_FILES),
("empty_study_710.zip", STUDY_FILES),
("empty_study_700.zip", STUDY_FILES),
("empty_study_613.zip", STUDY_FILES),
],
)
def test_empty_study_zip(filename: str, expected_list: Sequence[str]):
resource_path = RESOURCES_DIR.joinpath(filename)
with zipfile.ZipFile(resource_path) as myzip:
actual = sorted(myzip.namelist())
assert actual == expected_list

0 comments on commit fb9e4ce

Please sign in to comment.