fix some tests, keep write_fsm a member function in the TutorialBundler since it uses self...

3 files changed, 8 insertions, 9 deletions

diff --git a/addons/triggereventfilter.py b/addons/triggereventfilter.py
index 06c0995..6a0c2c9 100644
--- a/addons/triggereventfilter.py
+++ b/addons/triggereventfilter.py
@@ -23,8 +23,8 @@ class TriggerEventFilter(EventFilter):
     
     Used to fake events and see the effect on the FSM.
     """
-    def __init__(self, next_state):
-        EventFilter.__init__(self, next_state)
+    def __init__(self):
+        EventFilter.__init__(self)
         self.toggle_on_callback = False
     
     def install_handlers(self, callback, **kwargs):
@@ -41,6 +41,6 @@ __event__ = {
     'display_name' : 'Triggerable event filter (test only)',
     'icon' : '',
     'class' : TriggerEventFilter,
-    'mandatory_props' : ['next_state'],
+    'mandatory_props' : [],
     'test' : True
 }
diff --git a/tests/linear_creatortests.py b/tests/linear_creatortests.py
index 999f4d5..e3c30c1 100644
--- a/tests/linear_creatortests.py
+++ b/tests/linear_creatortests.py
@@ -35,11 +35,11 @@ class CreatorTests(unittest.TestCase):
         creator.action(CountAction())
         creator.action(CountAction())
         
-        creator.event(TriggerEventFilter("Not important"))
+        creator.event(TriggerEventFilter())
         
         creator.action(CountAction())
         
-        creator.event(TriggerEventFilter("Not good either..."))
+        creator.event(TriggerEventFilter())
         
         fsm = creator.generate_fsm()
         
@@ -50,13 +50,13 @@ class CreatorTests(unittest.TestCase):
         
         assert len(init_state.get_action_list()) == 2, "Creator did not insert all the actions"
         
-        assert init_state.get_event_filter_list()[0].get_next_state() == "State 1" , "expected next state to be 'State 1' but got %s" %  init_state.get_event_filter_list()[0].get_next_state()
+        assert init_state.get_event_filter_list()[0][1] == "State 1" , "expected next state to be 'State 1' but got %s" %  init_state.get_event_filter_list()[0][1]
         
         state1 = fsm.get_state_by_name("State 1")
         
         assert len(state1.get_action_list()) == 1, "Creator did not insert all the actions"
         
-        assert state1.get_event_filter_list()[0].get_next_state() == "State 2"
+        assert state1.get_event_filter_list()[0][1] == "State 2"
 
         # Make sure we have the final state and that it's empty
         state2 = fsm.get_state_by_name("State2")
diff --git a/tutorius/vault.py b/tutorius/vault.py
index 9215e8d..cc2a3f6 100644
--- a/tutorius/vault.py
+++ b/tutorius/vault.py
@@ -835,8 +835,7 @@ class TutorialBundler(object):
         raise IOError(2, "Neither the global nor the bundle directory contained the tutorial with GUID %s"%guid)
     
     
-    @staticmethod
-    def write_fsm(fsm):
+    def write_fsm(self, fsm):
 
         """
         Save fsm to disk. If a GUID parameter is provided, the existing GUID is