diff options
author | Vincent Vinet <vince.vinet@gmail.com> | 2009-12-04 05:06:49 (GMT) |
---|---|---|
committer | Vincent Vinet <vince.vinet@gmail.com> | 2009-12-06 04:06:40 (GMT) |
commit | 8acd9095e8f32ee20a6c4cd105d12a133fa9f346 (patch) | |
tree | ec24b60f26bde5eaf92c8bb8495deb733ab2cb69 /tests/vaulttests.py | |
parent | 3550e7a3feac8726e4747457e14932e6010b397b (diff) |
Add Event Sources:event_sources
- Add source property in Action and EventFilter
- Change TPropContainer contructor to accept keyword arguments and set
properties that were given
- Change every single TPropContainer subclass constructor to accept
kwargs and pass them on to super init
- Add a "null" option for TStringProperty
Use Event Sources:
- Make the probe require a source property to install or subscribe
- Have ProbeProxy install and subscribe return a prefixed address
- Make update, uninstall and unsubsribe extract the prefix from the
address
- Have the TutorialRunner set a source on actions/events before
installing/subscribing instead of setting current activity on
ProbeManager
Test Event Sources:
- Change the tests according to the new constructors and behaviors
Diffstat (limited to 'tests/vaulttests.py')
-rw-r--r-- | tests/vaulttests.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/vaulttests.py b/tests/vaulttests.py index 729d36d..1e39d8c 100644 --- a/tests/vaulttests.py +++ b/tests/vaulttests.py @@ -106,7 +106,7 @@ class VaultInterfaceTest(unittest.TestCase): self.fsm = Tutorial("TestTutorial1") # Add a few states act1 = addon.create('BubbleMessage', message="Hi", position=[300, 450]) - ev1 = addon.create('GtkWidgetEventFilter', "0.12.31.2.2", "clicked") + ev1 = addon.create('GtkWidgetEventFilter', object_id="0.12.31.2.2", event_name="clicked") act2 = addon.create('BubbleMessage', message="Second message", position=[250, 150], tail_pos=[1,2]) self.fsm.add_action("INIT", act1) st2 = self.fsm.add_state((act2,)) @@ -487,7 +487,7 @@ class XMLSerializerTest(unittest.TestCase): # Add a few states act1 = addon.create('BubbleMessage', message="Hi", position=[300, 450]) - ev1 = addon.create('GtkWidgetEventFilter', "0.12.31.2.2", "clicked") + ev1 = addon.create('GtkWidgetEventFilter', object_id="0.12.31.2.2", event_name="clicked") act2 = addon.create('BubbleMessage', message="Second message", position=[250, 150], tail_pos=[1,2]) self.fsm.add_action("INIT",act1) @@ -535,12 +535,12 @@ class XMLSerializerTest(unittest.TestCase): """ fsm = Tutorial("TestActions") tuto_file = cStringIO.StringIO() - act1 = addon.create('BubbleMessage', "Hi!", position=[10,120], tail_pos=[-12,30]) - act2 = addon.create('DialogMessage', "Hello again.", position=[120,10]) + act1 = addon.create('BubbleMessage', message="Hi!", position=[10,120], tail_pos=[-12,30]) + act2 = addon.create('DialogMessage', message="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") + act4 = addon.create('DisableWidgetAction', target="0.0.0.1.0.0.0") + act5 = addon.create('TypeTextAction', widget="0.0.0.1.1.1.0.0", text="New text") + act6 = addon.create('ClickAction', widget="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] @@ -565,10 +565,10 @@ class XMLSerializerTest(unittest.TestCase): fsm = Tutorial("TestFilters") tuto_file = cStringIO.StringIO() - ev1 = addon.create('TimerEvent', 1000) + ev1 = addon.create('TimerEvent', timeout=1000) ev2 = addon.create('GtkWidgetEventFilter', object_id="0.0.1.1.0.0.1", event_name="clicked") - ev3 = addon.create('GtkWidgetTypeFilter', "0.0.1.1.1.2.3", text="Typed stuff") - ev4 = addon.create('GtkWidgetTypeFilter', "0.0.1.1.1.2.3", strokes="acbd") + ev3 = addon.create('GtkWidgetTypeFilter', object_id="0.0.1.1.1.2.3", text="Typed stuff") + ev4 = addon.create('GtkWidgetTypeFilter', object_id="0.0.1.1.1.2.3", strokes="acbd") filters = [ev1, ev2, ev3, ev4] for efilter in filters: |