From 7864a8dd861c1c245c0522a07b650c9548aa05ca Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Thu, 7 Nov 2024 08:57:01 +0100 Subject: [PATCH] Moved case_21 in the infrastructure_risk tests --- .../tests/infrastructure_risk_test.py | 90 +++++++------------ .../calculators/tests/scenario_damage_test.py | 9 +- .../{case_15 => case_1}/__init__.py | 0 .../expected/infra-avg_loss.csv | 0 .../expected/infra-dem_cl.csv | 0 .../expected/infra-event_ccl.csv | 0 .../expected/infra-event_efl.csv | 0 .../expected/infra-event_pcl.csv | 0 .../expected/infra-event_wcl.csv | 0 .../expected/infra-node_el.csv | 0 .../{case_15 => case_1}/exposure.xml | 0 .../exposure_demo_edges.csv | 0 .../exposure_demo_nodes.csv | 0 .../{case_15 => case_1}/fragility_model.xml | 0 .../{case_15 => case_1}/job.ini | 0 .../{case_15 => case_1}/nonfunctional.csv | 0 .../{case_15 => case_1}/rupture_model.xml | 0 .../site_model_measured.xml | 0 .../case_2}/__init__.py | 0 .../consequence_multiple_loss_types.csv | 0 .../case_2}/expected/aggrisk-parent.csv | 0 .../case_2}/expected/aggrisk.csv | 0 .../case_2}/exposure.xml | 0 .../case_2}/exposure_demo_edges.csv | 0 .../case_2}/exposure_demo_nodes.csv | 0 .../case_2}/fragility_model_landslide.xml | 0 .../case_2}/fragility_model_liquefaction.xml | 0 .../case_2}/fragility_model_structural.xml | 0 .../case_2}/gmpe_logic_tree_ascr.xml | 0 .../case_2}/job.ini | 0 .../case_2}/rupture.xml | 0 .../case_2}/site_model.csv | 0 32 files changed, 31 insertions(+), 68 deletions(-) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/__init__.py (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/expected/infra-avg_loss.csv (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/expected/infra-dem_cl.csv (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/expected/infra-event_ccl.csv (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/expected/infra-event_efl.csv (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/expected/infra-event_pcl.csv (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/expected/infra-event_wcl.csv (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/expected/infra-node_el.csv (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/exposure.xml (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/exposure_demo_edges.csv (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/exposure_demo_nodes.csv (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/fragility_model.xml (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/job.ini (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/nonfunctional.csv (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/rupture_model.xml (100%) rename openquake/qa_tests_data/infrastructure_risk/{case_15 => case_1}/site_model_measured.xml (100%) rename openquake/qa_tests_data/{scenario_damage/case_21 => infrastructure_risk/case_2}/__init__.py (100%) rename openquake/qa_tests_data/{scenario_damage/case_21 => infrastructure_risk/case_2}/consequence_multiple_loss_types.csv (100%) rename openquake/qa_tests_data/{scenario_damage/case_21 => infrastructure_risk/case_2}/expected/aggrisk-parent.csv (100%) rename openquake/qa_tests_data/{scenario_damage/case_21 => infrastructure_risk/case_2}/expected/aggrisk.csv (100%) rename openquake/qa_tests_data/{scenario_damage/case_21 => infrastructure_risk/case_2}/exposure.xml (100%) rename openquake/qa_tests_data/{scenario_damage/case_21 => infrastructure_risk/case_2}/exposure_demo_edges.csv (100%) rename openquake/qa_tests_data/{scenario_damage/case_21 => infrastructure_risk/case_2}/exposure_demo_nodes.csv (100%) rename openquake/qa_tests_data/{scenario_damage/case_21 => infrastructure_risk/case_2}/fragility_model_landslide.xml (100%) rename openquake/qa_tests_data/{scenario_damage/case_21 => infrastructure_risk/case_2}/fragility_model_liquefaction.xml (100%) rename openquake/qa_tests_data/{scenario_damage/case_21 => infrastructure_risk/case_2}/fragility_model_structural.xml (100%) rename openquake/qa_tests_data/{scenario_damage/case_21 => infrastructure_risk/case_2}/gmpe_logic_tree_ascr.xml (100%) rename openquake/qa_tests_data/{scenario_damage/case_21 => infrastructure_risk/case_2}/job.ini (100%) rename openquake/qa_tests_data/{scenario_damage/case_21 => infrastructure_risk/case_2}/rupture.xml (100%) rename openquake/qa_tests_data/{scenario_damage/case_21 => infrastructure_risk/case_2}/site_model.csv (100%) diff --git a/openquake/calculators/tests/infrastructure_risk_test.py b/openquake/calculators/tests/infrastructure_risk_test.py index 7e52f76b0288..2756ba94302d 100644 --- a/openquake/calculators/tests/infrastructure_risk_test.py +++ b/openquake/calculators/tests/infrastructure_risk_test.py @@ -21,7 +21,7 @@ import numpy from openquake.baselib import InvalidFile from openquake.qa_tests_data.infrastructure_risk import ( - case_15, five_nodes_demsup_directed, five_nodes_demsup_directedunweighted, + case_1, case_2, five_nodes_demsup_directed, five_nodes_demsup_directedunweighted, five_nodes_demsup_multidirected, demand_supply, directed, eff_loss_random, multidirected, multigraph, undirected) from openquake.calculators.export import export @@ -49,102 +49,72 @@ def _check_csv_outputs(self, outputs_list, datastore, testcase, if replace_expected: raise ValueError('Remember to set replace_expected to False!') - def test_case_15(self): - self.run_calc(case_15.__file__, 'job.ini') - ds = self.calc.datastore - + def test_case_1(self): + self.run_calc(case_1.__file__, 'job.ini') outputs_list = ( 'node_el avg_loss event_ccl event_efl event_pcl event_wcl' ' dem_cl').split() + self._check_csv_outputs(outputs_list, self.calc.datastore, case_1) - self._check_csv_outputs(outputs_list, ds, case_15) + def test_case_2(self): + # infrastructure risk for structural, liquefaction and landslides + out = self.run_calc(case_2.__file__, 'job.ini', exports='csv') + [agg_csv, aggparent_csv] = out[('aggrisk', 'csv')] + self.assertEqualFiles('expected/aggrisk.csv', agg_csv) + self.assertEqualFiles('expected/aggrisk-parent.csv', aggparent_csv) def test_demand_supply(self): self.run_calc(demand_supply.__file__, 'job.ini') - ds = self.calc.datastore - outputs_list = ( 'avg_loss event_ccl event_efl event_pcl event_wcl node_el' ' dem_cl').split() - - self._check_csv_outputs(outputs_list, ds, demand_supply) + self._check_csv_outputs(outputs_list, self.calc.datastore, demand_supply) def test_directed(self): self.run_calc(directed.__file__, 'job.ini') - ds = self.calc.datastore - - outputs_list = ( - 'avg_loss event_efl event_pcl event_wcl node_el taz_cl').split() - - self._check_csv_outputs(outputs_list, ds, directed) + outputs_list = 'avg_loss event_efl event_pcl event_wcl node_el taz_cl'.split() + self._check_csv_outputs(outputs_list, self.calc.datastore, directed) def test_eff_loss_random(self): self.run_calc(eff_loss_random.__file__, 'job.ini') - ds = self.calc.datastore - - outputs_list = ( - 'avg_loss event_efl node_el').split() + outputs_list = 'avg_loss event_efl node_el'.split() - self._check_csv_outputs(outputs_list, ds, eff_loss_random) + self._check_csv_outputs(outputs_list, self.calc.datastore, eff_loss_random) def test_five_nodes_demsup_directed(self): self.run_calc(five_nodes_demsup_directed.__file__, 'job.ini') - ds = self.calc.datastore - - outputs_list = ( - 'avg_loss event_ccl event_efl event_pcl event_wcl node_el' - ' dem_cl').split() - - self._check_csv_outputs(outputs_list, ds, five_nodes_demsup_directed) + outputs_list = ('avg_loss event_ccl event_efl event_pcl event_wcl node_el' + ' dem_cl').split() + self._check_csv_outputs(outputs_list, self.calc.datastore, five_nodes_demsup_directed) def test_five_nodes_demsup_directedunweighted(self): self.run_calc(five_nodes_demsup_directedunweighted.__file__, 'job.ini') - ds = self.calc.datastore - - outputs_list = ( - 'avg_loss event_ccl event_efl event_pcl event_wcl node_el' - ' dem_cl').split() - + outputs_list = ('avg_loss event_ccl event_efl event_pcl event_wcl node_el' + ' dem_cl').split() self._check_csv_outputs( - outputs_list, ds, five_nodes_demsup_directedunweighted) + outputs_list, self.calc.datastore, five_nodes_demsup_directedunweighted) def test_five_nodes_demsup_multidirected(self): self.run_calc(five_nodes_demsup_multidirected.__file__, 'job.ini') - ds = self.calc.datastore - - outputs_list = ( - 'avg_loss event_ccl event_efl event_pcl event_wcl node_el' - ' dem_cl').split() - + outputs_list = ('avg_loss event_ccl event_efl event_pcl event_wcl node_el' + ' dem_cl').split() self._check_csv_outputs( - outputs_list, ds, five_nodes_demsup_multidirected) + outputs_list, self.calc.datastore, five_nodes_demsup_multidirected) def test_multidirected(self): self.run_calc(multidirected.__file__, 'job.ini') - ds = self.calc.datastore - - outputs_list = ( - 'avg_loss event_efl event_pcl event_wcl node_el taz_cl').split() - - self._check_csv_outputs(outputs_list, ds, multidirected) + outputs_list = 'avg_loss event_efl event_pcl event_wcl node_el taz_cl'.split() + self._check_csv_outputs(outputs_list, self.calc.datastore, multidirected) def test_multigraph(self): self.run_calc(multigraph.__file__, 'job.ini') - ds = self.calc.datastore - - outputs_list = ( - 'avg_loss event_efl event_pcl event_wcl node_el taz_cl').split() - - self._check_csv_outputs(outputs_list, ds, multigraph) + outputs_list = 'avg_loss event_efl event_pcl event_wcl node_el taz_cl'.split() + self._check_csv_outputs(outputs_list, self.calc.datastore, multigraph) def test_undirected(self): self.run_calc(undirected.__file__, 'job.ini') - ds = self.calc.datastore - - outputs_list = ( - 'avg_loss event_efl event_pcl event_wcl node_el taz_cl').split() - - self._check_csv_outputs(outputs_list, ds, undirected) + outputs_list = 'avg_loss event_efl event_pcl event_wcl node_el taz_cl'.split() + self._check_csv_outputs(outputs_list, self.calc.datastore, undirected) def test_missing_mandatory_column(self): with self.assertRaises(InvalidFile) as exc: diff --git a/openquake/calculators/tests/scenario_damage_test.py b/openquake/calculators/tests/scenario_damage_test.py index 5076120dcfcf..c4af7d138dab 100644 --- a/openquake/calculators/tests/scenario_damage_test.py +++ b/openquake/calculators/tests/scenario_damage_test.py @@ -24,7 +24,7 @@ from openquake.qa_tests_data.scenario_damage import ( case_1, case_1c, case_2, case_3, case_4, case_4b, case_5, case_5a, case_6, case_7, case_8, case_9, case_10, case_11, case_12, case_13, - case_14, case_16, case_17, case_18, case_19, case_20, case_21, case_22) + case_14, case_16, case_17, case_18, case_19, case_20, case_22) from openquake.calculators.tests import CalculatorTestCase, strip_calc_id from openquake.calculators.extract import extract from openquake.calculators.export import export @@ -288,13 +288,6 @@ def test_case_20(self): [fname] = out[('aggrisk', 'csv')] self.assertEqualFiles('expected/aggrisk.csv', fname) - def test_case_21(self): - # infrastructure risk for structural, liquefaction and landslides - out = self.run_calc(case_21.__file__, 'job.ini', exports='csv') - [agg_csv, aggparent_csv] = out[('aggrisk', 'csv')] - self.assertEqualFiles('expected/aggrisk.csv', agg_csv) - self.assertEqualFiles('expected/aggrisk-parent.csv', aggparent_csv) - def test_case_22(self): # losses with liquefaction and landslides self.run_calc(case_22.__file__, 'job_h.ini') diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/__init__.py b/openquake/qa_tests_data/infrastructure_risk/case_1/__init__.py similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/__init__.py rename to openquake/qa_tests_data/infrastructure_risk/case_1/__init__.py diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/expected/infra-avg_loss.csv b/openquake/qa_tests_data/infrastructure_risk/case_1/expected/infra-avg_loss.csv similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/expected/infra-avg_loss.csv rename to openquake/qa_tests_data/infrastructure_risk/case_1/expected/infra-avg_loss.csv diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/expected/infra-dem_cl.csv b/openquake/qa_tests_data/infrastructure_risk/case_1/expected/infra-dem_cl.csv similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/expected/infra-dem_cl.csv rename to openquake/qa_tests_data/infrastructure_risk/case_1/expected/infra-dem_cl.csv diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/expected/infra-event_ccl.csv b/openquake/qa_tests_data/infrastructure_risk/case_1/expected/infra-event_ccl.csv similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/expected/infra-event_ccl.csv rename to openquake/qa_tests_data/infrastructure_risk/case_1/expected/infra-event_ccl.csv diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/expected/infra-event_efl.csv b/openquake/qa_tests_data/infrastructure_risk/case_1/expected/infra-event_efl.csv similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/expected/infra-event_efl.csv rename to openquake/qa_tests_data/infrastructure_risk/case_1/expected/infra-event_efl.csv diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/expected/infra-event_pcl.csv b/openquake/qa_tests_data/infrastructure_risk/case_1/expected/infra-event_pcl.csv similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/expected/infra-event_pcl.csv rename to openquake/qa_tests_data/infrastructure_risk/case_1/expected/infra-event_pcl.csv diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/expected/infra-event_wcl.csv b/openquake/qa_tests_data/infrastructure_risk/case_1/expected/infra-event_wcl.csv similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/expected/infra-event_wcl.csv rename to openquake/qa_tests_data/infrastructure_risk/case_1/expected/infra-event_wcl.csv diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/expected/infra-node_el.csv b/openquake/qa_tests_data/infrastructure_risk/case_1/expected/infra-node_el.csv similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/expected/infra-node_el.csv rename to openquake/qa_tests_data/infrastructure_risk/case_1/expected/infra-node_el.csv diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/exposure.xml b/openquake/qa_tests_data/infrastructure_risk/case_1/exposure.xml similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/exposure.xml rename to openquake/qa_tests_data/infrastructure_risk/case_1/exposure.xml diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/exposure_demo_edges.csv b/openquake/qa_tests_data/infrastructure_risk/case_1/exposure_demo_edges.csv similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/exposure_demo_edges.csv rename to openquake/qa_tests_data/infrastructure_risk/case_1/exposure_demo_edges.csv diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/exposure_demo_nodes.csv b/openquake/qa_tests_data/infrastructure_risk/case_1/exposure_demo_nodes.csv similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/exposure_demo_nodes.csv rename to openquake/qa_tests_data/infrastructure_risk/case_1/exposure_demo_nodes.csv diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/fragility_model.xml b/openquake/qa_tests_data/infrastructure_risk/case_1/fragility_model.xml similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/fragility_model.xml rename to openquake/qa_tests_data/infrastructure_risk/case_1/fragility_model.xml diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/job.ini b/openquake/qa_tests_data/infrastructure_risk/case_1/job.ini similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/job.ini rename to openquake/qa_tests_data/infrastructure_risk/case_1/job.ini diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/nonfunctional.csv b/openquake/qa_tests_data/infrastructure_risk/case_1/nonfunctional.csv similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/nonfunctional.csv rename to openquake/qa_tests_data/infrastructure_risk/case_1/nonfunctional.csv diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/rupture_model.xml b/openquake/qa_tests_data/infrastructure_risk/case_1/rupture_model.xml similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/rupture_model.xml rename to openquake/qa_tests_data/infrastructure_risk/case_1/rupture_model.xml diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/site_model_measured.xml b/openquake/qa_tests_data/infrastructure_risk/case_1/site_model_measured.xml similarity index 100% rename from openquake/qa_tests_data/infrastructure_risk/case_15/site_model_measured.xml rename to openquake/qa_tests_data/infrastructure_risk/case_1/site_model_measured.xml diff --git a/openquake/qa_tests_data/scenario_damage/case_21/__init__.py b/openquake/qa_tests_data/infrastructure_risk/case_2/__init__.py similarity index 100% rename from openquake/qa_tests_data/scenario_damage/case_21/__init__.py rename to openquake/qa_tests_data/infrastructure_risk/case_2/__init__.py diff --git a/openquake/qa_tests_data/scenario_damage/case_21/consequence_multiple_loss_types.csv b/openquake/qa_tests_data/infrastructure_risk/case_2/consequence_multiple_loss_types.csv similarity index 100% rename from openquake/qa_tests_data/scenario_damage/case_21/consequence_multiple_loss_types.csv rename to openquake/qa_tests_data/infrastructure_risk/case_2/consequence_multiple_loss_types.csv diff --git a/openquake/qa_tests_data/scenario_damage/case_21/expected/aggrisk-parent.csv b/openquake/qa_tests_data/infrastructure_risk/case_2/expected/aggrisk-parent.csv similarity index 100% rename from openquake/qa_tests_data/scenario_damage/case_21/expected/aggrisk-parent.csv rename to openquake/qa_tests_data/infrastructure_risk/case_2/expected/aggrisk-parent.csv diff --git a/openquake/qa_tests_data/scenario_damage/case_21/expected/aggrisk.csv b/openquake/qa_tests_data/infrastructure_risk/case_2/expected/aggrisk.csv similarity index 100% rename from openquake/qa_tests_data/scenario_damage/case_21/expected/aggrisk.csv rename to openquake/qa_tests_data/infrastructure_risk/case_2/expected/aggrisk.csv diff --git a/openquake/qa_tests_data/scenario_damage/case_21/exposure.xml b/openquake/qa_tests_data/infrastructure_risk/case_2/exposure.xml similarity index 100% rename from openquake/qa_tests_data/scenario_damage/case_21/exposure.xml rename to openquake/qa_tests_data/infrastructure_risk/case_2/exposure.xml diff --git a/openquake/qa_tests_data/scenario_damage/case_21/exposure_demo_edges.csv b/openquake/qa_tests_data/infrastructure_risk/case_2/exposure_demo_edges.csv similarity index 100% rename from openquake/qa_tests_data/scenario_damage/case_21/exposure_demo_edges.csv rename to openquake/qa_tests_data/infrastructure_risk/case_2/exposure_demo_edges.csv diff --git a/openquake/qa_tests_data/scenario_damage/case_21/exposure_demo_nodes.csv b/openquake/qa_tests_data/infrastructure_risk/case_2/exposure_demo_nodes.csv similarity index 100% rename from openquake/qa_tests_data/scenario_damage/case_21/exposure_demo_nodes.csv rename to openquake/qa_tests_data/infrastructure_risk/case_2/exposure_demo_nodes.csv diff --git a/openquake/qa_tests_data/scenario_damage/case_21/fragility_model_landslide.xml b/openquake/qa_tests_data/infrastructure_risk/case_2/fragility_model_landslide.xml similarity index 100% rename from openquake/qa_tests_data/scenario_damage/case_21/fragility_model_landslide.xml rename to openquake/qa_tests_data/infrastructure_risk/case_2/fragility_model_landslide.xml diff --git a/openquake/qa_tests_data/scenario_damage/case_21/fragility_model_liquefaction.xml b/openquake/qa_tests_data/infrastructure_risk/case_2/fragility_model_liquefaction.xml similarity index 100% rename from openquake/qa_tests_data/scenario_damage/case_21/fragility_model_liquefaction.xml rename to openquake/qa_tests_data/infrastructure_risk/case_2/fragility_model_liquefaction.xml diff --git a/openquake/qa_tests_data/scenario_damage/case_21/fragility_model_structural.xml b/openquake/qa_tests_data/infrastructure_risk/case_2/fragility_model_structural.xml similarity index 100% rename from openquake/qa_tests_data/scenario_damage/case_21/fragility_model_structural.xml rename to openquake/qa_tests_data/infrastructure_risk/case_2/fragility_model_structural.xml diff --git a/openquake/qa_tests_data/scenario_damage/case_21/gmpe_logic_tree_ascr.xml b/openquake/qa_tests_data/infrastructure_risk/case_2/gmpe_logic_tree_ascr.xml similarity index 100% rename from openquake/qa_tests_data/scenario_damage/case_21/gmpe_logic_tree_ascr.xml rename to openquake/qa_tests_data/infrastructure_risk/case_2/gmpe_logic_tree_ascr.xml diff --git a/openquake/qa_tests_data/scenario_damage/case_21/job.ini b/openquake/qa_tests_data/infrastructure_risk/case_2/job.ini similarity index 100% rename from openquake/qa_tests_data/scenario_damage/case_21/job.ini rename to openquake/qa_tests_data/infrastructure_risk/case_2/job.ini diff --git a/openquake/qa_tests_data/scenario_damage/case_21/rupture.xml b/openquake/qa_tests_data/infrastructure_risk/case_2/rupture.xml similarity index 100% rename from openquake/qa_tests_data/scenario_damage/case_21/rupture.xml rename to openquake/qa_tests_data/infrastructure_risk/case_2/rupture.xml diff --git a/openquake/qa_tests_data/scenario_damage/case_21/site_model.csv b/openquake/qa_tests_data/infrastructure_risk/case_2/site_model.csv similarity index 100% rename from openquake/qa_tests_data/scenario_damage/case_21/site_model.csv rename to openquake/qa_tests_data/infrastructure_risk/case_2/site_model.csv