fix: SCXML Parsing of if/else element

Author: fgmacedo

statemachine/io/scxml.py

@@ -122,19 +122,23 @@ def parse_if(element):  # noqa: C901
             # Save the current branch before starting a new one
             if current_cond is not None:
                 branches.append((current_cond, current_actions))
-            elif tag == "else":
-                else_branch = current_actions
 
             # Update for the new branch
-            current_cond = _normalize_cond(child.attrib.get("cond"))
-            current_actions = []
+            if tag == "elseif":
+                current_cond = _normalize_cond(child.attrib.get("cond"))
+                current_actions = []
+            elif tag == "else":
+                current_cond = None
+                current_actions = else_branch  # Start collecting actions for else
         else:
             # Add the action to the current branch
             current_actions.append(parse_element(child))
 
     # Add the last branch if needed
     if current_cond is not None:
         branches.append((current_cond, current_actions))
+    else:
+        else_branch = current_actions
 
     def if_action(*args, **kwargs):
         machine = kwargs["machine"]

statemachine/statemachine.py

@@ -316,4 +316,4 @@ def send(self, event: str, *args, **kwargs):
 
     @property
     def is_terminated(self):
-        return self._engine.is_terminated
+        return not self._engine._running

tests/test_multiple_destinations.py

@@ -153,6 +153,8 @@ def on_validate(self):
     # then
     assert machine.completed.is_active
 
+    assert machine.is_terminated
+
     with pytest.raises(exceptions.TransitionNotAllowed, match="Can't validate when in Completed."):
         assert machine.validate()
 

tests/w3c_tests/test_testcases.py

@@ -2,11 +2,21 @@
 
 """
 Test cases as defined by W3C SCXML Test Suite
-"""
+
+- https://www.w3.org/Voice/2013/scxml-irp/
+- https://alexzhornyak.github.io/SCXML-tutorial/Tests/ecma/W3C/Mandatory/Auto/report__USCXML_2_0_0___msvc2015_32bit__Win7_1.html
+- https://github.com/alexzhornyak/PyBlendSCXML/tree/master/w3c_tests
+- https://github.com/jbeard4/SCION/wiki/Pseudocode-for-SCION-step-algorithm
+
+"""  # noqa: E501
 
 
 def test_usecase(testcase_path, sm_class):
-    # sm._graph().write_png(f"{testcase_path.name}.png")
+    # from statemachine.contrib.diagram import DotGraphMachine
+
+    # DotGraphMachine(sm_class).get_graph().write_png(
+    #     testcase_path.parent / f"{testcase_path.stem}.png"
+    # )
     sm = sm_class()
     assert isinstance(sm, StateMachine)
     assert sm.current_state.id == "pass"