Merge pull request #121 from wang-boyu/refactor/test-mocks

test: consolidate and reuse test fixtures in conftest files

Author: wang-boyu

tests/conftest.py

@@ -18,20 +18,13 @@
 }
 
 
-class MockCell:
-    """Mock cell with coordinate attribute"""
-
-    def __init__(self, coordinate):
-        self.coordinate = coordinate
-
-
 @pytest.fixture(autouse=True)
 def mock_environment():
     """Ensure tests don't depend on real environment variables"""
     with patch.dict(
         os.environ,
         {
-            "GEMINI_API_KEY": "dummy",
+            "GEMINI_API_KEY": "test_gemini_key",
             "PROVIDER_API_KEY": "test_key",
             "OPENAI_API_KEY": "test_openai_key",
         },

tests/test_async_memory.py

@@ -8,6 +8,7 @@
 from mesa_llm.llm_agent import LLMAgent
 from mesa_llm.parallel_stepping import step_agents_parallel
 from mesa_llm.reasoning.reasoning import Reasoning
+from tests.conftest import build_llm_response
 
 logger = logging.getLogger(__name__)
 
@@ -53,10 +54,7 @@ async def test_parallel_memory_consolidation(self, mock_agenerate):
 
         async def slow_response(*args, **kwargs):
             await asyncio.sleep(1)
-            mock_resp = MagicMock()
-            mock_resp.choices = [MagicMock()]
-            mock_resp.choices[0].message.content = "summary"
-            return mock_resp
+            return build_llm_response(content="summary")
 
         mock_agenerate.side_effect = slow_response
 

tests/test_llm_agent.py

@@ -14,8 +14,6 @@
 
 
 def test_apply_plan_adds_to_memory(monkeypatch):
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
-
     class DummyModel(Model):
         def __init__(self):
             super().__init__(seed=42)
@@ -70,8 +68,6 @@ def add_agent(self, pos):
 
 
 def test_generate_obs_with_one_neighbor(monkeypatch):
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
-
     class DummyModel(Model):
         def __init__(self):
             super().__init__(seed=45)
@@ -128,8 +124,6 @@ def add_agent(self, pos, agent_class=LLMAgent):
 
 
 def test_send_message_updates_both_agents_memory(monkeypatch):
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
-
     class DummyModel(Model):
         def __init__(self):
             super().__init__(seed=45)
@@ -187,8 +181,6 @@ def fake_add_to_memory(*args, **kwargs):
 
 @pytest.mark.asyncio
 async def test_aapply_plan_adds_to_memory(monkeypatch):
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
-
     class DummyModel(Model):
         def __init__(self):
             super().__init__(seed=42)
@@ -236,8 +228,6 @@ async def fake_acall_tools(agent, llm_response):
 
 @pytest.mark.asyncio
 async def test_agenerate_obs_with_one_neighbor(monkeypatch):
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
-
     class DummyModel(Model):
         def __init__(self):
             super().__init__(seed=45)
@@ -285,8 +275,6 @@ async def fake_aadd_to_memory(*args, **kwargs):
 
 @pytest.mark.asyncio
 async def test_async_wrapper_calls_pre_and_post(monkeypatch):
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
-
     class CustomAgent(LLMAgent):
         async def astep(self):
             self.user_called = True
@@ -350,7 +338,6 @@ def _make_agent(model, vision=0, internal_state=None):
 
 def test_safer_cell_access_agent_with_cell_no_pos(monkeypatch):
     """Agent location falls back to cell.coordinate when pos=None."""
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
     model = Model(seed=42)
     agent = _make_agent(model)
     agent.pos = None
@@ -364,7 +351,6 @@ def test_safer_cell_access_agent_with_cell_no_pos(monkeypatch):
 
 def test_safer_cell_access_agent_without_cell_or_pos(monkeypatch):
     """Agent location returns None gracefully when neither pos nor cell exists."""
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
     model = Model(seed=42)
     agent = _make_agent(model)
     agent.pos = None
@@ -379,7 +365,6 @@ def test_safer_cell_access_agent_without_cell_or_pos(monkeypatch):
 
 def test_safer_cell_access_neighbor_with_cell_no_pos(monkeypatch):
     """Neighbor position uses cell.coordinate when neighbor.pos=None."""
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
 
     class GridModel(Model):
         def __init__(self):
@@ -413,7 +398,6 @@ def __init__(self):
 
 def test_safer_cell_access_neighbor_without_cell_or_pos(monkeypatch):
     """Neighbor position returns None when neighbor has neither pos nor cell."""
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
 
     class GridModel(Model):
         def __init__(self):
@@ -448,7 +432,6 @@ def __init__(self):
 
 def test_generate_obs_with_continuous_space(monkeypatch):
     """Agents within vision radius are included; those outside are not."""
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
 
     class ContModel(Model):
         def __init__(self):
@@ -485,7 +468,6 @@ def __init__(self):
 
 def test_generate_obs_vision_all_agents(monkeypatch):
     """vision=-1 returns all other agents regardless of position."""
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
 
     class GridModel(Model):
         def __init__(self):
@@ -519,7 +501,6 @@ def __init__(self):
 
 def test_generate_obs_no_grid_with_vision(monkeypatch):
     """When the model has no grid/space, generate_obs falls back to empty neighbors."""
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
     model = Model(seed=42)  # no grid, no space
     agents = LLMAgent.create_agents(
         model,
@@ -549,7 +530,6 @@ def test_generate_obs_standard_grid_with_vision_radius(monkeypatch):
     - The observation includes nearby agents in local_state.
     - The SingleGrid neighbor lookup branch is executed.
     """
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
 
     class GridModel(Model):
         def __init__(self):
@@ -585,7 +565,6 @@ def test_generate_obs_orthogonal_grid_branches(monkeypatch):
     Covers Orthogonal grid-specific branches including
     cell-based lookup and fallback behavior.
     """
-    monkeypatch.setenv("GEMINI_API_KEY", "dummy")
 
     class OrthoModel(Model):
         def __init__(self):

tests/test_memory/conftest.py

@@ -0,0 +1,13 @@
+import pytest
+
+
+@pytest.fixture
+def episodic_mock_agent(mock_agent, llm_response_factory):
+    """Create an episodic-memory-specific variant of the shared mock agent."""
+    agent = mock_agent
+
+    agent.llm.generate.return_value = llm_response_factory(content='{"grade": 3}')
+
+    agent.model.steps = 100
+    agent.model.events = []
+    return agent