hestia-earth-models 0.70.0__py3-none-any.whl → 0.70.2__py3-none-any.whl

tests/models/aware/test_scarcityWeightedWaterUse.py

@@ -2,23 +2,12 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_indicator, fake_load_impacts
 
-from hestia_earth.models.aware.scarcityWeightedWaterUse import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.aware.scarcityWeightedWaterUse 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}.get_site")
-def test_should_run(mock_site):
-    # no site => no run
-    mock_site.return_value = None
-    assert not _should_run({})
-
-    # with site => run
-    mock_site.return_value = {'@type': 'Site'}
-    assert _should_run({}) is True
-
-
 @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:

tests/models/ecoalimV9/test_cycle.py

@@ -0,0 +1,21 @@
+import os
+import json
+from unittest.mock import patch
+
+from tests.utils import fixtures_path, fake_new_emission
+from hestia_earth.models.ecoalimV9.cycle import MODEL, run
+
+class_path = f"hestia_earth.models.{MODEL}.cycle"
+fixtures_folder = os.path.join(fixtures_path, MODEL, 'cycle')
+
+
+@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

tests/models/ecoalimV9/test_impact_assessment.py

@@ -0,0 +1,24 @@
+import os
+import json
+from unittest.mock import patch
+
+from tests.utils import fixtures_path, fake_new_indicator
+from hestia_earth.models.ecoalimV9.impact_assessment import MODEL, run
+
+class_path = f"hestia_earth.models.{MODEL}.impact_assessment"
+fixtures_folder = os.path.join(fixtures_path, MODEL, 'impact_assessment')
+
+
+@patch(f"{class_path}._new_indicator", side_effect=fake_new_indicator)
+def test_run(*args):
+    with open(f"{fixtures_folder}/impact.jsonld", encoding='utf-8') as f:
+        impact = json.load(f)
+    with open(os.path.join(fixtures_path, MODEL, 'cycle', 'cycle.jsonld'), encoding='utf-8') as f:
+        cycle = json.load(f)
+    impact['cycle'] = cycle
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    result = run(impact)
+    assert result == expected

tests/models/environmentalFootprintV3_1/test_scarcityWeightedWaterUse.py

@@ -25,8 +25,10 @@ def test_run(mock_indicator, folder):
     with open(f"{fixtures_folder}/{folder}/impactassessment.jsonld", encoding='utf-8') as f:
         impactassessment = json.load(f)
 
-    with open(f"{fixtures_folder}/{folder}/result.jsonld", encoding='utf-8') as f:
-        expected = json.load(f)
+    expected = None
+    if os.path.exists(f"{fixtures_folder}/{folder}/result.jsonld"):
+        with open(f"{fixtures_folder}/{folder}/result.jsonld", encoding='utf-8') as f:
+            expected = json.load(f)
 
     value = run(impactassessment)
     assert value == expected, folder

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

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

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

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

tests/models/{site → hestia}/test_brackishWater.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.brackishWater import MODEL, TERM_ID, _should_run, run
+from hestia_earth.models.hestia.brackishWater 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_cationExchangeCapacityPerKgSoil.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.cationExchangeCapacityPerKgSoil import (
+from hestia_earth.models.hestia.cationExchangeCapacityPerKgSoil import (
     MODEL, TERM_ID, run, _should_run_measurements
 )
 

tests/models/{cycle → hestia}/test_coldCarcassWeightPerHead.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.coldCarcassWeightPerHead import MODEL, TERM_ID, _should_run, run
+from hestia_earth.models.hestia.coldCarcassWeightPerHead 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_coldDressedCarcassWeightPerHead.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.coldDressedCarcassWeightPerHead import MODEL, TERM_ID, _should_run, run
+from hestia_earth.models.hestia.coldDressedCarcassWeightPerHead 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_concentrateFeed.py

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

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

@@ -3,7 +3,7 @@ import json
 from tests.utils import fake_new_practice, fixtures_path
 from hestia_earth.schema import TermTermType
 
-from hestia_earth.models.cycle.cropResidueManagement import MODEL, _should_run, run
+from hestia_earth.models.hestia.cropResidueManagement import MODEL, _should_run, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TermTermType.CROPRESIDUEMANAGEMENT.value}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TermTermType.CROPRESIDUEMANAGEMENT.value}"

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

@@ -3,7 +3,7 @@ import pytest
 import json
 from tests.utils import fixtures_path, fake_new_practice
 
-from hestia_earth.models.cycle.croppingIntensity import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.croppingIntensity 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_energyContentLowerHeatingValue.py

@@ -2,10 +2,12 @@ from unittest.mock import patch
 import json
 
 from tests.utils import fixtures_path, fake_new_property
-from hestia_earth.models.cycle.energyContentLowerHeatingValue import TERM_ID, PROPERTY_KEY, run, _should_run_input
+from hestia_earth.models.hestia.energyContentLowerHeatingValue import (
+    MODEL, TERM_ID, PROPERTY_KEY, run, _should_run_input
+)
 
-class_path = f"hestia_earth.models.cycle.{TERM_ID}"
-fixtures_folder = f"{fixtures_path}/cycle/{TERM_ID}"
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
 
 
 def test_should_run_input():

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

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

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

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

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

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

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

@@ -3,18 +3,17 @@ import json
 from hestia_earth.schema import TermTermType
 from tests.utils import fixtures_path, fake_new_practice
 
-from hestia_earth.models.cycle.feedConversionRatio import MODEL, run, _should_run
+from hestia_earth.models.hestia.feedConversionRatio import MODEL, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.feedConversionRatio"
 fixtures_folder = f"{fixtures_path}/{MODEL}/feedConversionRatio"
 
 TERMS_BY_ID = {
-    'energyContentHigherHeatingValue': {'units': 'MJ / kg'},
-    'crudeProteinContent': {'units': '%'},
+    'energyContentHigherHeatingValue': {'units': 'MJ / kg'}
 }
 
 
-def fake_download_term(term_id: str, *args): return TERMS_BY_ID[term_id]
+def fake_download_term(term_id: str, *args): return TERMS_BY_ID.get(term_id, {'@id': term_id, 'units': '%'})
 
 
 @patch(f"{class_path}.get_total_value_converted_with_min_ratio", return_value=10)

tests/models/{site → hestia}/test_flowingWater.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.flowingWater import MODEL, run, _should_run
+from hestia_earth.models.hestia.flowingWater import MODEL, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.flowingWater"
 fixtures_folder = f"{fixtures_path}/{MODEL}/flowingWater"

tests/models/{site → hestia}/test_freshWater.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.freshWater import MODEL, TERM_ID, _should_run, run
+from hestia_earth.models.hestia.freshWater 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_inorganicFertiliser.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.cycle.inorganicFertiliser import MODEL, MODEL_KEY, run
+from hestia_earth.models.hestia.inorganicFertiliser import MODEL, MODEL_KEY, run
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"

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

@@ -2,7 +2,7 @@ from unittest.mock import patch
 import json
 from tests.utils import fixtures_path, fake_new_practice
 
-from hestia_earth.models.cycle.irrigatedTypeUnspecified import MODEL, TERM_ID, run
+from hestia_earth.models.hestia.irrigatedTypeUnspecified import MODEL, TERM_ID, run
 
 class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
@@ -22,11 +22,8 @@ def test_run_complete_low_irrigation(*argsm):
     with open(f"{fixtures_folder}/complete-low-irrigation/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
 
-    with open(f"{fixtures_folder}/complete-low-irrigation/result.jsonld", encoding='utf-8') as f:
-        expected = json.load(f)
-
     value = run(cycle)
-    assert value == expected
+    assert value == []
 
 
 @patch(f"{class_path}._new_practice", side_effect=fake_new_practice)

tests/models/hestia/test_landCover.py

@@ -1,6 +1,5 @@
-import csv
+import os
 import json
-import numpy as np
 import pytest
 from unittest.mock import patch
 
@@ -13,6 +12,7 @@ from hestia_earth.models.hestia.landCover import (
 
 CLASS_PATH = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
+_folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]
 
 FAOSTAT_CLASS_PATH = f"hestia_earth.models.{FAOSTAT_MODEL}.utils"
 faostat_fixtures_folder = f"{fixtures_path}/{FAOSTAT_MODEL}/utils"
@@ -42,19 +42,6 @@ BRAZIL_SITE = {
 }
 
 
-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)
-
-
 def test_get_changes():
     result, missing_values = get_changes(
         country_id="GADM-AFG",
@@ -232,26 +219,9 @@ def test_scale_values_to_one(dictionary, expected_result):
         assert round(v, 3) == round(expected_result[k], 3)
 
 
-@pytest.mark.parametrize(
-    "subfolder",
-    [
-        "albania_example",
-        "argentina_example",
-        "armenia_example",
-        "brazil_example",
-        "zimbabwe_example",
-        "brazil_empty_example",
-        "gbr_example",
-        "malaysia",
-        "prior_landCover",
-        "nigeria_cassava",
-        "cover_crops",
-        "missing_fao_date",
-        "iran_sistan"
-    ]
-)
+@pytest.mark.parametrize("subfolder", _folders)
 @patch(f"{CLASS_PATH}._new_management", side_effect=fake_new_management)
-def test_run(mock, subfolder):
+def test_run(mock, subfolder: str):
     folder = f"{fixtures_folder}/{subfolder}"
     with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
         site = json.load(f)

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

@@ -3,7 +3,7 @@ import json
 from hestia_earth.schema import TermTermType
 
 from tests.utils import fixtures_path, fake_new_product
-from hestia_earth.models.cycle.liveAnimal import MODEL, MODEL_KEY, run, _should_run
+from hestia_earth.models.hestia.liveAnimal import MODEL, MODEL_KEY, run, _should_run
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"

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

@@ -3,7 +3,7 @@ import pytest
 import json
 from tests.utils import fixtures_path, fake_new_practice
 
-from hestia_earth.models.cycle.longFallowRatio import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.longFallowRatio 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_management.py

@@ -5,7 +5,7 @@ from unittest.mock import Mock, patch
 from hestia_earth.schema import SiteSiteType
 
 from tests.utils import fixtures_path, fake_new_management
-from hestia_earth.models.site.management import MODEL, MODEL_KEY, run
+from hestia_earth.models.hestia.management import MODEL, MODEL_KEY, run
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = os.path.join(fixtures_path, MODEL, MODEL_KEY)

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

@@ -4,7 +4,7 @@ import pytest
 from hestia_earth.utils.tools import to_precision
 
 from tests.utils import fixtures_path, fake_new_input
-from hestia_earth.models.cycle.materialAndSubstrate import MODEL, MODEL_KEY, run, calculate_value
+from hestia_earth.models.hestia.materialAndSubstrate import MODEL, MODEL_KEY, run, calculate_value
 
 class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
 fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"

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

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

tests/models/{site → hestia}/test_netPrimaryProduction.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.netPrimaryProduction import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.netPrimaryProduction 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_organicCarbonPerHa.py

@@ -4,7 +4,7 @@ from unittest.mock import patch
 
 from tests.utils import fixtures_path, fake_new_measurement
 
-from hestia_earth.models.site.organicCarbonPerHa import (
+from hestia_earth.models.hestia.organicCarbonPerHa import (
     MODEL, TERM_ID, run, _cdf, _c_to_depth, _get_most_relevant_soc_node, _get_last_date
 )
 

tests/models/{site → hestia}/test_organicCarbonPerKgSoil.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.organicCarbonPerKgSoil import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.organicCarbonPerKgSoil 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_organicCarbonPerM3Soil.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.organicCarbonPerM3Soil import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.organicCarbonPerM3Soil 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_organicMatterPerKgSoil.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.organicMatterPerKgSoil import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.organicMatterPerKgSoil 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_organicMatterPerM3Soil.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.organicMatterPerM3Soil import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.organicMatterPerM3Soil 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/hestia/test_pToSurfaceWaterAquacultureSystems.py

@@ -0,0 +1,56 @@
+import os
+import json
+import pytest
+from unittest.mock import Mock, patch
+from tests.utils import fixtures_path, fake_new_emission
+
+from hestia_earth.models.hestia.pToSurfaceWaterAquacultureSystems import MODEL, TERM_ID, run, _should_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))]
+
+
+def _fake_download_term(term_id, *args):
+    return {'@id': term_id, 'units': '%'}
+
+
+@pytest.mark.parametrize(
+    'test_name,cycle,expected_should_run',
+    [
+        (
+            'incomplete => no run',
+            {},
+            False
+        ),
+        (
+            'complete => run',
+            {
+                'completeness': {
+                    'animalFeed': True,
+                    'product': True,
+                    'fertiliser': True,
+                    'liveAnimalInput': True,
+                }
+            },
+            True
+        ),
+    ]
+)
+def test_should_run(test_name, cycle, expected_should_run):
+    should_run = _should_run(cycle)
+    assert should_run == expected_should_run, test_name
+
+
+@pytest.mark.parametrize('folder', _folders)
+@patch('hestia_earth.models.utils.property.download_term', side_effect=_fake_download_term)
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+def test_run(mock_new_emission: Mock, mock_download_term: Mock, folder):
+    with open(f"{fixtures_folder}/{folder}/cycle.jsonld", encoding='utf-8') as f:
+        cycle = json.load(f)
+
+    with open(f"{fixtures_folder}/{folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    value = run(cycle)
+    assert value == expected, folder

tests/models/{cycle → hestia}/test_pastureGrass.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.pastureGrass import MODEL, TERM_ID, KEY_TERM_ID, _should_run, run
+from hestia_earth.models.hestia.pastureGrass import MODEL, TERM_ID, KEY_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_pastureSystem.py

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

tests/models/{site → hestia}/test_potentialEvapotranspirationAnnual.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.potentialEvapotranspirationAnnual import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.potentialEvapotranspirationAnnual 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_potentialEvapotranspirationMonthly.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.potentialEvapotranspirationMonthly import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.potentialEvapotranspirationMonthly 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_precipitationAnnual.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.precipitationAnnual import MODEL, TERM_ID, run, _should_run
+from hestia_earth.models.hestia.precipitationAnnual 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_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}"