hestia-earth-models 0.59.7__py3-none-any.whl → 0.60.1__py3-none-any.whl

tests/models/ipcc2019/animal/test_pastureGrass.py

@@ -0,0 +1,45 @@
+from unittest.mock import patch
+import json
+from tests.utils import fixtures_path, fake_new_input
+
+from tests.models.ipcc2019.test_pastureGrass import MILK_YIELD_TERMS, WOOL_TERMS, TERMS_BY_ID
+from hestia_earth.models.ipcc2019.animal.pastureGrass import MODEL, MODEL_KEY, run
+
+class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY.replace('/', '.')}"
+class_path_utils = f"hestia_earth.models.{MODEL}.pastureGrass_utils"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
+
+
+def fake_download_hestia(term_id: str, *args): return TERMS_BY_ID[term_id]
+
+
+@patch(f"{class_path_utils}.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
+@patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
+@patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
+@patch(f"{class_path}._new_input", side_effect=fake_new_input)
+def test_run_with_feed(*args):
+    with open(f"{fixtures_folder}/with-feed/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/with-feed/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected
+
+
+@patch(f"{class_path_utils}.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
+@patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
+@patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
+@patch(f"{class_path}._new_input", side_effect=fake_new_input)
+def test_run_with_goats(*args):
+    with open(f"{fixtures_folder}/with-goats/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/with-goats/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected

tests/models/ipcc2019/test_ch4ToAirEntericFermentation.py

@@ -7,7 +7,18 @@ from hestia_earth.models.ipcc2019.ch4ToAirEntericFermentation import MODEL, TERM
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
+TERMS_BY_ID = {
+    'energyContentHigherHeatingValue': {'units': 'MJ / kg'},
+    'energyDigestibilityRuminants': {'units': '%'},
+    'energyDigestibilityPoultry': {'units': '%'},
+    'neutralDetergentFibreContent': {'units': '%'}
+}
 
+
+def fake_download_hestia(term_id: str, *args): return TERMS_BY_ID[term_id]
+
+
+@patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch(f"{class_path}.get_default_digestibility", return_value=70)
 @patch(f"{class_path}.find_primary_product", return_value={'term': {'@id': 'pig'}})
 @patch(f"{class_path}._get_lookup_value", return_value=0)
@@ -41,6 +52,8 @@ def test_should_run(mock_feed, mock_lookup_value, *args):
     assert should_run is True
 
 
+@patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value=None)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
@@ -55,6 +68,8 @@ def test_run(*args):
     assert result == expected
 
 
+@patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value=None)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
@@ -70,9 +85,9 @@ def test_run_dairy(*args):
 
 
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=['milkYieldPerBuffaloRaw'])
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value={})
-@patch('hestia_earth.models.utils.property.download_hestia', return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_with_milkYield(*args):
     with open(f"{fixtures_folder}/with-milkYield/cycle.jsonld", encoding="utf-8") as f:
@@ -85,9 +100,10 @@ def test_run_with_milkYield(*args):
     assert result == expected
 
 
+@patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value={})
-@patch('hestia_earth.models.utils.property.download_hestia', return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_non_dairy(*args):
     with open(f"{fixtures_folder}/non-dairy-buffalo-cows/cycle.jsonld", encoding="utf-8") as f:
@@ -100,9 +116,10 @@ def test_run_non_dairy(*args):
     assert result == expected
 
 
+@patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value={})
-@patch('hestia_earth.models.utils.property.download_hestia', return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_with_ionophores(*args):
     with open(f"{fixtures_folder}/with-ionophores/cycle.jsonld", encoding="utf-8") as f:
@@ -115,9 +132,10 @@ def test_run_with_ionophores(*args):
     assert result == expected
 
 
+@patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value={})
-@patch('hestia_earth.models.utils.property.download_hestia', return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_without_ionophores(*args):
     with open(f"{fixtures_folder}/without-ionophores/cycle.jsonld", encoding="utf-8") as f:
@@ -130,9 +148,10 @@ def test_run_without_ionophores(*args):
     assert result == expected
 
 
+@patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value={})
-@patch('hestia_earth.models.utils.property.download_hestia', return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_no_feed(*args):
     with open(f"{fixtures_folder}/no-feed/cycle.jsonld", encoding="utf-8") as f:
@@ -142,9 +161,10 @@ def test_run_no_feed(*args):
     assert result == []
 
 
+@patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
 # patch get_node_property to read value from lookups only
 @patch('hestia_earth.models.utils.property.get_node_property', return_value={})
-@patch('hestia_earth.models.utils.property.download_hestia', return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_with_system(*args):
     with open(f"{fixtures_folder}/with-system/cycle.jsonld", encoding="utf-8") as f:
@@ -157,9 +177,13 @@ def test_run_with_system(*args):
     assert result == expected
 
 
+def fake_get_node_property(*args):
+    print(*args)
+    return {}
+
+
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
-# patch get_node_property to read value from lookups only
-@patch('hestia_earth.models.utils.property.download_hestia', return_value={})
+@patch("hestia_earth.models.utils.property.download_hestia", return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_default(*args):
     with open(f"{fixtures_folder}/default-value/cycle.jsonld", encoding="utf-8") as f:

tests/models/ipcc2019/{test_co2ToAirSoilCarbonStockChangeManagementChange.py → test_co2ToAirSoilOrganicCarbonStockChangeManagementChange.py}

@@ -5,7 +5,7 @@ from unittest.mock import patch
 
 from hestia_earth.schema import MeasurementMethodClassification
 
-from hestia_earth.models.ipcc2019.co2ToAirSoilCarbonStockChangeManagementChange import (
+from hestia_earth.models.ipcc2019.co2ToAirSoilOrganicCarbonStockChangeManagementChange import (
     _calc_soc_stock_change,
     _convert_c_to_co2,
     _get_max_measurement_method,

tests/models/ipcc2019/test_n2OToAirCropResidueDecompositionDirect.py

@@ -8,9 +8,10 @@ class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=False)
 @patch(f"{class_path}._is_term_type_complete", return_value=False)
 @patch(f"{class_path}.get_crop_residue_decomposition_N_total", return_value=0)
-def test_should_run(mock_N_total, mock_complete):
+def test_should_run(mock_N_total, mock_complete, *args):
     # no N => no run
     should_run, *args = _should_run({})
     assert not should_run
@@ -26,6 +27,7 @@ def test_should_run(mock_N_total, mock_complete):
     assert should_run is True
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=False)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
@@ -38,6 +40,7 @@ def test_run(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=False)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_wet(*args):
     with open(f"{fixtures_folder}/ecoClimateZone-wet/cycle.jsonld", encoding='utf-8') as f:
@@ -50,6 +53,7 @@ def test_run_wet(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=False)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_dry(*args):
     with open(f"{fixtures_folder}/ecoClimateZone-dry/cycle.jsonld", encoding='utf-8') as f:
@@ -62,6 +66,7 @@ def test_run_dry(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=True)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_flooded_rice(*args):
     with open(f"{fixtures_folder}/with-flooded-rice/cycle.jsonld", encoding='utf-8') as f:

tests/models/ipcc2019/test_n2OToAirInorganicFertiliserDirect.py

@@ -8,9 +8,10 @@ class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=False)
 @patch(f"{class_path}._is_term_type_complete", return_value=False)
 @patch(f"{class_path}.get_inorganic_fertiliser_N_total", return_value=0)
-def test_should_run(mock_N_total, mock_complete):
+def test_should_run(mock_N_total, mock_complete, *args):
     # no N => no run
     should_run, *args = _should_run({})
     assert not should_run
@@ -26,6 +27,7 @@ def test_should_run(mock_N_total, mock_complete):
     assert should_run is True
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=False)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
@@ -38,6 +40,7 @@ def test_run(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=False)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_wet(*args):
     with open(f"{fixtures_folder}/ecoClimateZone-wet/cycle.jsonld", encoding='utf-8') as f:
@@ -50,6 +53,7 @@ def test_run_wet(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=False)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_dry(*args):
     with open(f"{fixtures_folder}/ecoClimateZone-dry/cycle.jsonld", encoding='utf-8') as f:
@@ -62,6 +66,7 @@ def test_run_dry(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=True)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_flooded_rice(*args):
     with open(f"{fixtures_folder}/with-flooded-rice/cycle.jsonld", encoding='utf-8') as f:

tests/models/ipcc2019/test_n2OToAirOrganicFertiliserDirect.py

@@ -8,9 +8,10 @@ class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=False)
 @patch(f"{class_path}._is_term_type_complete", return_value=False)
 @patch(f"{class_path}.get_organic_fertiliser_N_total", return_value=0)
-def test_should_run(mock_N_total, mock_complete):
+def test_should_run(mock_N_total, mock_complete, *args):
     # no N => no run
     should_run, *args = _should_run({})
     assert not should_run
@@ -26,6 +27,7 @@ def test_should_run(mock_N_total, mock_complete):
     assert should_run is True
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=False)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
@@ -38,6 +40,7 @@ def test_run(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=False)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_wet(*args):
     with open(f"{fixtures_folder}/ecoClimateZone-wet/cycle.jsonld", encoding='utf-8') as f:
@@ -50,6 +53,7 @@ def test_run_wet(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=False)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_dry(*args):
     with open(f"{fixtures_folder}/ecoClimateZone-dry/cycle.jsonld", encoding='utf-8') as f:
@@ -62,6 +66,7 @@ def test_run_dry(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.has_flooded_rice", return_value=True)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_flooded_rice(*args):
     with open(f"{fixtures_folder}/with-flooded-rice/cycle.jsonld", encoding='utf-8') as f:

tests/models/ipcc2019/test_pastureGrass.py

@@ -5,15 +5,37 @@ from tests.utils import fixtures_path, fake_new_input
 from hestia_earth.models.ipcc2019.pastureGrass import MODEL, MODEL_KEY, run
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
+class_path_utils = f"{class_path}_utils"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
 MILK_YIELD_TERMS = ['milkYieldPerCowRaw', 'milkYieldPerSheepRaw']
 WOOL_TERMS = ['woolSheepGreasy']
-
-
-def fake_download_hestia(term_id: str, *args): return {'@id': term_id, 'termType': 'forage'}
-
-
-@patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
+TERMS_BY_ID = {
+    'surinameGrassFreshForage': {
+        '@id': 'surinameGrassFreshForage',
+        'termType': 'forage',
+        'defaultProperties': [
+            {'term': {'@id': 'energyContentHigherHeatingValue'}, 'value': 4.8508},
+            {'term': {'@id': 'energyDigestibilityRuminants'}, 'value': 52.7}
+        ]
+    },
+    'alangAlangFreshForage': {
+        '@id': 'alangAlangFreshForage',
+        'termType': 'forage',
+        'defaultProperties': [
+            {'term': {'@id': 'energyContentHigherHeatingValue'}, 'value': 5.9334},
+            {'term': {'@id': 'energyDigestibilityRuminants'}, 'value': 54.7}
+        ]
+    },
+    'energyContentHigherHeatingValue': {'units': 'MJ / kg'},
+    'energyDigestibilityRuminants': {'units': '%'},
+}
+
+
+def fake_download_hestia(term_id: str, *args): return TERMS_BY_ID[term_id]
+
+
+@patch(f"{class_path_utils}.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
 @patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
 @patch(f"{class_path}._new_input", side_effect=fake_new_input)
@@ -28,7 +50,8 @@ def test_run(*args):
     assert value == expected
 
 
-@patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
+@patch(f"{class_path_utils}.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
 @patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
 @patch(f"{class_path}._new_input", side_effect=fake_new_input)
@@ -43,7 +66,8 @@ def test_run_with_feed(*args):
     assert value == expected
 
 
-@patch(f"{class_path}.download_hestia", side_effect=fake_download_hestia)
+@patch(f"{class_path_utils}.download_hestia", side_effect=fake_download_hestia)
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
 @patch(f"{class_path}.get_wool_terms", return_value=WOOL_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=MILK_YIELD_TERMS)
 @patch(f"{class_path}._new_input", side_effect=fake_new_input)

tests/models/pooreNemecek2018/test_excretaKgN.py

@@ -59,6 +59,7 @@ def test_should_run(mock_animal_produced, mock_get_feed, *args):
     assert should_run is True
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
@@ -71,6 +72,7 @@ def test_run(*args):
     assert value == expected
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_with_liveweight(*args):
     with open(f"{fixtures_folder}/with-liveweight/cycle.jsonld", encoding='utf-8') as f:
@@ -83,6 +85,7 @@ def test_run_with_liveweight(*args):
     assert value == expected
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_with_carcass(*args):
     with open(f"{fixtures_folder}/with-carcass/cycle.jsonld", encoding='utf-8') as f:
@@ -95,6 +98,7 @@ def test_run_with_carcass(*args):
     assert value == expected
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_with_head(*args):
     with open(f"{fixtures_folder}/with-head/cycle.jsonld", encoding='utf-8') as f:
@@ -107,6 +111,7 @@ def test_run_with_head(*args):
     assert value == expected
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_with_liveAquaticSpecies(*args):
     with open(f"{fixtures_folder}/with-liveAquaticSpecies/cycle.jsonld", encoding='utf-8') as f:

tests/models/pooreNemecek2018/test_excretaKgVs.py

@@ -8,6 +8,7 @@ class_path = f"hestia_earth.models.{MODEL}.excretaKgVs"
 fixtures_folder = f"{fixtures_path}/{MODEL}/excretaKgVs"
 
 
+@patch(f"{class_path}.get_node_property", return_value={'value': 1490.6951744738524})
 @patch(f"{class_path}.convert_to_carbon", return_value=5)
 @patch(f"{class_path}._get_carbonContent", return_value=5)
 @patch(f"{class_path}._get_conv_aq_ocsed", return_value=0.35)
@@ -78,6 +79,8 @@ def test_should_run(*args):
     assert should_run is True
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
+@patch(f"{class_path}.get_node_property", return_value={'value': 1490.6951744738524})
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
@@ -90,6 +93,8 @@ def test_run(*args):
     assert value == expected
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
+@patch(f"{class_path}.get_node_property", return_value={'value': 1490.6951744738524})
 @patch(f"{class_path}._new_product", side_effect=fake_new_product)
 def test_run_excretaKgN(*args):
     with open(f"{fixtures_folder}/with-excretaKgN/cycle.jsonld", encoding='utf-8') as f:

tests/models/pooreNemecek2018/test_no3ToGroundwaterSoilFlux.py

@@ -8,6 +8,7 @@ class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
+@patch(f"{class_path}.get_rice_paddy_terms", return_value=FLOODED_RICE_TERMS)
 @patch(f"{class_path}.find_primary_product", return_value={'term': {'@id': 'product'}})
 @patch(f"{class_path}.get_crop_residue_decomposition_N_total", return_value=10)
 @patch(f"{class_path}.most_relevant_measurement_value", return_value=0)

tests/models/test_cache_sites.py

@@ -7,13 +7,14 @@ from hestia_earth.models.cache_sites import run
 
 class_path = 'hestia_earth.models.cache_sites'
 fixtures_folder = os.path.join(fixtures_path, 'cache_sites')
+coordinates = [{"latitude": 46.47, "longitude": 2.94}]
 
 
 @patch(f"{class_path}._run_query", return_value=[10] * 100)
 def test_run(mock_run_query, *args):
     with open(f"{fixtures_folder}/data.json", encoding='utf-8') as f:
         data = json.load(f)
-    with open(f"{fixtures_folder}/result.json", encoding='utf-8') as f:
+    with open(f"{fixtures_folder}/cache.json", encoding='utf-8') as f:
         cache = json.load(f)
     with open(f"{fixtures_folder}/params.json", encoding='utf-8') as f:
         params = json.load(f)
@@ -22,9 +23,6 @@ def test_run(mock_run_query, *args):
     expected = [site | {'_cache': cache} for site in data.get('nodes', [])]
     assert sites == expected
 
-    # unique list of coordinates
-    coordinates = [{"latitude": 46.47, "longitude": 2.94}]
-
     mock_run_query.assert_has_calls([
         call({
             "ee_type": "raster",
@@ -37,9 +35,15 @@ def test_run(mock_run_query, *args):
             "coordinates": coordinates
         })
     ])
-    mock_run_query.reset_mock()
 
-    # with regions
+
+@patch(f"{class_path}._run_query", return_value=[10] * 100)
+def test_run_include_region(mock_run_query, *args):
+    with open(f"{fixtures_folder}/data.json", encoding='utf-8') as f:
+        data = json.load(f)
+    with open(f"{fixtures_folder}/params.json", encoding='utf-8') as f:
+        params = json.load(f)
+
     run(data.get('nodes', []), [2019, 2020], include_region=True)
     mock_run_query.assert_has_calls([
         call({
@@ -53,4 +57,3 @@ def test_run(mock_run_query, *args):
             "coordinates": coordinates
         })
     ])
-    mock_run_query.reset_mock()