Update tests for model.time changes

Replace MagicMock(spec=Model) with real Model instances since mocks lack the new time attribute. Update assertions to use model.time instead of simulator.time. Add tests for time increment, step_duration, simulator attachment, and deprecation warning. Fix AgentSet constructor calls to use random= keyword argument.

Author: EwoutH

tests/test_devs.py

@@ -14,12 +14,12 @@ def test_devs_simulator():
     simulator = DEVSimulator()
 
     # setup
-    model = MagicMock(spec=Model)
+    model = Model()
     simulator.setup(model)
 
     assert len(simulator.event_list) == 0
     assert simulator.model == model
-    assert simulator.time == 0
+    assert model.time == 0.0
 
     # schedule_event_now
     fn1 = MagicMock()
@@ -43,38 +43,38 @@ def test_devs_simulator():
     simulator.run_for(0.8)
     fn1.assert_called_once()
     fn3.assert_called_once()
-    assert simulator.time == 0.8
+    assert model.time == 0.8
 
     simulator.run_for(0.2)
     fn2.assert_called_once()
-    assert simulator.time == 1.0
+    assert model.time == 1.0
 
     simulator.run_for(0.2)
-    assert simulator.time == 1.2
+    assert model.time == 1.2
 
     with pytest.raises(ValueError):
         simulator.schedule_event_absolute(fn2, 0.5)
 
     # step
     simulator = DEVSimulator()
-    model = MagicMock(spec=Model)
+    model = Model()
     simulator.setup(model)
 
     fn = MagicMock()
     simulator.schedule_event_absolute(fn, 1.0)
     simulator.run_next_event()
     fn.assert_called_once()
-    assert simulator.time == 1.0
+    assert model.time == 1.0
     simulator.run_next_event()
-    assert simulator.time == 1.0
+    assert model.time == 1.0
 
     simulator = DEVSimulator()
     with pytest.raises(Exception):
         simulator.run_next_event()
 
     # cancel_event
     simulator = DEVSimulator()
-    model = MagicMock(spec=Model)
+    model = Model()
     simulator.setup(model)
     fn = MagicMock()
     event = simulator.schedule_event_relative(fn, 0.5)
@@ -85,7 +85,6 @@ def test_devs_simulator():
     simulator.reset()
     assert len(simulator.event_list) == 0
     assert simulator.model is None
-    assert simulator.time == 0.0
 
     # run without setup
     simulator = DEVSimulator()
@@ -94,15 +93,16 @@ def test_devs_simulator():
 
     # setup with time advanced
     simulator = DEVSimulator()
-    simulator.time = simulator.start_time + 1
-    model = MagicMock(spec=Model)
-    with pytest.raises(Exception):
+    model = Model()
+    model.time = 1.0  # Advance time before setup
+    with pytest.raises(ValueError):
         simulator.setup(model)
 
     # setup with event scheduled
     simulator = DEVSimulator()
-    simulator.schedule_event_now(Mock())
-    with pytest.raises(Exception):
+    model = Model()
+    simulator.event_list.add_event(SimulationEvent(1.0, Mock(), Priority.DEFAULT))
+    with pytest.raises(ValueError):
         simulator.setup(model)
 
 
@@ -111,7 +111,7 @@ def test_abm_simulator():
     simulator = ABMSimulator()
 
     # setup
-    model = MagicMock(spec=Model)
+    model = Model()
     simulator.setup(model)
 
     # schedule_event_next_tick
@@ -120,15 +120,25 @@ def test_abm_simulator():
     assert len(simulator.event_list) == 2
 
     simulator.run_for(3)
-    assert model.step.call_count == 3
-    assert simulator.time == 3
+    assert model.steps == 3
+    assert model.time == 3.0
 
     # run without setup
     simulator = ABMSimulator()
     with pytest.raises(Exception):
         simulator.run_until(10)
 
 
+def test_simulator_time_deprecation():
+    """Test that simulator.time emits deprecation warning."""
+    simulator = DEVSimulator()
+    model = Model()
+    simulator.setup(model)
+
+    with pytest.warns(DeprecationWarning, match="simulator.time is deprecated"):
+        _ = simulator.time
+
+
 def test_simulation_event():
     """Tests for SimulationEvent class."""
     some_test_function = MagicMock()

tests/test_model.py

@@ -3,6 +3,7 @@
 import numpy as np
 
 from mesa.agent import Agent, AgentSet
+from mesa.experimental.devs.simulator import DEVSimulator
 from mesa.model import Model
 
 
@@ -11,24 +12,80 @@ def test_model_set_up():
     model = Model()
     assert model.running is True
     assert model.steps == 0
+    assert model.time == 0.0
+    assert model.step_duration == 1.0
+    assert model._simulator is None
+
+    model.step()
+    assert model.steps == 1
+    assert model.time == 1.0
+
+
+def test_model_time_increment():
+    """Test that time increments correctly with steps."""
+    model = Model()
+
+    for i in range(5):
+        model.step()
+        assert model.steps == i + 1
+        assert model.time == float(i + 1)
+
+
+def test_model_step_duration():
+    """Test custom step_duration."""
+    # Default step_duration
+    model = Model()
+    model.step()
+    assert model.time == 1.0
+
+    # Custom step_duration
+    model = Model(step_duration=0.25)
+    assert model.step_duration == 0.25
+
     model.step()
     assert model.steps == 1
+    assert model.time == 0.25
+
+    model.step()
+    assert model.steps == 2
+    assert model.time == 0.5
+
+    # Larger step_duration
+    model = Model(step_duration=10.0)
+    model.step()
+    assert model.time == 10.0
+    model.step()
+    assert model.time == 20.0
+
+
+def test_model_time_with_simulator():
+    """Test that simulator controls time when attached."""
+    model = Model()
+    simulator = DEVSimulator()
+    simulator.setup(model)
+
+    # Simulator is now attached
+    assert model._simulator is simulator
+
+    # Time should not auto-increment when simulator is attached
+    # (In practice, the simulator controls stepping, but we can test the flag)
+    model._user_step()  # Call user step directly to avoid wrapped_step
+    # Time unchanged because simulator controls it
 
 
 def test_running():
     """Test Model is running."""
 
     class TestModel(Model):
-        steps = 0
-
         def step(self):
-            """Increase steps until 10."""
+            """Stop at step 10."""
             if self.steps == 10:
                 self.running = False
 
     model = TestModel()
     model.run_model()
     assert model.steps == 10
+    assert model.time == 10.0
 
 
 def test_seed(seed=23):
@@ -78,7 +135,7 @@ def test_reset_rng(newseed=42):
 
 
 def test_agent_types():
-    """Test Mode.agent_types property."""
+    """Test Model.agent_types property."""
 
     class TestAgent(Agent):
         pass
@@ -102,8 +159,8 @@ class Sheep(Agent):
     wolf = Wolf(model)
     sheep = Sheep(model)
 
-    assert model.agents_by_type[Wolf] == AgentSet([wolf], model)
-    assert model.agents_by_type[Sheep] == AgentSet([sheep], model)
+    assert model.agents_by_type[Wolf] == AgentSet([wolf], random=model.random)
+    assert model.agents_by_type[Sheep] == AgentSet([sheep], random=model.random)
     assert len(model.agents_by_type) == 2