From cf40c1951f4f0f26090226fb4969ca147341a031 Mon Sep 17 00:00:00 2001
From: mike <michael.jmontcalm@gmail.com>
Date: Fri, 02 Oct 2009 22:24:56 +0000
Subject: LP 439980 : Refactored the XMLSerializer to support complex components; Corrected specs for the addons properties and constructor parameters names; Moved all existing actions and events to components (except a few left in code for testing purposes)

---
(limited to 'tests/serializertests.py')

diff --git a/tests/serializertests.py b/tests/serializertests.py
index 6c25bae..c939b7a 100644
--- a/tests/serializertests.py
+++ b/tests/serializertests.py
@@ -74,9 +74,9 @@ class XMLSerializerTest(unittest.TestCase):
         self.fsm = FiniteStateMachine("testingMachine")
         
         # Add a few states
-        act1 = addon.create('BubbleMessage', message="Hi", pos=[300, 450])
+        act1 = addon.create('BubbleMessage', message="Hi", position=[300, 450])
         ev1 = addon.create('GtkWidgetEventFilter', "0.12.31.2.2", "clicked", "Second")
-        act2 = addon.create('BubbleMessage', message="Second message", pos=[250, 150], tailpos=[1,2])
+        act2 = addon.create('BubbleMessage', message="Second message", position=[250, 150], tail_pos=[1,2])
         
         st1 = State("INIT")
         st1.add_action(act1)
@@ -107,11 +107,10 @@ class XMLSerializerTest(unittest.TestCase):
     def test_save(self):
         """
         Writes an FSM to disk, then compares the file to the expected results.
-        "Remove" boolean argument specify if the test data must be removed or not
+        "Remove" boolean member specifies if the test data must be removed or not
         """
         xml_ser = XMLSerializer()
         os.makedirs(os.path.join(sugar.tutorius.bundler._get_store_root(), str(self.uuid)))
-        #rpdb2.start_embedded_debugger('flakyPass')
         xml_ser.save_fsm(self.fsm, bundler.TUTORIAL_FILENAME, os.path.join(sugar.tutorius.bundler._get_store_root(), str(self.uuid)))
 
     def test_save_and_load(self):
@@ -143,14 +142,14 @@ class XMLSerializerTest(unittest.TestCase):
         """
         st = State("INIT")
         
-        act1 = addon.create('BubbleMessage', "Hi!", pos=[10,120], tailpos=[-12,30])
-        act2 = addon.create('DialogMessage', "Hello again.", pos=[120,10])
-        act3 = WidgetIdentifyAction()
-        act4 = DisableWidgetAction("0.0.0.1.0.0.0")
-        act5 = TypeTextAction("0.0.0.1.1.1.0.0", "New text")
-        act6 = ClickAction("0.0.1.0.1.1")
-        act7 = OnceWrapper(act1)
-        act8 = ChainAction([act1, act2, act3, act4])
+        act1 = addon.create('BubbleMessage', "Hi!", position=[10,120], tail_pos=[-12,30])
+        act2 = addon.create('DialogMessage', "Hello again.", position=[120,10])
+        act3 = addon.create('WidgetIdentifyAction')
+        act4 = addon.create('DisableWidgetAction', "0.0.0.1.0.0.0")
+        act5 = addon.create('TypeTextAction', "0.0.0.1.1.1.0.0", "New text")
+        act6 = addon.create('ClickAction', "0.0.1.0.1.1")
+        act7 = addon.create('OnceWrapper', action=act1)
+        act8 = addon.create('ChainAction', actions=[act1, act2, act3, act4])
         actions = [act1, act2, act3, act4, act5, act6, act7, act8]
         
         for action in actions:
@@ -163,9 +162,9 @@ class XMLSerializerTest(unittest.TestCase):
         xml_ser = XMLSerializer()
         
         self.test_save()
-        
+
         reloaded_fsm = xml_ser.load_fsm(str(self.uuid))
-        assert self.fsm == reloaded_fsm, "Expected equivalence before saving vs after loading."
+        assert self.fsm.is_identical(reloaded_fsm), "Expected equivalence before saving vs after loading."
         
     def test_all_filters(self):
         """
@@ -173,10 +172,10 @@ class XMLSerializerTest(unittest.TestCase):
         """
         st = State("INIT")
         
-        ev1 = TimerEvent("Second", 1000)
-        ev2 = addon.create('GtkWidgetEventFilter', "Second", "0.0.1.1.0.0.1", "clicked")
-        ev3 = GtkWidgetTypeFilter("Second", "0.0.1.1.1.2.3", text="Typed stuff")
-        ev4 = GtkWidgetTypeFilter("Second", "0.0.1.1.1.2.3", strokes="acbd")
+        ev1 = addon.create('TimerEvent', "Second", 1000)
+        ev2 = addon.create('GtkWidgetEventFilter', next_state="Second", object_id="0.0.1.1.0.0.1", event_name="clicked")
+        ev3 = addon.create('GtkWidgetTypeFilter', "Second", "0.0.1.1.1.2.3", text="Typed stuff")
+        ev4 = addon.create('GtkWidgetTypeFilter', "Second", "0.0.1.1.1.2.3", strokes="acbd")
         filters = [ev1, ev2, ev3, ev4]
         
         for filter in filters:
@@ -191,7 +190,7 @@ class XMLSerializerTest(unittest.TestCase):
         
         reloaded_fsm = xml_ser.load_fsm(str(self.uuid))
 
-        assert self.fsm == reloaded_fsm, "Expected equivalence before saving vs after loading."
+        assert self.fsm.is_identical(reloaded_fsm), "Expected equivalence before saving vs after loading."
     
 if __name__ == "__main__":
     unittest.main()
--
cgit v0.9.1