Animal - Feature/multi grid occupancy

tests/models/animals/conftest.py

@@ -153,7 +153,7 @@ def functional_group_list_instance(shared_datadir, constants_instance):
 
 @pytest.fixture
 def animal_model_instance(
-    data_instance,
+    animal_data_for_community_instance,
     fixture_core_components,
     functional_group_list_instance,
     constants_instance,
@@ -163,7 +163,7 @@ def animal_model_instance(
     from virtual_ecosystem.models.animal.animal_model import AnimalModel
 
     return AnimalModel(
-        data=data_instance,
+        data=animal_data_for_community_instance,
         core_components=fixture_core_components,
         functional_groups=functional_group_list_instance,
         model_constants=constants_instance,
@@ -185,7 +185,7 @@ def animal_community_instance(
         data=animal_data_for_community_instance,
         community_key=4,
         neighbouring_keys=[1, 3, 5, 7],
-        get_destination=animal_model_instance.get_community_by_key,
+        get_community_by_key=animal_model_instance.get_community_by_key,
         constants=constants_instance,
     )
 
@@ -204,12 +204,19 @@ def herbivore_functional_group_instance(shared_datadir, constants_instance):
 
 
 @pytest.fixture
-def herbivore_cohort_instance(herbivore_functional_group_instance, constants_instance):
+def herbivore_cohort_instance(
+    herbivore_functional_group_instance, animal_territory_instance, constants_instance
+):
     """Fixture for an animal cohort used in tests."""
     from virtual_ecosystem.models.animal.animal_cohorts import AnimalCohort
 
     return AnimalCohort(
-        herbivore_functional_group_instance, 10000.0, 1, 10, constants_instance
+        herbivore_functional_group_instance,
+        10000.0,
+        1,
+        10,
+        animal_territory_instance,
+        constants_instance,
     )
 
 
@@ -228,13 +235,18 @@ def caterpillar_functional_group_instance(shared_datadir, constants_instance):
 
 @pytest.fixture
 def caterpillar_cohort_instance(
-    caterpillar_functional_group_instance, constants_instance
+    caterpillar_functional_group_instance, animal_territory_instance, constants_instance
 ):
     """Fixture for an animal cohort used in tests."""
     from virtual_ecosystem.models.animal.animal_cohorts import AnimalCohort
 
     return AnimalCohort(
-        caterpillar_functional_group_instance, 1.0, 1, 100, constants_instance
+        caterpillar_functional_group_instance,
+        1.0,
+        1,
+        100,
+        animal_territory_instance,
+        constants_instance,
     )
 
 
@@ -252,12 +264,19 @@ def butterfly_functional_group_instance(shared_datadir, constants_instance):
 
 
 @pytest.fixture
-def butterfly_cohort_instance(butterfly_functional_group_instance, constants_instance):
+def butterfly_cohort_instance(
+    butterfly_functional_group_instance, animal_territory_instance, constants_instance
+):
     """Fixture for an animal cohort used in tests."""
     from virtual_ecosystem.models.animal.animal_cohorts import AnimalCohort
 
     return AnimalCohort(
-        butterfly_functional_group_instance, 1.0, 1, 100, constants_instance
+        butterfly_functional_group_instance,
+        1.0,
+        1,
+        100,
+        animal_territory_instance,
+        constants_instance,
     )
 
 
@@ -293,13 +312,50 @@ def plant_list_instance(plant_data_instance, constants_instance):
 
 
 @pytest.fixture
-def animal_list_instance(herbivore_functional_group_instance, constants_instance):
+def animal_list_instance(
+    herbivore_functional_group_instance, animal_territory_instance, constants_instance
+):
     """Fixture providing a list of animal cohorts."""
     from virtual_ecosystem.models.animal.animal_cohorts import AnimalCohort
 
     return [
         AnimalCohort(
-            herbivore_functional_group_instance, 10000.0, 1, 10, constants_instance
+            herbivore_functional_group_instance,
+            10000.0,
+            1,
+            10,
+            animal_territory_instance,
+            constants_instance,
         )
         for idx in range(3)
     ]
+
+
+@pytest.fixture
+def get_community_by_key(animal_community_instance):
+    """Fixture for get_community_by_key."""
+
+    def _get_community_by_key(key):
+        return animal_community_instance
+
+    return _get_community_by_key
+
+
+@pytest.fixture
+def animal_territory_instance(get_community_by_key):
+    """Fixture for animal territories."""
+    from virtual_ecosystem.models.animal.animal_territories import AnimalTerritory
+
+    return AnimalTerritory(
+        centroid=0,
+        grid_cell_keys=[1, 2, 3],
+        get_community_by_key=get_community_by_key,
+    )
+
+
+@pytest.fixture
+def carcass_pool_instance():
+    """Fixture for an carcass pool used in tests."""
+    from virtual_ecosystem.models.animal.decay import CarcassPool
+
+    return CarcassPool(0.0, 0.0)