Added Post Actions with first test (#9)

* Added Post Actions with first test

Author: ZigRazor

sample/sample4.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<x:States xmlns:x="pystatemachine:sm">
+    <State>
+        <Name>Enter</Name>
+        <Event>
+            <Name>ToExit</Name>
+            <ToState>Exit</ToState>
+            <PreConditions>
+                <Condition>
+                    <Expression>testBaseStateMachine.everFalse</Expression>
+                    <Result>False</Result>
+                </Condition>
+                <Condition>
+                    <Expression>testBaseStateMachine.test</Expression>
+                    <Result>2</Result>
+                </Condition>
+            </PreConditions>            
+            <PreActions>
+                <Action>
+                    <Expression>testBaseStateMachine.testPrint</Expression>
+                </Action>
+            </PreActions>
+        </Event>
+    </State>
+    <State>
+        <Name>Exit</Name>
+        <Event>
+            <Name>ToNull</Name>
+            <ToState>Null</ToState>
+            <PreConditions>
+                <Condition>
+                    <Expression>testBaseStateMachine.everTrue</Expression>
+                    <Result>True</Result>
+                </Condition>
+            </PreConditions>            
+            <PostActions>
+                <Action>
+                    <Expression>testBaseStateMachine.testPrint</Expression>
+                </Action>
+            </PostActions>
+        </Event>
+    </State>
+    <State>
+        <Name>Null</Name>
+        <Event>
+            <Name>ToNull</Name>
+            <ToState>Null</ToState>
+            <PostActions>
+                <Action>
+                    <Expression>testBaseStateMachine.testPrint</Expression>
+                </Action>
+            </PostActions>
+        </Event>
+    </State>
+    <Initial_State>Enter</Initial_State>
+</x:States>

src/ReadStateMachine.py

@@ -81,10 +81,18 @@ def ReadStateMachineFile(xml_file : str):
 
                         elif event_child.tag == "PostActions":
                             # State->Event->PostActions Element
+                            post_action_elements = []
                             for postactions_child in event_child:
                                 #print(postactions_child.text)
                                 # State->Event->PostActions->Action Element
-                                None
+                                if postactions_child.tag == "Action":
+                                    expression = ""                                   
+                                    for action_child in postactions_child:
+                                        if action_child.tag == "Expression":
+                                            expression = action_child.text
+                                    post_action_elements.append(Action(expression))
+                            post_actions = Actions(pre_action_elements)
+                            
                     events[event_name] = Event(event_name,to_state,pre_conditions,post_conditions,pre_actions,post_actions)
                     #print(event.to_string())
                 elif state_child.tag == "Name":

src/StateMachine.py

@@ -79,11 +79,19 @@ def InjectEvent(self, event : str):
                 ## Preactions
                 all_pre_actions_executed = self.__ExecActions(handled_event.pre_actions)
                 if(all_pre_actions_executed):
+                    ## Save Old State
                     ## Transition
                     logging.debug("Transition %s ------> %s", self.current_state, handled_event.to_state)
                     self.current_state = handled_event.to_state
                     ## Postactions
-                    ## Postconditions
+                    all_post_actions_executed = self.__ExecActions(handled_event.post_actions)
+                    if(all_post_actions_executed):
+                        None
+                        ## Postconditions
+                    else:
+                        logging.error("Not all PostActions Executed")
+                else:
+                    logging.error("Not all PretActions Executed")                    
             else:
                 logging.error("Not all PreConditions satisfied")
         else:

tests/testBaseStateMachine.py

@@ -9,6 +9,9 @@
 def everFalse():
     return False
 
+def everTrue():
+    return True
+
 def testPrint():
     print("Test")
 
@@ -92,6 +95,34 @@ def test3(self):
         sm.InjectEvent("ToNull")
         self.assertEqual(sm.get_current_state(),"Exit", "Should be Exit")
 
+    def test4(self):
+        sm = StateMachine("../sample/sample4.xml")
+
+        sm.LoadStateMachine()
+
+        sm.addVariableToContext("testBaseStateMachine", "everFalse")
+        sm.addVariableToContext("testBaseStateMachine", "everTrue")
+        sm.addVariableToContext("testBaseStateMachine", "test")
+        sm.addVariableToContext("testBaseStateMachine", "testPrint")
+    
+        self.assertEqual(sm.get_current_state(),"Enter", "Should be Enter")
+        # Precondition Verified / Execute PreAction
+        sm.InjectEvent("ToExit")
+        self.assertEqual(sm.get_current_state(),"Exit", "Should be Exit")
+        # Not Valid Event
+        sm.InjectEvent("ToExit")
+        self.assertEqual(sm.get_current_state(),"Exit", "Should be Exit")
+        
+        # Precondition Verified /Execute Post Action
+        sm.InjectEvent("ToNull")
+        self.assertEqual(sm.get_current_state(),"Null", "Should be Null")
+        # Not Valid Event
+        sm.InjectEvent("ToExit")
+        self.assertEqual(sm.get_current_state(),"Null", "Should be Null")
+        # Precondition Verified /Execute Post Action
+        sm.InjectEvent("ToNull")
+        self.assertEqual(sm.get_current_state(),"Null", "Should be Null")
+
 
 
 if __name__ == '__main__':