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

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

@@ -1,10 +1,11 @@
-from unittest.mock import patch
+import os
+from unittest.mock import Mock, patch
 import json
 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 +14,8 @@ 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"
+_folders = [d for d in os.listdir(fixtures_folder) if os.path.isdir(os.path.join(fixtures_folder, d))]
 
 
 @pytest.mark.parametrize(
@@ -140,25 +142,15 @@ def test_should_run(test_name, site, expected_should_run):
     assert should_run == expected_should_run, test_name
 
 
-@pytest.mark.parametrize(
-    "test_name",
-    [
-        "missing-depth",
-        "missing-value",
-        "simple-soilPh",
-        "clayContent",
-        "non-unique-measurements",
-        "arrays",
-        "standard-intervals"
-    ]
-)
+@pytest.mark.parametrize('folder', _folders)
 @patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
-def test_run(mock_new_measurement, test_name):
-    with open(f"{fixtures_folder}/{test_name}/site.jsonld", encoding='utf-8') as f:
+def test_run(mock_new_measurement: Mock, folder):
+    with open(f"{fixtures_folder}/{folder}/site.jsonld", encoding='utf-8') as f:
         site = json.load(f)
 
-    with open(f"{fixtures_folder}/{test_name}/result.jsonld", encoding='utf-8') as f:
-        result = json.load(f)
+    with open(f"{fixtures_folder}/{folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
 
-    value = run(site)
-    assert value == result
+    result = run(site)
+    print(json.dumps(result, indent=2))
+    assert result == expected, folder

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

@@ -8,15 +8,12 @@ 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': '%'}
+    'energyContentHigherHeatingValue': {'units': 'MJ / kg'}
 }
 IONOPHORE_TERMS = ['ionophores', 'ionophoreAntibiotics']
 
 
-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_ionophore_terms", return_value=IONOPHORE_TERMS)

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_ch4ToAirOrganicSoilCultivation.py

@@ -0,0 +1,61 @@
+import json
+from pytest import mark
+from unittest.mock import MagicMock, patch
+
+from hestia_earth.models.ipcc2019.ch4ToAirOrganicSoilCultivation import MODEL, TERM_ID, _should_run, run
+from tests.utils import fake_new_emission, fixtures_path
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+# subfolder, should_run
+PARAMS_SHOULD_RUN = [
+    ("acacia", True),
+    ("annual-crops", True),
+    ("grassland", True),
+    ("oil-palm", True),
+    ("other", False),
+    ("paddy-rice-cultivation", True),
+    ("perennial-crops", True),
+    ("sago-palm", True),
+    ("polar", False),
+    ("mineral-soil", True),
+    ("unknown-soil", False),
+    ("unknown-land-occupation", False)
+]
+IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
+
+
+@mark.parametrize("subfolder, expected", PARAMS_SHOULD_RUN, ids=IDS_SHOULD_RUN)
+def test_should_run(
+    subfolder: str,
+    expected: bool
+):
+    folder = f"{fixtures_folder}/{subfolder}"
+
+    with open(f"{folder}/cycle.jsonld", encoding="utf-8") as f:
+        cycle = json.load(f)
+
+    result, *_ = _should_run(cycle)
+    assert result == expected
+
+
+PARAMS_RUN = [subfolder for subfolder, should_run in PARAMS_SHOULD_RUN if should_run]
+
+
+@mark.parametrize("subfolder", PARAMS_RUN)
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+def test_run(
+    _mock_new_emission: MagicMock,
+    subfolder: str
+):
+    folder = f"{fixtures_folder}/{subfolder}"
+
+    with open(f"{folder}/cycle.jsonld", encoding="utf-8") as f:
+        cycle = json.load(f)
+
+    with open(f"{folder}/result.jsonld", encoding="utf-8") as f:
+        expected = json.load(f)
+
+    result = run(cycle)
+    assert result == expected

tests/models/ipcc2019/test_co2ToAirAboveGroundBiomassStockChange.py

@@ -35,15 +35,17 @@ RUN_SCENARIOS = [
     ("overlapping-cycles", 4),
     ("complex-overlapping-cycles", 5),
     ("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
-    ("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
+    ("no-biomass-measurements", 1),               # Closes #700
+    ("non-consecutive-biomass-measurements", 1),  # Closes #827
+    ("multiple-method-classifications", 5),       # Closes #764
+    ("non-soil-based-gohac-system", 3),           # Closes #848
+    ("soil-based-gohac-system", 3),               # Closes #848
+    ("with-gapfilled-start-date-end-date", 1),    # Closes #972
+    ("forest-to-orchard-with-ground-cover", 3),   # Closes #989
+    ("orchard-data-complete", 3),                 # Closes #1011
+    ("orchard-data-partially-complete", 3),       # Closes #1011
+    ("no-measurements-data-complete", 1),         # Closes #1227
+    ("no-measurements-data-incomplete", 1)        # Closes #1227
 ]
 """List of (subfolder: str, num_cycles: int)."""
 

tests/models/ipcc2019/test_co2ToAirBelowGroundBiomassStockChange.py

@@ -35,14 +35,16 @@ RUN_SCENARIOS = [
     ("overlapping-cycles", 4),
     ("complex-overlapping-cycles", 5),
     ("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
-    ("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
+    ("no-biomass-measurements", 1),               # Closes #700
+    ("non-consecutive-biomass-measurements", 1),  # Closes #827
+    ("multiple-method-classifications", 5),       # Closes #764
+    ("non-soil-based-gohac-system", 3),           # Closes #848
+    ("with-gapfilled-start-date-end-date", 1),    # Closes #972
+    ("forest-to-orchard-with-ground-cover", 3),   # Closes #989
+    ("orchard-data-complete", 3),                 # Closes #1011
+    ("orchard-data-partially-complete", 3),       # Closes #1011
+    ("no-measurements-data-complete", 1),         # Closes #1227
+    ("no-measurements-data-incomplete", 1)        # Closes #1227
 ]
 """List of (subfolder: str, num_cycles: int)."""
 

tests/models/ipcc2019/test_co2ToAirLimeHydrolysis.py

@@ -28,7 +28,7 @@ def test_should_run():
     # with kg MgCO3 input => run
     cycle['inputs'].append({
         'term': {
-            'units': 'kg MgCO3',
+            'units': 'kg CaMg(CO3)2',
             'termType': 'soilAmendment'
         },
         'value': [100]

tests/models/ipcc2019/test_co2ToAirOrganicSoilCultivation.py

@@ -0,0 +1,62 @@
+import json
+from pytest import mark
+from unittest.mock import MagicMock, patch
+
+from hestia_earth.models.ipcc2019.co2ToAirOrganicSoilCultivation import MODEL, TERM_ID, _should_run, run
+from tests.utils import fake_new_emission, fixtures_path
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+
+# subfolder, should_run
+PARAMS_SHOULD_RUN = [
+    ("acacia", True),
+    ("annual-crops", True),
+    ("grassland", True),
+    ("oil-palm", True),
+    ("other", False),
+    ("paddy-rice-cultivation", True),
+    ("perennial-crops", True),
+    ("sago-palm", True),
+    ("polar", False),
+    ("mineral-soil", True),
+    ("unknown-soil", False),
+    ("unknown-land-occupation", False)
+]
+IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
+
+
+@mark.parametrize("subfolder, expected", PARAMS_SHOULD_RUN, ids=IDS_SHOULD_RUN)
+def test_should_run(
+    subfolder: str,
+    expected: bool
+):
+    folder = f"{fixtures_folder}/{subfolder}"
+
+    with open(f"{folder}/cycle.jsonld", encoding="utf-8") as f:
+        cycle = json.load(f)
+
+    result, *_ = _should_run(cycle)
+    assert result == expected
+
+
+PARAMS_RUN = [subfolder for subfolder, should_run in PARAMS_SHOULD_RUN if should_run]
+
+
+@mark.parametrize("subfolder", PARAMS_RUN)
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+def test_run(
+    _mock_new_emission: MagicMock,
+    subfolder: str,
+):
+    folder = f"{fixtures_folder}/{subfolder}"
+
+    with open(f"{folder}/cycle.jsonld", encoding="utf-8") as f:
+        cycle = json.load(f)
+
+    with open(f"{folder}/result.jsonld", encoding="utf-8") as f:
+        expected = json.load(f)
+
+    result = run(cycle)
+    assert result == expected

tests/models/ipcc2019/test_co2ToAirSoilOrganicCarbonStockChange.py

@@ -59,14 +59,17 @@ RUN_SCENARIOS = [
     ("overlapping-cycles", 4),
     ("complex-overlapping-cycles", 5),
     ("missing-measurement-dates", 3),
-    ("no-organic-carbon-measurements", 1),               # Closes issue #700
-    ("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
-    ("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
+    ("no-organic-carbon-measurements", 1),               # Closes #700
+    ("non-consecutive-organic-carbon-measurements", 1),  # Closes #827
+    ("multiple-method-classifications", 5),              # Closes #764
+    ("non-soil-based-gohac-system", 3),                  # Closes #848
+    ("with-gapfilled-start-date-end-date", 1),           # Closes #972
+    ("forest-to-orchard-with-ground-cover", 3),          # Closes #989
+    ("orchard-data-complete", 3),                        # Closes #1011
+    ("orchard-data-partially-complete", 3),              # Closes #1011
+    ("with-linalgerror", 1),
+    ("no-measurements-data-complete", 1),                # Closes #1227
+    ("no-measurements-data-incomplete", 1)               # Closes #1227
 ]
 """List of (subfolder: str, num_cycles: int)."""
 

tests/models/ipcc2019/test_n2OToAirOrganicSoilCultivationDirect.py

@@ -0,0 +1,61 @@
+import json
+from pytest import mark
+from unittest.mock import MagicMock, patch
+
+from hestia_earth.models.ipcc2019.n2OToAirOrganicSoilCultivationDirect import MODEL, TERM_ID, _should_run, run
+from tests.utils import fake_new_emission, fixtures_path
+
+class_path = f"hestia_earth.models.{MODEL}.{TERM_ID}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{TERM_ID}"
+
+# subfolder, should_run
+PARAMS_SHOULD_RUN = [
+    ("acacia", True),
+    ("annual-crops", True),
+    ("grassland", True),
+    ("oil-palm", True),
+    ("other", False),
+    ("paddy-rice-cultivation", True),
+    ("perennial-crops", True),
+    ("sago-palm", True),
+    ("polar", False),
+    ("mineral-soil", True),
+    ("unknown-soil", False),
+    ("unknown-land-occupation", False)
+]
+IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
+
+
+@mark.parametrize("subfolder, expected", PARAMS_SHOULD_RUN, ids=IDS_SHOULD_RUN)
+def test_should_run(
+    subfolder: str,
+    expected: bool
+):
+    folder = f"{fixtures_folder}/{subfolder}"
+
+    with open(f"{folder}/cycle.jsonld", encoding="utf-8") as f:
+        cycle = json.load(f)
+
+    result, *_ = _should_run(cycle)
+    assert result == expected
+
+
+PARAMS_RUN = [subfolder for subfolder, should_run in PARAMS_SHOULD_RUN if should_run]
+
+
+@mark.parametrize("subfolder", PARAMS_RUN,)
+@patch(f"{class_path}._new_emission", side_effect=fake_new_emission)
+def test_run(
+    _mock_new_emission: MagicMock,
+    subfolder: str
+):
+    folder = f"{fixtures_folder}/{subfolder}"
+
+    with open(f"{folder}/cycle.jsonld", encoding="utf-8") as f:
+        cycle = json.load(f)
+
+    with open(f"{folder}/result.jsonld", encoding="utf-8") as f:
+        expected = json.load(f)
+
+    result = run(cycle)
+    assert result == expected

tests/models/ipcc2019/test_nonCo2EmissionsToAirNaturalVegetationBurning.py

@@ -32,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
 ]
 
 

tests/models/site/test_grouped_measurement.py

@@ -0,0 +1,20 @@
+import json
+from unittest.mock import patch
+from tests.utils import fixtures_path, fake_new_measurement
+
+from hestia_earth.models.site.grouped_measurement import MODEL, MODEL_KEY, run
+
+class_path = f"hestia_earth.models.{MODEL}.{MODEL_KEY}"
+fixtures_folder = f"{fixtures_path}/{MODEL}/{MODEL_KEY}"
+
+
+@patch(f"{class_path}._new_measurement", side_effect=fake_new_measurement)
+def test_run(*args):
+    with open(f"{fixtures_folder}/site.jsonld", encoding='utf-8') as f:
+        site = json.load(f)
+
+    with open(f"{fixtures_folder}/result.jsonld", encoding='utf-8') as f:
+        expected = json.load(f)
+
+    result = run(site)
+    assert result == expected

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: