hestia-earth-models 0.59.6__py3-none-any.whl → 0.60.0__py3-none-any.whl

tests/models/cycle/test_feedConversionRatio.py

@@ -8,6 +8,14 @@ from hestia_earth.models.cycle.feedConversionRatio import MODEL, run, _should_ru
 class_path = f"hestia_earth.models.{MODEL}.feedConversionRatio"
 fixtures_folder = f"{fixtures_path}/{MODEL}/feedConversionRatio"
 
+TERMS_BY_ID = {
+    'energyContentHigherHeatingValue': {'units': 'MJ / kg'},
+    'crudeProteinContent': {'units': '%'},
+}
+
+
+def fake_download_hestia(term_id: str, *args): return TERMS_BY_ID[term_id]
+
 
 @patch(f"{class_path}.get_total_value_converted_with_min_ratio", return_value=10)
 def test_should_run(*args):
@@ -29,6 +37,7 @@ def test_should_run(*args):
     assert should_run is True
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
 @patch(f"{class_path}.is_run_required", return_value=True)
 @patch(f"{class_path}._new_practice", side_effect=fake_new_practice)
 def test_run(*args):
@@ -42,6 +51,7 @@ def test_run(*args):
     assert value == expected
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", side_effect=fake_download_hestia)
 @patch(f"{class_path}.is_run_required", return_value=True)
 @patch(f"{class_path}._new_practice", side_effect=fake_new_practice)
 def test_run_with_carcass(*args):

tests/models/cycle/test_readyToCookWeightPerHead.py

@@ -34,6 +34,7 @@ def test_should_run():
     assert should_run is True
 
 
+@patch("hestia_earth.models.utils.property.download_hestia", return_value={'units': '%'})
 @patch(f"{class_path}._new_property", side_effect=fake_new_property)
 def test_run(*args):
     with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:

tests/models/faostat2018/product/test_price.py

@@ -27,11 +27,23 @@ def test_run_crop(*args):
 
 
 @patch(f"{class_path}.download_hestia", return_value={})
-def test_run_animalProduct(*args):
-    with open(f"{fixtures_folder}/animalProduct/cycle.jsonld", encoding='utf-8') as f:
+def test_run_animalProduct_kg(*args):
+    with open(f"{fixtures_folder}/animalProduct/kg/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
-    with open(f"{fixtures_folder}/animalProduct/result.jsonld", encoding='utf-8') as f:
+    with open(f"{fixtures_folder}/animalProduct/kg/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected
+
+
+@patch(f"{class_path}.download_hestia", return_value={})
+def test_run_animalProduct_number(*args):
+    with open(f"{fixtures_folder}/animalProduct/number/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/animalProduct/number/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
     value = run(cycle)

tests/models/ipcc2006/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=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/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_organicCarbonPerHa.py

@@ -20,6 +20,7 @@ from hestia_earth.models.ipcc2019.organicCarbonPerHa import (
     _check_cropland_medium_category,
     _get_carbon_input_kwargs,
     _iterate_soc_equilibriums,
+    _should_run,
     IpccCarbonInputCategory,
     IpccLandUseCategory,
     IpccManagementCategory,
@@ -103,37 +104,38 @@ def find_term_property_side_effect(term: dict, property: str, *_):
 # --- TIER 1 & TIER 2 TESTS ---
 
 
-# subfolder, load_cycles
-RUN_SUBFOLDERS = [
-    ("tier-1-and-2/cropland", True),
-    ("tier-1-and-2/with-zero-carbon-input", True),  # Closes issue 777
-    ("tier-2/with-generalised-monthly-measurements", True),  # Closes issue 600
-    ("tier-2/with-incomplete-climate-data", True),  # Closes issue 599
-    ("tier-2/with-initial-soc", True),
-    ("tier-2/with-multi-year-cycles", True),
-    ("tier-2/with-multi-year-cycles-and-missing-properties", True),  # Closes issue 734
-    ("tier-2/without-any-measurements", True),  # Closes issue 594
-    ("tier-2/without-initial-soc", True),
-    ("tier-2/with-irrigation", True),
-    ("tier-2/with-irrigation-dates", True),
-    ("tier-2/with-paddy-rice", True),
-    ("tier-2/with-sand-without-date", True),  # Closes issue 739
-    ("tier-2/with-irrigated-upland-rice", True),
-    ("tier-1/cropland-depth-as-float", False),
-    ("tier-1/cropland-with-measured-soc", False),
-    ("tier-1/cropland-without-measured-soc", False),
-    ("tier-1/permanent-pasture", False),
-    ("tier-1/should-not-run", False),
-    ("tier-1/without-management-with-measured-soc", False),
-    ("tier-1/land-use-change", False),  # Closes issue 755
-    ("tier-1/run-with-site-type", False)  # Closes issue 755
+# subfolder, load_cycles, should_run
+SHOULD_RUN_SUBFOLDERS = [
+    ("tier-1-and-2/cropland", True, True),
+    ("tier-1-and-2/with-zero-carbon-input", True, True),  # Closes issue 777
+    ("tier-2/with-generalised-monthly-measurements", True, False),  # Closes issue 600
+    ("tier-2/with-incomplete-climate-data", True, False),  # Closes issue 599
+    ("tier-2/with-initial-soc", True, True),
+    ("tier-2/with-multi-year-cycles", True, True),
+    ("tier-2/with-multi-year-cycles-and-missing-properties", True, True),  # Closes issue 734
+    ("tier-2/without-any-measurements", True, False),  # Closes issue 594
+    ("tier-2/without-initial-soc", True, True),
+    ("tier-2/with-irrigation", True, True),
+    ("tier-2/with-irrigation-dates", True, True),
+    ("tier-2/with-paddy-rice", True, False),
+    ("tier-2/with-sand-without-date", True, True),  # Closes issue 739
+    ("tier-2/with-irrigated-upland-rice", True, False),
+    ("tier-1/cropland-depth-as-float", False, True),
+    ("tier-1/cropland-with-measured-soc", False, True),
+    ("tier-1/cropland-without-measured-soc", False, True),
+    ("tier-1/permanent-pasture", False, True),
+    ("tier-1/should-not-run", False, False),
+    ("tier-1/without-management-with-measured-soc", False, False),
+    ("tier-1/land-use-change", False, True),  # Closes issue 755
+    ("tier-1/run-with-site-type", False, True),  # Closes issue 755
+    ("tier-1/cropland-polar", False, False)  # Closes issue 794
 ]
 
 
 @mark.parametrize(
-    "subfolder, load_cycles",
-    RUN_SUBFOLDERS,
-    ids=[params[0] for params in RUN_SUBFOLDERS]
+    "subfolder, load_cycles, should_run",
+    SHOULD_RUN_SUBFOLDERS,
+    ids=[params[0] for params in SHOULD_RUN_SUBFOLDERS]
 )
 @patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
 @patch(f"{class_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
@@ -143,8 +145,8 @@ RUN_SUBFOLDERS = [
 @patch(f"{class_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
 @patch(f"{class_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
 @patch(f"{class_path}.related_cycles")
-@patch("hestia_earth.models.utils.property.find_term_property")
-def test_run(
+@patch("hestia_earth.models.utils.property.find_term_property", side_effect=find_term_property_side_effect)
+def test_should_run(
     mock_find_term_property,
     mock_related_cycles,
     _mock_get_upland_rice_crop_terms,
@@ -155,7 +157,8 @@ def test_run(
     _mock_get_cover_crop_property_terms,
     _mock_new_measurement,
     subfolder,
-    load_cycles
+    load_cycles,
+    should_run
 ):
     folder = f"{fixtures_folder}/{subfolder}"
 
@@ -163,20 +166,17 @@ def test_run(
         with open(f"{folder}/cycles.jsonld", encoding='utf-8') as f:
             return json.load(f)
 
-    mock_find_term_property.side_effect = find_term_property_side_effect
     mock_related_cycles.return_value = load_cycles_from_file() if load_cycles else []
 
     with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
         site = json.load(f)
 
-    with open(f"{folder}/result.jsonld", encoding='utf-8') as f:
-        expected = json.load(f)
+    should_run_tier_1, should_run_tier_2, *_ = _should_run(site)
+    should_run_ = should_run_tier_1 or should_run_tier_2
 
-    result = run(site)
-    assert result == expected
+    assert should_run_ == should_run
 
 
-@patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
 @patch(f"{class_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
 @patch(f"{class_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
 @patch(f"{class_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
@@ -184,11 +184,66 @@ def test_run(
 @patch(f"{class_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
 @patch(f"{class_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
 @patch(f"{class_path}.related_cycles", return_value=[])
-def test_run_no_data(*args):
+@patch("hestia_earth.models.utils.property.find_term_property", side_effect=find_term_property_side_effect)
+def test_should_run_no_data(*args):
     SITE = {}
-    EXPECTED = []
-    result = run(SITE)
-    assert result == EXPECTED
+    EXPECTED = False
+
+    should_run_tier_1, should_run_tier_2, *_ = _should_run(SITE)
+    should_run = should_run_tier_1 or should_run_tier_2
+
+    assert should_run == EXPECTED
+
+
+RUN_SUBFOLDERS = [
+    (subfolder, load_cycles) for subfolder, load_cycles, should_run in SHOULD_RUN_SUBFOLDERS
+    if should_run
+]
+
+
+@mark.parametrize(
+    "subfolder, load_cycles",
+    RUN_SUBFOLDERS,
+    ids=[params[0] for params in RUN_SUBFOLDERS]
+)
+@patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
+@patch(f"{class_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+@patch(f"{class_path}.get_crop_residue_incorporated_or_left_on_field_terms", return_value=CROP_RESIDUE_INCORP_TERM_IDS)
+@patch(f"{class_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
+@patch(f"{class_path}.get_residue_removed_or_burnt_terms", return_value=RESIDUE_REMOVED_OR_BURNT_TERM_IDS)
+@patch(f"{class_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{class_path}.get_upland_rice_crop_terms", return_value=UPLAND_RICE_CROP_TERM_IDS)
+@patch(f"{class_path}.related_cycles")
+@patch("hestia_earth.models.utils.property.find_term_property", side_effect=find_term_property_side_effect)
+def test_run(
+    mock_find_term_property,
+    mock_related_cycles,
+    _mock_get_upland_rice_crop_terms,
+    _mock_get_upland_rice_land_cover_terms,
+    _mock_get_residue_removed_or_burnt_terms,
+    _mock_get_irrigated_terms,
+    _mock_get_crop_residue_incorporated_or_left_on_field_terms,
+    _mock_get_cover_crop_property_terms,
+    _mock_new_measurement,
+    subfolder,
+    load_cycles
+):
+    folder = f"{fixtures_folder}/{subfolder}"
+
+    def load_cycles_from_file():
+        with open(f"{folder}/cycles.jsonld", encoding='utf-8') as f:
+            return json.load(f)
+
+    mock_related_cycles.return_value = load_cycles_from_file() if load_cycles else []
+
+    with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
+        site = json.load(f)
+
+    with open(f"{folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    result = run(site)
+    assert result == expected
 
 
 # --- TIER 2 TESTS: SUB-MODELS ---

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)