hestia-earth-models 0.69.1__py3-none-any.whl → 0.70.1__py3-none-any.whl

tests/models/{site → hestia}/test_precipitationMonthly.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.precipitationMonthly import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.precipitationMonthly import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_rainfallAnnual.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.rainfallAnnual import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.rainfallAnnual import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_rainfallMonthly.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.rainfallMonthly import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.rainfallMonthly import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{cycle → hestia}/test_readyToCookWeightPerHead.py

@@ -4,7 +4,7 @@ import json
 from hestia_earth.schema import TermTermType
 from tests.utils import fixtures_path, fake_new_property
 
-from hestia_earth.models.cycle.readyToCookWeightPerHead import MODEL, TERM_ID, _should_run, run
+from hestia_earth.models.hestia.readyToCookWeightPerHead import MODEL, TERM_ID, _should_run, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{cycle → hestia}/test_residueBurnt.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fake_new_practice, fixtures_path
 
-from hestia_earth.models.cycle.residueBurnt import MODEL, TERM_ID, _should_run, run
+from hestia_earth.models.hestia.residueBurnt import MODEL, TERM_ID, _should_run, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{cycle → hestia}/test_residueIncorporated.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fake_new_practice, fixtures_path
 
-from hestia_earth.models.cycle.residueIncorporated import MODEL, TERM_ID, _should_run, run
+from hestia_earth.models.hestia.residueIncorporated import MODEL, TERM_ID, _should_run, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{cycle → hestia}/test_residueLeftOnField.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fake_new_practice, fixtures_path
 
-from hestia_earth.models.cycle.residueLeftOnField import MODEL, TERM_ID, _should_run, run
+from hestia_earth.models.hestia.residueLeftOnField import MODEL, TERM_ID, _should_run, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/hestia/test_residueRemoved.py

@@ -9,11 +9,23 @@ fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
 @patch(f"{class_path}._new_practice", side_effect=fake_new_practice)
-def test_run(*args):
-    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+def test_run_by_products(*args):
+    with open(f"{fixtures_folder}/by-products/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
-    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+    with open(f"{fixtures_folder}/by-products/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected
+
+
+@patch(f"{class_path}._new_practice", side_effect=fake_new_practice)
+def test_run_by_practices(*args):
+    with open(f"{fixtures_folder}/by-practices/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/by-practices/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
     value = run(cycle)

tests/models/{site → hestia}/test_salineWater.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.salineWater import MODEL, TERM_ID, _should_run, run
+from hestia_earth.models.hestia.salineWater import MODEL, TERM_ID, _should_run, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_soilMeasurement.py

@@ -4,7 +4,7 @@ import pytest
 
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.soilMeasurement import (
+from hestia_earth.models.hestia.soilMeasurement import (
     MODEL,
     MODEL_KEY,
     _get_overlap,
@@ -13,7 +13,7 @@ from hestia_earth.models.site.soilMeasurement import (
 )
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
-fixtures_folder = f"{fixtures_path}/site/soilMeasurement"
+fixtures_folder = f"{fixtures_path}/{MODEL}/soilMeasurement"
 
 
 @pytest.mark.parametrize(

tests/models/{cycle → hestia}/test_stockingDensityAnimalHousingAverage.py

@@ -3,7 +3,7 @@ import pytest
 import json
 from tests.utils import fixtures_path, fake_new_practice
 
-from hestia_earth.models.cycle.stockingDensityAnimalHousingAverage import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.stockingDensityAnimalHousingAverage import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_temperatureAnnual.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.temperatureAnnual import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.temperatureAnnual import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_temperatureMonthly.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.temperatureMonthly import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.temperatureMonthly import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_totalNitrogenPerKgSoil.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.totalNitrogenPerKgSoil import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.totalNitrogenPerKgSoil import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{cycle → hestia}/test_unknownPreSeasonWaterRegime.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fake_new_practice, fixtures_path
 
-from hestia_earth.models.cycle.unknownPreSeasonWaterRegime import MODEL, TERM_ID, _should_run, run
+from hestia_earth.models.hestia.unknownPreSeasonWaterRegime import MODEL, TERM_ID, _should_run, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/{site → hestia}/test_waterDepth.py

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.waterDepth import MODEL, TERM_ID, run
+from hestia_earth.models.hestia.waterDepth import MODEL, TERM_ID, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"

tests/models/hestia/test_waterSalinity.py

@@ -0,0 +1,26 @@
+from unittest.mock import Mock, patch
+import json
+from tests.utils import fixtures_path, fake_new_measurement
+
+from hestia_earth.models.hestia.waterSalinity import MODEL, TERM_ID, run
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+@patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
+@patch(f"{class_path}.related_cycles")
+def test_run(mock_related_cycles: Mock, *args):
+    with open(f"{fixtures_folder}/site.jsonld", encoding='utf-8') as f:
+        site = json.load(f)
+
+    with open(f"{fixtures_folder}/cycles.jsonld", encoding='utf-8') as f:
+        cycles = json.load(f)
+
+    mock_related_cycles.return_value = cycles
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(site)
+    assert value == expected

tests/models/ipcc2019/test_ch4ToAirEntericFermentation.py

@@ -13,11 +13,13 @@ TERMS_BY_ID = {
     'energyDigestibilityPoultry': {'units': '%'},
     'neutralDetergentFibreContent': {'units': '%'}
 }
+IONOPHORE_TERMS = ['ionophores', 'ionophoreAntibiotics']
 
 
 def fake_download_term(term_id: str, *args): return TERMS_BY_ID[term_id]
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @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'}})
@@ -52,6 +54,7 @@ def test_should_run(mock_feed, mock_lookup_value, *args):
     assert should_run is True
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -68,6 +71,7 @@ def test_run(*args):
     assert result == expected
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -84,6 +88,7 @@ def test_run_dairy(*args):
     assert result == expected
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=['milkYieldPerBuffaloRaw'])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -100,6 +105,7 @@ def test_run_with_milkYield(*args):
     assert result == expected
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -116,6 +122,7 @@ def test_run_non_dairy(*args):
     assert result == expected
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -132,6 +139,7 @@ def test_run_with_ionophores(*args):
     assert result == expected
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -148,6 +156,7 @@ def test_run_without_ionophores(*args):
     assert result == expected
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -161,6 +170,7 @@ def test_run_no_feed(*args):
     assert result == []
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", side_effect=fake_download_term)
 # patch get_node_property to read value from lookups only
@@ -177,6 +187,7 @@ def test_run_with_system(*args):
     assert result == expected
 
 
+@patch(f"{class_path}.get_ionophore_terms", return_value=IONOPHORE_TERMS)
 @patch(f"hestia_earth.models.{MODEL}.utils.get_milkYield_terms", return_value=[])
 @patch("hestia_earth.models.utils.property.download_term", return_value={})
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)

tests/models/ipcc2019/test_ch4ToAirFloodedRice.py

@@ -1,57 +1,25 @@
-from unittest.mock import patch
+import os
+import pytest
+from unittest.mock import Mock, patch
 import json
 from tests.utils import fixtures_path, fake_new_emission, FLOODED_RICE_TERMS
 
-from hestia_earth.models.ipcc2019.ch4ToAirFloodedRice import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.ipcc2019.ch4ToAirFloodedRice import MODEL, TERM_ID, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+_folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]
 
 
-@patch(f"{class_path}.has_flooded_rice", return_value=False)
-def test_should_run(mock_flooded_rice):
-    # no site => no run
-    cycle = {'site': {}}
-    should_run, *args = _should_run(cycle)
-    assert not should_run
-
-    # with site => no run
-    cycle['site'] = {'country': {'@id': 'country'}}
-    should_run, *args = _should_run(cycle)
-    assert not should_run
-
-    # with croppingDuration => no run
-    cycle['practices'] = [{'term': {'@id': 'croppingDuration'}}]
-    should_run, *args = _should_run(cycle)
-    assert not should_run
-
-    # with flooded rice => run
-    mock_flooded_rice.return_value = True
-    should_run, *args = _should_run(cycle)
-    assert should_run is True
-
-
-@patch('hestia_earth.models.utils.product.get_rice_paddy_terms', return_value=FLOODED_RICE_TERMS)
-@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:
-        cycle = json.load(f)
-
-    with open(f"{fixtures_folder}/result.jsonld", encoding="utf-8") as f:
-        expected = json.load(f)
-
-    result = run(cycle)
-    assert result == expected
-
-
+@pytest.mark.parametrize("folder", _folders)
 @patch('hestia_earth.models.utils.product.get_rice_paddy_terms', return_value=FLOODED_RICE_TERMS)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
-def test_run_with_optional_data(*args):
-    with open(f"{fixtures_folder}/with-optional-data/cycle.jsonld", encoding="utf-8") as f:
+def test_run(mock_new_emission: Mock, mock_rice_terms: Mock, folder: str):
+    with open(f"{fixtures_folder}/{folder}/cycle.jsonld", encoding="utf-8") as f:
         cycle = json.load(f)
 
-    with open(f"{fixtures_folder}/with-optional-data/result.jsonld", encoding="utf-8") as f:
+    with open(f"{fixtures_folder}/{folder}/result.jsonld", encoding="utf-8") as f:
         expected = json.load(f)
 
     result = run(cycle)
-    assert result == expected
+    assert result == expected, folder

tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChange.py

@@ -66,7 +66,8 @@ RUN_SCENARIOS = [
     ("with-gapfilled-start-date-end-date", 1),           # Closes issue #972
     ("forest-to-orchard-with-ground-cover", 3),          # Closes issue #989
     ("orchard-data-complete", 3),                 # Closes issue #1011
-    ("orchard-data-partially-complete", 3)        # Closes issue #1011
+    ("orchard-data-partially-complete", 3),       # Closes issue #1011
+    ("with-linalgerror", 1)
 ]
 """List of (subfolder: str, num_cycles: int)."""
 

tests/models/ipcc2019/test_nonCo2EmissionsToAirNaturalVegetationBurning.py

@@ -6,10 +6,19 @@ from unittest.mock import MagicMock, patch
 
 from tests.utils import fake_new_emission, fixtures_path, order_list
 
-from hestia_earth.models.ipcc2019.nonCo2EmissionsToAirNaturalVegetationBurning import run, _should_run
-
-class_path = 'hestia_earth.models.ipcc2019.nonCo2EmissionsToAirNaturalVegetationBurning'
-fixtures_folder = f"{fixtures_path}/ipcc2019/nonCo2EmissionsToAirNaturalVegetationBurning"
+from hestia_earth.models.ipcc2019.nonCo2EmissionsToAirNaturalVegetationBurning import MODEL, run, _should_run
+
+class_path = f"hestia_earth.models.{MODEL}.nonCo2EmissionsToAirNaturalVegetationBurning"
+fixtures_folder = f"{fixtures_path}/{MODEL}/nonCo2EmissionsToAirNaturalVegetationBurning"
+biomass_utils_path = f"hestia_earth.models.{MODEL}.biomass_utils"
+
+COVER_CROP_PROPERTY_TERM_IDS = [
+    "catchCrop",
+    "coverCrop",
+    "groundCover",
+    "longFallowCrop",
+    "shortFallowCrop"
+]
 
 
 def _load_fixture(path: str, default=None):
@@ -23,8 +32,9 @@ RUN_SCENARIOS = [
     ("forest-to-cropland", 4),
     ("historical-land-cover-mix", 3),
     ("deforestation-reforestation", 1),  # gains should not offset losses
-    ("no-clearance-via-fire", 1),  # LUC in the UK, which has a percentage burned factor of 0
-    ("forest-to-cropland-with-ground-cover", 4)  # Cover crops/ground covers should be ignored
+    ("no-clearance-via-fire", 1),  # LUC in the UK, which has a percentage burned factor of 0, should run
+    ("forest-to-cropland-with-ground-cover", 4),  # Cover crops/ground covers should be ignored
+    ("single-year", 1)  # should not run, multiple years of land cover data required
 ]
 
 
@@ -40,11 +50,13 @@ RUN_IDS = [f"{param[0]}, cycle{param[2]}" for param in RUN_PARAMS]
 
 @mark.parametrize("subfolder, num_cycles, cycle_index", RUN_PARAMS, ids=RUN_IDS)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+@patch(f"{biomass_utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
 @patch(f"{class_path}.related_cycles")
 @patch(f"{class_path}._get_site")
 def test_run(
     get_site_mock: MagicMock,
     related_cycles_mock: MagicMock,
+    _get_cover_crop_property_terms_mock: MagicMock,
     _new_emission_mock: MagicMock,
     subfolder: str,
     num_cycles: int,
@@ -66,7 +78,8 @@ def test_run(
     assert order_list(result) == order_list(expected)
 
 
-def test_should_run_no_data():
+@patch(f"{biomass_utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
+def test_should_run_no_data(*args):
     CYCLE = {}
     EXPECTED = False
 
@@ -74,8 +87,9 @@ def test_should_run_no_data():
     assert result == EXPECTED
 
 
+@patch(f"{biomass_utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
-def test_run_no_data(*_):
+def test_run_no_data(*args):
     CYCLE = {}
     EXPECTED = []
 

tests/models/ipcc2019/test_organicCarbonPerHa.py

@@ -216,7 +216,8 @@ PARAMS_SHOULD_RUN = [
     ("tier-2/with-manure-liquid-kg-mass", True),                     # Closes issue 763
     ("tier-2/with-manure-dry-kg-n", True),                           # Closes issue 763
     ("tier-2/with-manure-fresh-kg-n", True),                         # Closes issue 763
-    ("tier-2/with-manure-liquid-kg-n", True)                         # Closes issue 763
+    ("tier-2/with-manure-liquid-kg-n", True),                        # Closes issue 763
+    ("tier-2/with-split-years", True)                                # Closes issue 1177
 ]
 IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
 
@@ -268,12 +269,13 @@ def test_should_run(
 
 
 @patch(f"{tier_2_utils_path}.related_cycles", return_value=[])
+@patch(f"{utils_path}.get_cover_crop_property_terms", return_value=COVER_CROP_PROPERTY_TERM_IDS)
 @patch(f"{term_path}.search")
 @patch(f"{property_path}.download_term")
 def test_should_run_no_data(
     download_term_mock: MagicMock,
     search_mock: MagicMock,
-    _related_cycles_mock: MagicMock
+    *args
 ):
     SITE = {}
     EXPECTED = []

tests/models/pooreNemecek2018/test_landOccupationDuringCycle.py

@@ -9,6 +9,7 @@ class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
+@patch(f"{class_path}.get_landCover_term_id_from_site_type", return_value='cropland')
 @patch(f"{class_path}.get_landCover_term_id", return_value='cropland')
 @patch(f"{class_path}.land_occupation_per_kg", return_value=None)
 def test_should_run(mock_land_occupation, *args):
@@ -23,6 +24,7 @@ def test_should_run(mock_land_occupation, *args):
     assert should_run is True
 
 
+@patch(f"{class_path}.get_landCover_term_id_from_site_type", return_value='cropland')
 @patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
 def test_run(*args):
     with open(f"{fixtures_folder}/impact-assessment.jsonld", encoding='utf-8') as f:
@@ -35,6 +37,7 @@ def test_run(*args):
     assert value == expected
 
 
+@patch(f"{class_path}.get_landCover_term_id_from_site_type", return_value='cropland')
 @patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
 def test_run_with_plantation(*args):
     with open(f"{fixtures_folder}/with-orchard-crop/impact-assessment.jsonld", encoding='utf-8') as f:

tests/models/site/pre_checks/test_country.py

@@ -1,12 +1,13 @@
 from unittest.mock import Mock, patch
+from hestia_earth.schema import TermTermType
 
 from hestia_earth.models.site.pre_checks.country import run
 
 class_path = 'hestia_earth.models.site.pre_checks.country'
 
 
-@patch(f"{class_path}.download_hestia")
-def test_run(mock_download_hestia: Mock):
+@patch(f"{class_path}.download_term")
+def test_run(mock_download_term: Mock):
     site = {'country': {'@type': 'Term', '@id': 'GADM-GBR'}}
     run(site)
-    mock_download_hestia.assert_called_once_with('GADM-GBR')
+    mock_download_term.assert_called_once_with('GADM-GBR', TermTermType.REGION)

tests/models/test_ecoinventV3.py

@@ -39,12 +39,12 @@ TERMS_BY_ID = {
 }
 
 
-def fake_download_hestia(term, *args):
+def fake_download_term(term, *args):
     term_id = term.get('@id') if isinstance(term, dict) else term
     return TERMS_BY_ID.get(term_id, {})
 
 
-@patch('hestia_earth.models.utils.blank_node.download_term', side_effect=fake_download_hestia)
+@patch('hestia_earth.models.utils.blank_node.download_term', side_effect=fake_download_term)
 @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:

tests/models/test_ecoinventV3AndEmberClimate.py

@@ -22,5 +22,5 @@ def test_run(*args):
     with open(f"{fixtures_folder}/result.jsonld", encoding="utf-8") as f:
         expected = json.load(f)
 
-    value = run('all', cycle)
-    assert value == expected
+    result = run('all', cycle)
+    assert result == expected

tests/models/test_emissionNotRelevant.py

@@ -6,15 +6,8 @@ from hestia_earth.models.emissionNotRelevant import MODEL, run
 
 class_path = f"hestia_earth.models.{MODEL}"
 fixtures_folder = f"{fixtures_path}/{MODEL}"
-EMISSION_IDS = [
-    'ch4ToAirCropResidueBurning',
-    'ch4ToAirExcreta',
-    'ch4ToAirFuelCombustion',
-    'n2OToAirAquacultureSystemsDirect'
-]
 
 
-@patch(f"{class_path}.get_all_emission_terms", return_value=EMISSION_IDS)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_cropland(*args):
     with open(f"{fixtures_folder}/cropland/cycle.jsonld", encoding='utf-8') as f:
@@ -27,7 +20,6 @@ def test_run_cropland(*args):
     assert result == expected
 
 
-@patch(f"{class_path}.get_all_emission_terms", return_value=EMISSION_IDS)
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 def test_run_pond(*args):
     with open(f"{fixtures_folder}/pond/cycle.jsonld", encoding='utf-8') as f:

tests/models/utils/test_measurement.py

@@ -12,7 +12,7 @@ class_path = 'hestia_earth.models.utils.measurement'
 fixtures_folder = f"{fixtures_path}/utils/measurement"
 
 
-@patch(f"{class_path}.include_methodModel", side_effect=lambda n, **kwargs: n)
+@patch(f"{class_path}.include_method", side_effect=lambda n, **kwargs: n)
 @patch(f"{class_path}.download_term", return_value=TERM)
 def test_new_measurement(*args):
     # with a Term as string

tests/models/utils/test_source.py

@@ -13,11 +13,21 @@ search_results = [{
 
 def test_list_sources():
     sources = _list_sources()
-    # test `BIBLIO_TITLE`
-    assert 'Soil organic carbon sequestration rates in vineyard agroecosystems under different soil management practices: A meta-analysis' in sources  # noqa: E501
-    # test `OTHER_BIBLIO_TITLES`
-    assert '2006 IPCC Guidelines for National Greenhouse Gas Inventories' in sources
-    assert 'COMMISSION DECISION of 10 June 2010 on guidelines for the calculation of land carbon stocks for the purpose of Annex V to Directive 2009/28/EC' in sources  # noqa: E501
+    assert sorted(sources) == [
+        '2006 IPCC Guidelines for National Greenhouse Gas Inventories',
+        '2019 Refinement to the 2006 IPCC Guidelines for National Greenhouse Gas Inventories',
+        'A critical review of the conventional SOC to SOM conversion factor',
+        'An Enhanced Global Elevation Model Generalized From Multiple Higher Resolution Source Datasets',
+        'Biofuels: a new methodology to estimate GHG emissions from global land use change',
+        'COMMISSION DECISION of 10 June 2010 on guidelines for the calculation of land carbon stocks for the purpose of Annex V to Directive 2009/28/EC',  # noqa: E501
+        'Contribution of Organic Matter and Clay to Soil Cation-Exchange Capacity as Affected by the pH of the Saturating Solution',  # noqa: E501
+        'ERA5: Fifth generation of ECMWF atmospheric reanalyses of the global climate',
+        'Harmonized World Soil Database Version 1.2. Food and Agriculture Organization of the United Nations (FAO).',  # noqa: E501
+        'Harmonized World Soil Database Version 2.0.',
+        'Modelling spatially explicit impacts from phosphorus emissions in agriculture',
+        'Reducing food’s environmental impacts through producers and consumers',
+        'Soil organic carbon sequestration rates in vineyard agroecosystems under different soil management practices: A meta-analysis',  # noqa: E501
+    ]
 
 
 @patch(f"{class_path}.search", return_value=search_results)

tests/orchestrator/test_models.py

@@ -10,6 +10,7 @@ class_path = 'hestia_earth.orchestrator.models'
 folder_path = os.path.join(fixtures_path, 'orchestrator', 'cycle')
 
 
+@patch('hestia_earth.models.utils.source.find_sources', return_value=[])
 @patch('hestia_earth.orchestrator.strategies.merge._merge_version', return_value='0.0.0')
 def test_run(*args):
     with open(os.path.join(folder_path, 'config.json'), encoding='utf-8') as f: