Update folder structure of tests

calliope-project · Jun 27, 2024 · 3b4d116 · 3b4d116
1 parent f2a9fd7
commit 3b4d116
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/tests/model/test_capacityfactors.py → ...timeseries/supply/test_capacityfactors.py b/tests/model/test_capacityfactors.py → ...timeseries/supply/test_capacityfactors.py
diff --git a/tests/scripts/test_national_load.py → tests/scripts/demand/test_national_load.py b/tests/scripts/test_national_load.py → tests/scripts/demand/test_national_load.py
@@ -1,4 +1,5 @@
 import os
+from pathlib import Path
 
 import numpy as np
 import pandas as pd
@@ -14,7 +15,8 @@
     filter_outliers,
 )
 
-THIS_DIR = os.path.dirname(__file__)
+THIS_DIR = Path(os.path.dirname(__file__))
+PATH_TO_RESOURCES = THIS_DIR / ".." / ".." / "resources"
 
 
 class TestLoadHelperFunctions:
@@ -197,14 +199,13 @@ def _load(
                 "fill-29th-feb-from-28th": fill_29th_feb_from_28th,
                 "data-source-priority-order": list(data_source_priority_order),
             }
-            path_to_raw_load = os.path.join(
-                THIS_DIR, "..", "resources", "national", "dummy_load.csv"
-            )
+            path_to_raw_load = PATH_TO_RESOURCES / "national" / "dummy_load.csv"
+
             countries = ["ALB", "DEU"]
             year = 2016
 
             return clean_load_data(
-                path_to_raw_load, year, year, data_quality_config, countries
+                path_to_raw_load.as_posix(), year, year, data_quality_config, countries
             )
 
         return _load

diff --git a/tests/scripts/test_link_entsoe_tyndp.py → ...est_template_transmission_entsoe_tyndp.py b/tests/scripts/test_link_entsoe_tyndp.py → ...est_template_transmission_entsoe_tyndp.py