From 85be15447d4a2e1931ebe427bf6a2c0c73d1ec05 Mon Sep 17 00:00:00 2001 From: emanuel-schmid Date: Mon, 9 Feb 2026 17:36:17 +0100 Subject: [PATCH] use exp_demo_h5 from api instead of demo data folder --- climada/engine/unsequa/test/test_unsequa.py | 12 ++++-------- climada/entity/measures/test/test_base.py | 4 +++- climada/test/test_api_client.py | 8 ++++---- climada/test/test_engine.py | 3 ++- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/climada/engine/unsequa/test/test_unsequa.py b/climada/engine/unsequa/test/test_unsequa.py index 1e7b965ed4..5af7988f6f 100755 --- a/climada/engine/unsequa/test/test_unsequa.py +++ b/climada/engine/unsequa/test/test_unsequa.py @@ -41,22 +41,18 @@ from climada.entity import Exposures, ImpactFunc, ImpactFuncSet from climada.entity.entity_def import Entity from climada.hazard import Hazard -from climada.util.api_client import Client +from climada.test import get_test_file from climada.util.constants import ( ENT_DEMO_FUTURE, ENT_DEMO_TODAY, - EXP_DEMO_H5, HAZ_DEMO_H5, TEST_UNC_OUTPUT_COSTBEN, TEST_UNC_OUTPUT_IMPACT, ) -test_unc_output_impact = Client().get_dataset_file( - name=TEST_UNC_OUTPUT_IMPACT, status="test_dataset" -) -test_unc_output_costben = Client().get_dataset_file( - name=TEST_UNC_OUTPUT_COSTBEN, status="test_dataset" -) +EXP_DEMO_H5 = get_test_file("exp_demo_today", file_format="hdf5") +test_unc_output_impact = get_test_file(TEST_UNC_OUTPUT_IMPACT) +test_unc_output_costben = get_test_file(TEST_UNC_OUTPUT_COSTBEN) def impf_dem(x_paa=1, x_mdd=1): diff --git a/climada/entity/measures/test/test_base.py b/climada/entity/measures/test/test_base.py index d8688e4bf1..6f76eb7373 100644 --- a/climada/entity/measures/test/test_base.py +++ b/climada/entity/measures/test/test_base.py @@ -36,10 +36,12 @@ from climada.entity.measures.measure_set import MeasureSet from climada.hazard.base import Hazard from climada.test import get_test_file -from climada.util.constants import EXP_DEMO_H5, HAZ_DEMO_H5 +from climada.util.constants import HAZ_DEMO_H5 DATA_DIR = CONFIG.measures.test_data.dir() +EXP_DEMO_H5 = get_test_file("exp_demo_today", file_format="hdf5") + HAZ_TEST_TC: Path = get_test_file("test_tc_florida", file_format="hdf5") """ Hazard test file from Data API: Hurricanes from 1851 to 2011 over Florida with 100 centroids. diff --git a/climada/test/test_api_client.py b/climada/test/test_api_client.py index 26ce163fdb..fd77984d48 100644 --- a/climada/test/test_api_client.py +++ b/climada/test/test_api_client.py @@ -177,14 +177,14 @@ def test_get_exposures(self): "fin_mode": "pop", "exponents": "(0,1)", }, - version="v1", + version="v3", dump_dir=DATA_DIR, ) self.assertEqual(len(exposures.gdf), 5782) self.assertEqual(np.unique(exposures.region_id), 40) self.assertEqual( exposures.description, - "LitPop Exposure for ['AUT'] at 150 as, year: 2018, financial mode: pop, exp: [0, 1], admin1_calc: False", + "LitPop Exposure for ['AUT'] at 150 as, year: 2018, financial mode: pop, exp: (0, 1), admin1_calc: False", ) def test_get_exposures_fails(self): @@ -264,12 +264,12 @@ def test_get_hazard_fails(self): def test_get_litpop(self): client = Client() - litpop = client.get_litpop(country="LUX", version="v1", dump_dir=DATA_DIR) + litpop = client.get_litpop(country="LUX", version="v3", dump_dir=DATA_DIR) self.assertEqual(len(litpop.gdf), 188) self.assertEqual(np.unique(litpop.region_id), 442) self.assertEqual( litpop.description, - "LitPop Exposure for ['LUX'] at 150 as, year: 2018, financial mode: pc, exp: [1, 1], admin1_calc: False", + "LitPop Exposure for ['LUX'] at 150 as, year: 2018, financial mode: pc, exp: (1, 1), admin1_calc: False", ) def test_get_litpop_fail(self): diff --git a/climada/test/test_engine.py b/climada/test/test_engine.py index 7b7256ad0f..82bf1e1106 100644 --- a/climada/test/test_engine.py +++ b/climada/test/test_engine.py @@ -34,14 +34,15 @@ from climada.entity import Exposures, ImpactFunc, ImpactFuncSet from climada.entity.entity_def import Entity from climada.hazard import Hazard +from climada.test import get_test_file from climada.util.constants import ( ENT_DEMO_FUTURE, ENT_DEMO_TODAY, - EXP_DEMO_H5, HAZ_DEMO_H5, ) DATA_DIR = CONFIG.engine.test_data.dir() +EXP_DEMO_H5 = get_test_file("exp_demo_today", file_format="hdf5") EMDAT_TEST_CSV = DATA_DIR.joinpath("emdat_testdata_BGD_USA_1970-2017.csv")