hestia-earth-models 0.64.11__py3-none-any.whl → 0.64.13__py3-none-any.whl

{hestia_earth_models-0.64.11.dist-info → hestia_earth_models-0.64.13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.0)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/models/cycle/completeness/test_seed.py

@@ -20,7 +20,7 @@ def test_run_seed(mock_find_term):
 
 @patch(f"{class_path}.is_plantation", return_value=False)
 @patch(f"{class_path}.find_term_match", return_value=None)
-def test_run_saplings(mock_find_term, mock_is_plantation):
+def test_run_saplingsDepreciatedAmountPerCycle(mock_find_term, mock_is_plantation):
     cycle = {}
 
     # on cropland => not complete

tests/models/cycle/test_endDate.py

@@ -1,3 +1,5 @@
+import pytest
+
 from hestia_earth.models.cycle.endDate import _should_run, run
 
 
@@ -18,5 +20,19 @@ def test_should_run():
     assert should_run is True
 
 
-def test_run():
-    assert run({'endDate': '2020-01'}) == '2020-01-14'
+@pytest.mark.parametrize(
+    'test_name,cycle,result',
+    [
+        (
+            'with endDate only', {'endDate': '2020-01'}, '2020-01-14'
+        ),
+        (
+            'with endDate same month as startDate', {'endDate': '2020-02', 'startDate': '2020-02'}, '2020-02-29'
+        ),
+        (
+            'with endDate not same month as startDate', {'endDate': '2020-02', 'startDate': '2020-01'}, '2020-02-14'
+        ),
+    ]
+)
+def test_run(test_name: str, cycle: dict, result: str):
+    assert run(cycle) == result, test_name

tests/models/cycle/test_startDate.py

@@ -1,3 +1,5 @@
+import pytest
+
 from hestia_earth.models.cycle.startDate import _should_run_by_cycleDuration, _should_run_by_startDate, run
 
 
@@ -35,6 +37,22 @@ def test_should_run_by_startDate():
     assert should_run is True
 
 
-def test_run():
-    assert run({'endDate': '2020-01-01', 'cycleDuration': 365}) == '2019-01-01'
-    assert run({'startDate': '2020-01'}) == '2020-01-15'
+@pytest.mark.parametrize(
+    'test_name,cycle,result',
+    [
+        (
+            'with startDate only', {'startDate': '2020-01'}, '2020-01-15'
+        ),
+        (
+            'with endDate and cycleDuration', {'endDate': '2020-01-01', 'cycleDuration': 365}, '2019-01-01'
+        ),
+        (
+            'with endDate same month as startDate', {'endDate': '2020-02', 'startDate': '2020-02'}, '2020-02-01'
+        ),
+        (
+            'with endDate not same month as startDate', {'endDate': '2020-02', 'startDate': '2020-01'}, '2020-01-15'
+        ),
+    ]
+)
+def test_run(test_name: str, cycle: dict, result: str):
+    assert run(cycle) == result, test_name

tests/models/faostat2018/test_faostat_utils.py

@@ -0,0 +1,84 @@
+from unittest.mock import patch
+
+import numpy
+
+from hestia_earth.models.faostat2018.utils import (get_sum_of_columns, MODEL, get_land_ratio,
+                                                   get_change_in_harvested_area_for_crop)
+from tests.utils import fixtures_path
+
+CLASS_PATH = f"hestia_earth.models.{MODEL}.utils"
+fixtures_folder = f"{fixtures_path}/{MODEL}/utils"
+
+
+def _afg_download_fixture():
+    with open(f"{fixtures_folder}/gadm-afg.csv") as f:
+        afg_lookup = numpy.recfromcsv(
+            fname=f,
+            missing_values="",
+            filling_values="",
+            delimiter=",",
+            encoding="utf-8"
+        )
+    return afg_lookup
+
+
+def test_get_sum_of_columns():
+    result = get_sum_of_columns(
+        lookup=_afg_download_fixture(),
+        country="GADM-AFG",
+        year=1975,
+        columns_list=["Arable land", "Permanent crops"]
+    )
+    assert result == 8050.3
+
+
+def test_check_sums_for_columns():
+    """
+    Check that the values of Arable and Permanent add up to Cropland, at least for AFG
+    """
+    for year in range(1961, 2021):
+        sum_arab_perm = get_sum_of_columns(
+            lookup=_afg_download_fixture(),
+            country="GADM-AFG",
+            year=year,
+            columns_list=["Arable land", "Permanent crops"]
+        )
+
+        cropland_value = get_sum_of_columns(
+            lookup=_afg_download_fixture(),
+            country="GADM-AFG",
+            year=year,
+            columns_list=["Cropland"]
+        )
+        assert sum_arab_perm == cropland_value
+
+
+@patch(f"{CLASS_PATH}.download_lookup")
+def test_get_land_ratio(mock_lookup):
+    mock_lookup.return_value = _afg_download_fixture()
+    result = get_land_ratio(
+        country="GADM-AFG",
+        start_year=1990,
+        end_year=2010,
+        first_column="Forest land",
+        second_column="Cropland"
+    )
+
+    assert result == (-123.0, 0.0, -123.0)
+
+
+def test_get_harvested_area_for_crop():
+    result = get_change_in_harvested_area_for_crop(
+        country_id="GADM-AFG",
+        start_year=1990,
+        end_year=1992,
+        crop_name="Wheat"
+    )
+    assert result == 30000.0
+
+    result = get_change_in_harvested_area_for_crop(
+        country_id="GADM-AFG",
+        start_year=2019,
+        crop_name="Wheat"
+    )
+    assert result == 2334000

tests/models/hestia/test_landCover.py

@@ -0,0 +1,210 @@
+import csv
+import json
+import numpy as np
+import pytest
+from unittest.mock import patch
+
+from tests.utils import fixtures_path, fake_new_management
+from hestia_earth.models.faostat2018.utils import MODEL as FAOSTAT_MODEL
+from hestia_earth.models.hestia.landCover import (
+    MODEL, MODEL_KEY, get_changes, _estimate_maximum_forest_change,
+    run, site_area_sum_to_100, _get_sums_of_crop_expansion
+)
+
+CLASS_PATH = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
+
+FAOSTAT_CLASS_PATH = f"hestia_earth.models.{FAOSTAT_MODEL}.utils"
+faostat_fixtures_folder = f"{fixtures_path}/{FAOSTAT_MODEL}/utils"
+
+BRAZIL_SITE = {
+    "@type": "Site",
+    "id": "Brazil-example",
+    "country": {
+        "name": "Brazil",
+        "type": "Term"
+    },
+    "siteType": "cropland",
+    "management": [
+        {
+            "term": {
+                "@id": "maizePlant",
+                "name": "Maize plant",
+                "type": "Term",
+                "termType": "landCover"
+            },
+            "value": 100,
+            "startDate": "2010-01-01",
+            "endDate": "2010-12-31",
+            "type": "Management"
+        }
+    ]
+}
+
+
+def recfromcsv_mod(filename, **kwargs):
+    def rewrite_csv_as_tab(csv_name):
+        with open(csv_name, newline='') as fp:
+            for row in csv.reader(fp, delimiter=","):
+                yield "\t".join(row)
+    return np.recfromcsv(
+        rewrite_csv_as_tab(filename), delimiter="\t", encoding=None, **kwargs)
+
+
+def _download_fixture(filepath: str):
+    return recfromcsv_mod(filename=filepath)
+
+
+@patch(f"{FAOSTAT_CLASS_PATH}.download_lookup")
+def test_get_changes(mock_lookup):
+    mock_lookup.return_value = _download_fixture(f"{faostat_fixtures_folder}/gadm-afg.csv")
+    result = get_changes(
+        country_id="GADM-AFG",
+        end_year=2010
+    )
+    assert (
+        result == {
+            "Arable land": -117.0,
+            "Cropland": -123.0,
+            "Forest land": 0,
+            "Other land": 123.0,
+            "Land area": 0,
+            "Permanent crops": -6.0,
+            "Permanent meadows and pastures": 0,
+            "Total agricultural change": -123.0
+        }
+    )
+
+
+@pytest.mark.parametrize(
+    "description,inputs,expected_output",
+    [
+        (
+            "Annual cropland gain from forest",
+            {
+                "forest_change": -1000,
+                "total_cropland_change": 1000,
+                "pasture_change": 0,
+                "total_agricultural_change": 1000
+            },
+            -1000
+        ),
+        (
+            "Pasture gain from forest",
+            {
+                "forest_change": -1000,
+                "total_cropland_change": 0,
+                "pasture_change": 1000,
+                "total_agricultural_change": 1000
+            },
+            -1000
+        ),
+        (
+            "Brazil",
+            {
+                "forest_change": -77317,
+                "total_cropland_change": 5201,
+                "pasture_change": -8267,
+                "total_agricultural_change": -3066
+            },
+            -5201
+        ),
+        (
+            "Argentina",
+            {
+                "forest_change": -4990,
+                "total_cropland_change": 11408,
+                "pasture_change": -12705,
+                "total_agricultural_change": -1297
+            },
+            -4990
+        ),
+        (
+            "Madagascar",
+            {
+                "forest_change": -1131,
+                "total_cropland_change": 275,
+                "pasture_change": 4295,
+                "total_agricultural_change": 4570
+            },
+            -1131
+        ),
+        (
+            "Afforestation",
+            {
+                "forest_change": 100,
+                "total_cropland_change": -1000,
+                "pasture_change": -50,
+                "total_agricultural_change": -1000
+            },
+            0
+        ),
+        (
+            "Pasture gain more than forest loss",
+            {
+                "forest_change": -49,
+                "total_cropland_change": -1000,
+                "pasture_change": 50,
+                "total_agricultural_change": -950
+            },
+            -49
+        )
+    ]
+)
+def test_estimate_maximum_forest_change(description, inputs, expected_output):
+    assert _estimate_maximum_forest_change(**inputs) == expected_output, description
+
+
+@pytest.mark.parametrize(
+    "description,inputs,expected_result",
+    [
+        ("All zeros, OK", {"a": 0, "b": 0, "c": 0.0, "d": 0.0}, True),
+        ("Exactly 1, OK", {"a": 0.1, "b": 0.5, "c": 0.4, "d": 0.0}, True),
+        ("Almost 1, OK", {"a": 0.1, "b": 0.5, "c": 0.4, "d": 0.01}, True),
+        ("Less than 1, Fail", {"a": 0.1, "b": 0, "c": 0.0, "d": 0.65}, False),
+        ("More than 1, Fail", {"a": 0.15, "b": 0.7, "c": 0.0, "d": 0.65}, False),
+    ]
+)
+def test_check_sum_of_percentages(description, inputs, expected_result):
+    assert site_area_sum_to_100(dict_of_percentages=inputs) == expected_result
+
+
+def test_get_sums_of_crop_expansion():
+    result = _get_sums_of_crop_expansion(
+        country_id="GADM-AFG",
+        year=2010,
+        include_negatives=True
+    )
+    assert result == (753973.3, 18354.0)
+
+    result = _get_sums_of_crop_expansion(
+        country_id="GADM-AFG",
+        year=2010,
+        include_negatives=False
+    )
+    assert result == (940270.0, 28139.0)
+
+
+@pytest.mark.parametrize(
+    "subfolder",
+    [
+        "albania_example",
+        "argentina_example",
+        "armenia_example",
+        "brazil_example",
+        "zimbabwe_example",
+        "brazil_empty_example",
+        "gbr_example"
+    ]
+)
+@patch(f"{CLASS_PATH}._new_management", side_effect=fake_new_management)
+def test_run(mock, subfolder):
+    folder = f"{fixtures_folder}/{subfolder}"
+    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

tests/models/ipcc2019/animal/test_milkYieldPerAnimal.py

@@ -0,0 +1,21 @@
+from unittest.mock import patch
+import json
+from tests.utils import fixtures_path, fake_new_practice
+
+from hestia_earth.models.ipcc2019 import MODEL
+from hestia_earth.models.ipcc2019.animal.milkYieldPerAnimal import MODEL_KEY, run
+
+class_path = f"hestia_earth.models.{MODEL}.animal.{MODEL_KEY}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/animal/{MODEL_KEY}"
+
+
+@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:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected

tests/models/ipcc2019/test_aboveGroundBiomass.py

@@ -45,7 +45,8 @@ PARAMS_SHOULD_RUN = [
     ("historical-land-cover-mix", True),
     ("historical-argentina-pasture", True),
     ("historical-brazil-maize", True),
-    ("perennial-to-grassland-with-pasture-condition", True)
+    ("perennial-to-grassland-with-pasture-condition", True),
+    ("with-gapfilled-start-date-end-date", False)  # Closes #972
 ]
 IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
 

tests/models/ipcc2019/test_belowGroundBiomass.py

@@ -45,7 +45,8 @@ PARAMS_SHOULD_RUN = [
     ("historical-land-cover-mix", True),
     ("historical-argentina-pasture", True),
     ("historical-brazil-maize", True),
-    ("perennial-to-grassland-with-pasture-condition", True)
+    ("perennial-to-grassland-with-pasture-condition", True),
+    ("with-gapfilled-start-date-end-date", False)  # Closes #972
 ]
 IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
 

tests/models/ipcc2019/test_co2ToAirAboveGroundBiomassStockChange.py

@@ -19,9 +19,10 @@ RUN_SCENARIOS = [
     ("missing-measurement-dates", 3),
     ("no-biomass-measurements", 1),               # Closes issue #700
     ("non-consecutive-biomass-measurements", 1),  # Closes issue #827
-    ("multiple-method-classifications", 5),              # Closes issue #764
-    ("non-soil-based-gohac-system", 3),                  # Closes issue #848
-    ("soil-based-gohac-system", 3)                       # Closes issue #848
+    ("multiple-method-classifications", 5),       # Closes issue #764
+    ("non-soil-based-gohac-system", 3),           # Closes issue #848
+    ("soil-based-gohac-system", 3),               # Closes issue #848
+    ("with-gapfilled-start-date-end-date", 1)     # Closes issue #972
 ]
 """List of (subfolder: str, num_cycles: int)."""
 

tests/models/ipcc2019/test_co2ToAirBelowGroundBiomassStockChange.py

@@ -19,9 +19,9 @@ RUN_SCENARIOS = [
     ("missing-measurement-dates", 3),
     ("no-biomass-measurements", 1),               # Closes issue #700
     ("non-consecutive-biomass-measurements", 1),  # Closes issue #827
-    ("multiple-method-classifications", 5),              # Closes issue #764
-    ("non-soil-based-gohac-system", 3),                  # Closes issue #848
-    ("soil-based-gohac-system", 3)                       # Closes issue #848
+    ("multiple-method-classifications", 5),       # Closes issue #764
+    ("non-soil-based-gohac-system", 3),           # Closes issue #848
+    ("with-gapfilled-start-date-end-date", 1)     # Closes issue #972
 ]
 """List of (subfolder: str, num_cycles: int)."""
 

tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChange.py

@@ -10,8 +10,34 @@ from tests.utils import fake_new_emission, fixtures_path, order_list
 
 class_path = f"hestia_earth.models.{MODEL}.co2ToAirSoilOrganicCarbonStockChange"
 utils_path = f"hestia_earth.models.{MODEL}.co2ToAirCarbonStockChange_utils"
+soc_utils_path = f"hestia_earth.models.{MODEL}.organicCarbonPerHa_utils"
+term_folder = "hestia_earth.models.utils.term"
 fixtures_folder = f"{fixtures_path}/{MODEL}/co2ToAirSoilOrganicCarbonStockChange"
 
+
+IRRIGATED_TERM_IDS = [
+    "rainfedDeepWater",
+    "rainfedDeepWaterWaterDepth100Cm",
+    "rainfedDeepWaterWaterDepth50100Cm",
+    "irrigatedTypeUnspecified",
+    "irrigatedCenterPivotIrrigation",
+    "irrigatedContinuouslyFlooded",
+    "irrigatedDripIrrigation",
+    "irrigatedFurrowIrrigation",
+    "irrigatedLateralMoveIrrigation",
+    "irrigatedLocalizedIrrigation",
+    "irrigatedManualIrrigation",
+    "irrigatedSurfaceIrrigationMultipleDrainagePeriods",
+    "irrigatedSurfaceIrrigationSingleDrainagePeriod",
+    "irrigatedSprinklerIrrigation",
+    "irrigatedSubIrrigation",
+    "irrigatedSurfaceIrrigationDrainageRegimeUnspecified"
+]
+
+UPLAND_RICE_LAND_COVER_TERM_IDS = [
+    "ricePlantUpland"
+]
+
 RUN_SCENARIOS = [
     ("no-overlapping-cycles", 3),
     ("overlapping-cycles", 4),
@@ -21,7 +47,7 @@ RUN_SCENARIOS = [
     ("non-consecutive-organic-carbon-measurements", 1),  # Closes issue #827
     ("multiple-method-classifications", 5),              # Closes issue #764
     ("non-soil-based-gohac-system", 3),                  # Closes issue #848
-    ("soil-based-gohac-system", 3)                       # Closes issue #848
+    ("with-gapfilled-start-date-end-date", 1)            # Closes issue #972
 ]
 """List of (subfolder: str, num_cycles: int)."""
 
@@ -47,7 +73,20 @@ RUN_IDS = [f"{param[0]}, cycle{param[2]}" for param in RUN_PARAMS]
 @patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
 @patch(f"{utils_path}.related_cycles")
 @patch(f"{utils_path}._get_site")
-def test_run(_get_site_mock, related_cycles_mock, _new_emission_mock, subfolder, num_cycles, cycle_index):
+@patch(f"{soc_utils_path}.get_upland_rice_land_cover_terms", return_value=UPLAND_RICE_LAND_COVER_TERM_IDS)
+@patch(f"{soc_utils_path}.get_irrigated_terms", return_value=IRRIGATED_TERM_IDS)
+@patch(f"{term_folder}.search")
+def test_run(
+    search_mock,
+    get_irrigated_terms_mock,
+    get_upland_rice_land_cover_terms_mock,
+    _get_site_mock,
+    related_cycles_mock,
+    _new_emission_mock,
+    subfolder,
+    num_cycles,
+    cycle_index
+):
     """
     Test `run` function for each cycle in each scenario.
     """
@@ -63,6 +102,14 @@ def test_run(_get_site_mock, related_cycles_mock, _new_emission_mock, subfolder,
     related_cycles_mock.return_value = cycles
 
     result = run(cycle)
+
+    # Ensure that API calls to retrieve term IDs are properly cached.
+    get_irrigated_terms_mock.call_count <= 1
+    get_upland_rice_land_cover_terms_mock.call_count <= 1
+
+    # Ensure that the property and term utils are properly mocked.
+    search_mock.assert_not_called()
+
     assert order_list(result) == order_list(expected)
 
 

tests/models/ipcc2019/test_n2OToAirExcretaDirect.py

@@ -36,3 +36,15 @@ def test_run(*args):
 
     value = run(cycle)
     assert value == expected
+
+
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+def test_run_complete_no_inputs(*args):
+    with open(f"{fixtures_folder}/complete-no-inputs/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/complete-no-inputs/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected

tests/models/ipcc2019/test_organicCarbonPerHa.py

@@ -108,6 +108,7 @@ PARAMS_SHOULD_RUN = [
     ("tier-1/run-with-site-type", True),                             # Closes issue 755
     ("tier-1/cropland-polar", False),                                # Closes issue 794
     ("tier-1/cropland-with-system-increasing-c-input", True),        # Closes issue 851
+    ("tier-1/with-gapfilled-start-date-end-date", False),            # Closes issue 972
     ("tier-2/with-generalised-monthly-measurements", False),         # Closes issue 600
     ("tier-2/with-incomplete-climate-data", False),                  # Closes issue 599
     ("tier-2/with-initial-soc", True),

tests/models/koble2014/test_aboveGroundCropResidue.py

@@ -47,3 +47,16 @@ def test_run_no_total(*args):
 
     value = run(cycle)
     assert value == expected
+
+
+@patch(f"{class_path}._is_term_type_incomplete", return_value=True)
+@patch(f"{class_path}._new_product", side_effect=fake_new_product)
+def test_run_with_leftOnField(*args):
+    with open(f"{fixtures_folder}/with-left-on-field-value/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/with-left-on-field-value/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected

tests/models/pooreNemecek2018/test_no3ToGroundwaterCropResidueDecomposition.py

@@ -6,10 +6,11 @@ from hestia_earth.models.pooreNemecek2018.no3ToGroundwaterCropResidueDecompositi
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+utils_class_path = f"hestia_earth.models.{MODEL}.no3ToGroundwaterSoilFlux_utils"
 
 
-@patch(f"hestia_earth.models.{MODEL}.no3ToGroundwaterSoilFlux.get_rice_paddy_terms", return_value=FLOODED_RICE_TERMS)
-@patch(f"hestia_earth.models.{MODEL}.no3ToGroundwaterSoilFlux.get_max_rooting_depth", return_value=0.9)
+@patch(f"{utils_class_path}.get_rice_paddy_terms", return_value=FLOODED_RICE_TERMS)
+@patch(f"{utils_class_path}.get_max_rooting_depth", return_value=0.9)
 @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/pooreNemecek2018/test_no3ToGroundwaterExcreta.py

@@ -6,10 +6,11 @@ from hestia_earth.models.pooreNemecek2018.no3ToGroundwaterExcreta import MODEL,
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+utils_class_path = f"hestia_earth.models.{MODEL}.no3ToGroundwaterSoilFlux_utils"
 
 
-@patch(f"hestia_earth.models.{MODEL}.no3ToGroundwaterSoilFlux.get_rice_paddy_terms", return_value=FLOODED_RICE_TERMS)
-@patch(f"hestia_earth.models.{MODEL}.no3ToGroundwaterSoilFlux.get_max_rooting_depth", return_value=0.9)
+@patch(f"{utils_class_path}.get_rice_paddy_terms", return_value=FLOODED_RICE_TERMS)
+@patch(f"{utils_class_path}.get_max_rooting_depth", return_value=0.9)
 @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/pooreNemecek2018/test_no3ToGroundwaterInorganicFertiliser.py

@@ -6,10 +6,11 @@ from hestia_earth.models.pooreNemecek2018.no3ToGroundwaterInorganicFertiliser im
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+utils_class_path = f"hestia_earth.models.{MODEL}.no3ToGroundwaterSoilFlux_utils"
 
 
-@patch(f"hestia_earth.models.{MODEL}.no3ToGroundwaterSoilFlux.get_rice_paddy_terms", return_value=FLOODED_RICE_TERMS)
-@patch(f"hestia_earth.models.{MODEL}.no3ToGroundwaterSoilFlux.get_max_rooting_depth", return_value=0.9)
+@patch(f"{utils_class_path}.get_rice_paddy_terms", return_value=FLOODED_RICE_TERMS)
+@patch(f"{utils_class_path}.get_max_rooting_depth", return_value=0.9)
 @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/pooreNemecek2018/test_no3ToGroundwaterOrganicFertiliser.py

@@ -6,10 +6,11 @@ from hestia_earth.models.pooreNemecek2018.no3ToGroundwaterOrganicFertiliser impo
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+utils_class_path = f"hestia_earth.models.{MODEL}.no3ToGroundwaterSoilFlux_utils"
 
 
-@patch(f"hestia_earth.models.{MODEL}.no3ToGroundwaterSoilFlux.get_rice_paddy_terms", return_value=FLOODED_RICE_TERMS)
-@patch(f"hestia_earth.models.{MODEL}.no3ToGroundwaterSoilFlux.get_max_rooting_depth", return_value=0.9)
+@patch(f"{utils_class_path}.get_rice_paddy_terms", return_value=FLOODED_RICE_TERMS)
+@patch(f"{utils_class_path}.get_max_rooting_depth", return_value=0.9)
 @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/pooreNemecek2018/{test_saplings.py → test_saplingsDepreciatedAmountPerCycle.py}

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_input
 
-from hestia_earth.models.pooreNemecek2018.saplings import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.pooreNemecek2018.saplingsDepreciatedAmountPerCycle import MODEL, TERM_ID, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"