LP 439980 : Adding tests for the is_identical function in the Core, on the FSM and the State

2 files changed, 15 insertions, 31 deletions

diff --git a/tutorius/core.py b/tutorius/core.py
index ff592ad..d034c30 100644
--- a/tutorius/core.py
+++ b/tutorius/core.py
@@ -90,16 +90,16 @@ class Tutorial (object):
         self.state_machine.set_state(name)
 
 
-    # Currently unused -- equivalent function is in each state
-    def _eventfilter_state_done(self, eventfilter):
-        """
-        Callback handler for eventfilter to notify
-        when we must go to the next state.
-        """
-        #XXX Tests should be run here normally
-
-        #Swith to the next state pointed by the eventfilter
-        self.set_state(eventfilter.get_next_state())
+##    # Currently unused -- equivalent function is in each state
+##    def _eventfilter_state_done(self, eventfilter):
+##        """
+##        Callback handler for eventfilter to notify
+##        when we must go to the next state.
+##        """
+##        #XXX Tests should be run here normally
+##
+##        #Swith to the next state pointed by the eventfilter
+##        self.set_state(eventfilter.get_next_state())
         
     def _prepare_activity(self):
         """
@@ -141,9 +141,6 @@ class State(object):
         
         self._actions = action_list or []
         
-        # Unused for now
-        #self.tests = []
-        
         self._event_filters = event_filter_list or []
         
         self.tutorial = tutorial
@@ -402,7 +399,7 @@ class FiniteStateMachine(State):
             # Flag the FSM level setup as done
             self._fsm_setup_done = True
             # Execute all the FSM level actions
-            for action in self.actions:
+            for action in self._actions:
                 action.do()
             
         # Then, we need to run the setup of the current state
@@ -467,7 +464,7 @@ class FiniteStateMachine(State):
             # Flag the FSM teardown as not needed anymore
             self._fsm_teardown_done = True
             # Undo all the FSM level actions here
-            for action in self.actions:
+            for action in self._actions:
                 action.undo()
 
     # TODO : It might be nice to have a start() and stop() method for the 
diff --git a/tutorius/properties.py b/tutorius/properties.py
index 7bfbad0..2afe119 100644
--- a/tutorius/properties.py
+++ b/tutorius/properties.py
@@ -101,13 +101,13 @@ class TPropContainer(object):
         the every property of the first one can be found in the other container, with
         the same name and the same value.
         
-        This is an approximation of identity because we are really looking to see 
-        if this container is at least a subset of the other.
-
         @param otherContainer The other container that we wish to test for equality.
         @returns True if every property in the first container can be found with the same
                     value and the same name in the second container.
         """
+        # Make sure both have the same number of properties
+        if len(self._props) != len(otherContainer._props):
+            return False
         # For every property in this container
         for prop in self._props.keys():
             found = False
@@ -224,19 +224,6 @@ class TAddonListProperty(TutoriusProperty):
     """
     pass
 
-    
-    def get_constraints(self):
-        """
-        Returns the list of constraints associated to this property.
-        """
-        if self._constraints is None:
-            self._constraints = []
-            for i in dir(self):
-                typ = getattr(self, i)
-                if isinstance(typ, Constraint):
-                    self._constraints.append(i)
-        return self._constraints
-
 class TIntProperty(TutoriusProperty):
     """
     Represents an integer. Can have an upper value limit and/or a lower value