refactor(tests): migrate remaining test files from StateMachine to StateChart

Migrate 18 test files to use StateChart as base class. For tests that
depend on StateMachine-specific behavior (TransitionNotAllowed, error
propagation), explicit flags are added (allow_event_without_transition=False,
error_on_execution=False).

Author: fgmacedo

tests/examples/statechart_error_handling_machine.py

@@ -78,16 +78,16 @@ def on_enter_recovering(self, error=None, **kwargs):
 
 
 # %%
-# Comparison with StateMachine (error propagation)
-# --------------------------------------------------
+# Comparison with error_on_execution=False (error propagation)
+# --------------------------------------------------------------
 #
-# With ``StateMachine`` (where ``error_on_execution=False``), the same error
+# With ``error_on_execution=False``, the same error
 # would propagate as an exception instead of being caught.
 
-from statemachine import StateMachine  # noqa: E402
 
+class QuestNoCatch(StateChart):
+    error_on_execution = False
 
-class QuestNoCatch(StateMachine):
     safe = State("Safe", initial=True)
     danger_zone = State("Danger Zone")
 

tests/test_callbacks.py

@@ -9,7 +9,7 @@
 from statemachine.exceptions import InvalidDefinition
 
 from statemachine import State
-from statemachine import StateMachine
+from statemachine import StateChart
 
 
 @pytest.fixture()
@@ -166,7 +166,7 @@ def race_uppercase(race):
         assert race_uppercase("Hobbit") == "HOBBIT"
 
     def test_decorate_unbounded_machine_methods(self):
-        class MiniHeroJourneyMachine(StateMachine, strict_states=False):
+        class MiniHeroJourneyMachine(StateChart, strict_states=False):
             ordinary_world = State(initial=True)
             call_to_adventure = State(final=True)
             refusal_of_call = State(final=True)
@@ -222,7 +222,7 @@ class TestIssue406:
     def test_issue_406(self, mocker):
         mock = mocker.Mock()
 
-        class ExampleStateMachine(StateMachine, strict_states=False):
+        class ExampleStateMachine(StateChart, strict_states=False):
             created = State(initial=True)
             inited = State(final=True)
 
@@ -277,7 +277,10 @@ def can_be_started_as_property_str_on_model(self) -> bool:
 
     @pytest.fixture()
     def sm_class(self, model_class, mock_calls):
-        class ExampleStateMachine(StateMachine):
+        class ExampleStateMachine(StateChart):
+            allow_event_without_transition = False
+            error_on_execution = False
+
             created = State(initial=True)
             started = State(final=True)
 
@@ -336,7 +339,9 @@ class StrangeObject:
             def this_cannot_resolve(self) -> bool:
                 return True
 
-        class ExampleStateMachine(StateMachine):
+        class ExampleStateMachine(StateChart):
+            error_on_execution = False
+
             created = State(initial=True)
             started = State(final=True)
             start = created.to(started, cond=[StrangeObject.this_cannot_resolve])

tests/test_callbacks_isolation.py

@@ -1,12 +1,12 @@
 import pytest
 
 from statemachine import State
-from statemachine import StateMachine
+from statemachine import StateChart
 
 
 @pytest.fixture()
 def simple_sm_cls():
-    class TestStateMachine(StateMachine):
+    class TestStateMachine(StateChart):
         allow_event_without_transition = True
 
         # States

tests/test_conditions_algebra.py

@@ -2,10 +2,13 @@
 from statemachine.exceptions import InvalidDefinition
 
 from statemachine import State
-from statemachine import StateMachine
+from statemachine import StateChart
 
 
-class AnyConditionSM(StateMachine):
+class AnyConditionSM(StateChart):
+    allow_event_without_transition = False
+    error_on_execution = False
+
     start = State(initial=True)
     end = State(final=True)
 
@@ -20,25 +23,25 @@ def test_conditions_algebra_any_false():
     with pytest.raises(sm.TransitionNotAllowed):
         sm.submit()
 
-    assert sm.current_state == sm.start
+    assert sm.start.is_active
 
 
 def test_conditions_algebra_any_left_true():
     sm = AnyConditionSM()
     sm.used_money = True
     sm.submit()
-    assert sm.current_state == sm.end
+    assert sm.end.is_active
 
 
 def test_conditions_algebra_any_right_true():
     sm = AnyConditionSM()
     sm.used_credit = True
     sm.submit()
-    assert sm.current_state == sm.end
+    assert sm.end.is_active
 
 
 def test_should_raise_invalid_definition_if_cond_is_not_valid_sintax():
-    class AnyConditionSM(StateMachine):
+    class AnyConditionSM(StateChart):
         start = State(initial=True)
         end = State(final=True)
 
@@ -52,7 +55,7 @@ class AnyConditionSM(StateMachine):
 
 
 def test_should_raise_invalid_definition_if_cond_is_not_found():
-    class AnyConditionSM(StateMachine):
+    class AnyConditionSM(StateChart):
         start = State(initial=True)
         end = State(final=True)
 

tests/test_dispatcher.py

@@ -6,7 +6,7 @@
 from statemachine.dispatcher import resolver_factory_from_objects
 from statemachine.exceptions import InvalidDefinition
 from statemachine.state import State
-from statemachine.statemachine import StateMachine
+from statemachine.statemachine import StateChart
 
 
 def _take_first_callable(iterable):
@@ -150,7 +150,9 @@ class StrangeObject:
             def can_change_to_start(self):
                 return False
 
-        class StartMachine(StateMachine):
+        class StartMachine(StateChart):
+            error_on_execution = False
+
             created = State(initial=True)
             started = State(final=True)
 

tests/test_events.py

@@ -3,11 +3,11 @@
 from statemachine.exceptions import InvalidDefinition
 
 from statemachine import State
-from statemachine import StateMachine
+from statemachine import StateChart
 
 
 def test_assign_events_on_transitions():
-    class TrafficLightMachine(StateMachine):
+    class TrafficLightMachine(StateChart):
         "A traffic light machine"
 
         green = State(initial=True)
@@ -34,7 +34,7 @@ def on_cycle(self, event_data, event: str):
 
 class TestExplicitEvent:
     def test_accept_event_instance(self):
-        class StartMachine(StateMachine):
+        class StartMachine(StateChart):
             created = State(initial=True)
             started = State(final=True)
 
@@ -46,10 +46,10 @@ class StartMachine(StateMachine):
 
         sm = StartMachine()
         sm.send("start")
-        assert sm.current_state == sm.started
+        assert sm.started.is_active
 
     def test_accept_event_name(self):
-        class StartMachine(StateMachine):
+        class StartMachine(StateChart):
             created = State(initial=True)
             started = State(final=True)
 
@@ -60,7 +60,7 @@ class StartMachine(StateMachine):
         assert StartMachine.start.name == "Start the machine"
 
     def test_derive_name_from_id(self):
-        class StartMachine(StateMachine):
+        class StartMachine(StateChart):
             created = State(initial=True)
             started = State(final=True)
 
@@ -74,7 +74,7 @@ class StartMachine(StateMachine):
         assert StartMachine.launch_the_machine == StartMachine.launch_the_machine.id
 
     def test_not_derive_name_from_id_if_not_event_class(self):
-        class StartMachine(StateMachine):
+        class StartMachine(StateChart):
             created = State(initial=True)
             started = State(final=True)
 
@@ -90,7 +90,7 @@ class StartMachine(StateMachine):
     def test_raise_invalid_definition_if_event_name_cannot_be_derived(self):
         with pytest.raises(InvalidDefinition, match="has no id"):
 
-            class StartMachine(StateMachine):
+            class StartMachine(StateChart):
                 created = State(initial=True)
                 started = State()
 
@@ -99,7 +99,7 @@ class StartMachine(StateMachine):
                 started.to.itself(event=Event())  # event id not defined
 
     def test_derive_from_id(self):
-        class StartMachine(StateMachine):
+        class StartMachine(StateChart):
             created = State(initial=True)
             started = State()
 
@@ -108,7 +108,7 @@ class StartMachine(StateMachine):
         assert StartMachine.launch_rocket.name == "Launch rocket"
 
     def test_of_passing_event_as_parameters(self):
-        class TrafficLightMachine(StateMachine):
+        class TrafficLightMachine(StateChart):
             "A traffic light machine"
 
             green = State(initial=True)
@@ -142,7 +142,7 @@ def on_cycle(self, event_data, event: str):
         assert sm.go.name == "Go! Go! Go!"
 
     def test_mixing_event_and_parameters(self):
-        class TrafficLightMachine(StateMachine):
+        class TrafficLightMachine(StateChart):
             "A traffic light machine"
 
             green = State(initial=True)
@@ -174,7 +174,7 @@ def on_cycle(self, event_data, event: str):
         assert sm.go.name == "Go! Go! Go!"
 
     def test_name_derived_from_identifier(self):
-        class TrafficLightMachine(StateMachine):
+        class TrafficLightMachine(StateChart):
             "A traffic light machine"
 
             green = State(initial=True)
@@ -205,7 +205,7 @@ def on_cycle(self, event_data, event: str):
         assert sm.go.name == "go"
 
     def test_multiple_ids_from_the_same_event_will_be_converted_to_multiple_events(self):
-        class TrafficLightMachine(StateMachine):
+        class TrafficLightMachine(StateChart):
             "A traffic light machine"
 
             green = State(initial=True)
@@ -234,7 +234,7 @@ def on_cycle(self, event_data, event: str):
         assert sm.send("cycle") == "Running cycle from red to green"
 
     def test_allow_registering_callbacks_using_decorator(self):
-        class TrafficLightMachine(StateMachine):
+        class TrafficLightMachine(StateChart):
             "A traffic light machine"
 
             green = State(initial=True)
@@ -263,7 +263,7 @@ def do_cycle(self, event_data, event: str):
     def test_raise_registering_callbacks_using_decorator_if_no_transitions(self):
         with pytest.raises(InvalidDefinition, match="event with no transitions"):
 
-            class TrafficLightMachine(StateMachine):
+            class TrafficLightMachine(StateChart):
                 "A traffic light machine"
 
                 green = State(initial=True)
@@ -285,7 +285,7 @@ def do_cycle(self, event_data, event: str):
                     )
 
     def test_allow_using_events_as_commands(self):
-        class StartMachine(StateMachine):
+        class StartMachine(StateChart):
             created = State(initial=True)
             started = State()
 
@@ -299,7 +299,7 @@ class StartMachine(StateMachine):
         assert sm.started.is_active
 
     def test_event_commands_fail_when_unbound_to_instance(self):
-        class StartMachine(StateMachine):
+        class StartMachine(StateChart):
             created = State(initial=True)
             started = State()
 

tests/test_listener.py

@@ -1,5 +1,5 @@
 from statemachine.state import State
-from statemachine.statemachine import StateMachine
+from statemachine.statemachine import StateChart
 
 EXPECTED_LOG_ADD = """Frodo on: draft--(add_job)-->draft
 Frodo enter: draft from add_job
@@ -62,7 +62,7 @@ class TestListener:
         def __init__(self):
             pass
 
-    class MyMachine(StateMachine):
+    class MyMachine(StateChart):
         first = State("FIRST", initial=True)
 
         second = State("SECOND")

tests/test_mixins.py

@@ -12,7 +12,7 @@ def test_mixin_should_instantiate_a_machine(campaign_machine):
     model = MyMixedModel(state="draft")
     assert isinstance(model.statemachine, campaign_machine)
     assert model.state == "draft"
-    assert model.statemachine.current_state == model.statemachine.draft
+    assert model.statemachine.draft.is_active
 
 
 def test_mixin_should_raise_exception_if_machine_class_does_not_exist():

tests/test_mock_compatibility.py

@@ -1,5 +1,5 @@
 from statemachine import State
-from statemachine import StateMachine
+from statemachine import StateChart
 
 
 def test_minimal(mocker):
@@ -9,7 +9,7 @@ def on_enter_state(self, event, model, source, target, state): ...
     obs = Observer()
     on_enter_state = mocker.spy(obs, "on_enter_state")
 
-    class Machine(StateMachine):
+    class Machine(StateChart):
         a = State("Init", initial=True)
         b = State("Fin")