hestia-earth-models 0.74.7__py3-none-any.whl → 0.74.9__py3-none-any.whl

tests/models/hestia/test_aboveGroundCropResidue.py

@@ -1,11 +1,14 @@
-from unittest.mock import patch
+import os
 import json
+import pytest
+from unittest.mock import patch
 from tests.utils import fixtures_path, fake_new_product
 
-from hestia_earth.models.hestia.aboveGroundCropResidue import MODEL, run, _should_run
+from hestia_earth.models.hestia.aboveGroundCropResidue import MODEL, MODEL_KEY, run, _should_run
 
-class_path = f"hestia_earth.models.{MODEL}.aboveGroundCropResidue"
-fixtures_folder = f"{fixtures_path}/{MODEL}/aboveGroundCropResidue"
+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))]
 
 
 @patch(f"{class_path}._is_term_type_incomplete", return_value=True)
@@ -17,46 +20,21 @@ def test_should_run(*args):
     assert not should_run
 
     # product with total crop residue => run
-    with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
+    with open(f"{fixtures_folder}/with-total/cycle.jsonld", encoding='utf-8') as f:
         cycle = json.load(f)
     should_run, *args = _should_run(cycle)
     assert should_run is True
 
 
+@pytest.mark.parametrize('folder', _folders)
 @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(*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
-
-
-@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_no_total(*args):
-    with open(f"{fixtures_folder}/no-total/cycle.jsonld", encoding='utf-8') as f:
-        cycle = json.load(f)
-
-    with open(f"{fixtures_folder}/no-total/result.jsonld", encoding='utf-8') as f:
-        expected = json.load(f)
-
-    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:
+def test_run(mock_new_product, mock_complete, 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-left-on-field-value/result.jsonld", encoding='utf-8') as f:
+    with open(f"{fixtures_folder}/{folder}/result.jsonld", encoding='utf-8') as f:
         expected = json.load(f)
 
     value = run(cycle)
-    assert value == expected
+    assert value == expected, folder

tests/models/hestia/test_landOccupationDuringCycle.py

@@ -30,7 +30,8 @@ PARAMS_SHOULD_RUN = [
     ("animal-missing-other-site-data", False),  # mis-matched `otherSites` and `otherSitesDuration`
     ("animal-missing-site-data", False),        # closes #1341
     ("poore-nemecek-2018-orchard", True),       # ensure model returns the same value as deprecated one
-    ("poore-nemecek-2018-cereal", True)         # ensure model returns the same value as deprecated one
+    ("poore-nemecek-2018-cereal", True),        # ensure model returns the same value as deprecated one
+    ("animal-no-cycle", False)                  # closes #1362
 ]
 IDS_SHOULD_RUN = [p[0] for p in PARAMS_SHOULD_RUN]
 
@@ -45,10 +46,16 @@ def test_should_run(
 
     impact["cycle"] = cycle
 
-    result, *args = _should_run(impact)
+    result, *_ = _should_run(impact)
     assert result == expected
 
 
+def test_should_run_no_cycle():
+    IMPACT = {}
+    result, *_ = _should_run(IMPACT)
+    assert result is False
+
+
 PARAMS_RUN = [subfolder for subfolder, should_run in PARAMS_SHOULD_RUN if should_run]
 
 

tests/models/impact_assessment/post_checks/test_remove_cache_fields.py

@@ -0,0 +1,6 @@
+from hestia_earth.models.impact_assessment.post_checks.remove_cache_fields import run
+
+
+def test_run():
+    impact = {'cache': {}, 'added': ['cache']}
+    assert run(impact) == {'added': []}

tests/models/impact_assessment/post_checks/test_remove_no_value.py

@@ -0,0 +1,17 @@
+from hestia_earth.models.impact_assessment.post_checks.remove_no_value import run
+
+
+def test_run():
+    impacts = [
+        {'value': 10},
+        {'value': 0},
+        {'value': None},
+        {}
+    ]
+    impact = {'impacts': impacts}
+    assert run(impact) == {
+        'impacts': [
+            {'value': 10},
+            {'value': 0}
+        ]
+    }

tests/models/ipcc2019/test_organicCarbonPerHa_tier_1.py

@@ -136,7 +136,7 @@ def test_assign_ipcc_soil_category(subfolder: str, expected: IpccSoilCategory):
     with open(f"{folder}/site.jsonld", encoding='utf-8') as f:
         site = json.load(f)
 
-    result = _assign_ipcc_soil_category(site.get("measurements", []))
+    result, *_ = _assign_ipcc_soil_category(site.get("measurements", []))
     assert result == expected