[Telepathy-commits] [telepathy-gabble/master] facor out create_gadget_message

[Guillaume Desmottes]

---
 tests/twisted/olpc/olpc-activity-search.py |   77 ++++++++-------------------
 1 files changed, 23 insertions(+), 54 deletions(-)

diff --git a/tests/twisted/olpc/olpc-activity-search.py b/tests/twisted/olpc/olpc-activity-search.py
index d4550dc..634977d 100644
--- a/tests/twisted/olpc/olpc-activity-search.py
+++ b/tests/twisted/olpc/olpc-activity-search.py
@@ -44,6 +44,19 @@ def close_view(q, view_iface, id):
     assert len(close) == 1
     assert close[0]['id'] == id
 
+def create_gadget_message(to):
+    message = domish.Element((None, 'message'))
+    message['from'] = 'gadget.localhost'
+    message['to'] = to
+    message['type'] = 'notice'
+    amp = message.addElement((NS_AMP, 'amp'))
+    rule = amp.addElement((None, 'rule'))
+    rule['condition'] = 'deliver-at'
+    rule['value'] = 'stored'
+    rule['action'] ='error'
+
+    return message
+
 def test(q, bus, conn, stream):
     conn.Connect()
 
@@ -214,10 +227,8 @@ def test(q, bus, conn, stream):
     assert sorted(act) == [('activity3', handles['room3'])]
 
     # add activity 4 to view 0
-    message = domish.Element((None, 'message'))
-    message['from'] = 'gadget.localhost'
-    message['to'] = 'alice at localhost'
-    message['type'] = 'notice'
+    message = create_gadget_message('alice at localhost')
+
     added = message.addElement((NS_OLPC_ACTIVITY, 'added'))
     added['id'] = '0'
     activity = added.addElement((None, 'activity'))
@@ -233,11 +244,7 @@ def test(q, bus, conn, stream):
         properties.addChild(node)
     buddy = activity.addElement((None, 'buddy'))
     buddy['jid'] = 'jean at localhost'
-    amp = message.addElement((NS_AMP, 'amp'))
-    rule = amp.addElement((None, 'rule'))
-    rule['condition'] = 'deliver-at'
-    rule['value'] = 'stored'
-    rule['action'] ='error'
+
     stream.send(message)
 
     ## Current views ##
@@ -282,10 +289,7 @@ def test(q, bus, conn, stream):
     assert props == {'color': '#DDEEDD,#EEDDEE'}
 
     # Gadget informs us about an activity properties change
-    message = domish.Element(('jabber:client', 'message'))
-    message['from'] = 'gadget.localhost'
-    message['to'] = 'alice at localhost'
-    message['type'] = 'notice'
+    message = create_gadget_message('alice at localhost')
 
     change = message.addElement((NS_OLPC_ACTIVITY, 'change'))
     change['activity'] = 'activity1'
@@ -296,11 +300,6 @@ def test(q, bus, conn, stream):
             'color': ('str', '#AABBAA,#BBAABB')}):
         properties.addChild(node)
 
-    amp = message.addElement((NS_AMP, 'amp'))
-    rule = amp.addElement((None, 'rule'))
-    rule['condition'] = 'deliver-at'
-    rule['value'] = 'stored'
-    rule['action'] ='error'
     stream.send(message)
 
     q.expect('dbus-signal', signal='ActivityPropertiesChanged',
@@ -311,10 +310,7 @@ def test(q, bus, conn, stream):
     assert props == {'tags': 'game', 'color': '#AABBAA,#BBAABB'}
 
     # Marcel joined activity 1
-    message = domish.Element(('jabber:client', 'message'))
-    message['from'] = 'gadget.localhost'
-    message['to'] = 'alice at localhost'
-    message['type'] = 'notice'
+    message = create_gadget_message('alice at localhost')
 
     activity = message.addElement((NS_OLPC_ACTIVITY, 'activity'))
     activity['room'] = 'room1 at conference.localhost'
@@ -325,11 +321,6 @@ def test(q, bus, conn, stream):
     for node in properties_to_xml({'color': ('str', '#CCCCCC,#DDDDDD')}):
         properties.addChild(node)
 
-    amp = message.addElement((NS_AMP, 'amp'))
-    rule = amp.addElement((None, 'rule'))
-    rule['condition'] = 'deliver-at'
-    rule['value'] = 'stored'
-    rule['action'] ='error'
     stream.send(message)
 
     ## Current views ##
@@ -356,10 +347,7 @@ def test(q, bus, conn, stream):
             'marcel at localhost'])
 
     # Marcel left activity 1
-    message = domish.Element(('jabber:client', 'message'))
-    message['from'] = 'gadget.localhost'
-    message['to'] = 'alice at localhost'
-    message['type'] = 'notice'
+    message = create_gadget_message('alice at localhost')
 
     activity = message.addElement((NS_OLPC_ACTIVITY, 'activity'))
     activity['room'] = 'room1 at conference.localhost'
@@ -367,11 +355,6 @@ def test(q, bus, conn, stream):
     left = activity.addElement((None, 'left'))
     left['jid'] = 'marcel at localhost'
 
-    amp = message.addElement((NS_AMP, 'amp'))
-    rule = amp.addElement((None, 'rule'))
-    rule['condition'] = 'deliver-at'
-    rule['value'] = 'stored'
-    rule['action'] ='error'
     stream.send(message)
 
     ## Current views ##
@@ -392,10 +375,7 @@ def test(q, bus, conn, stream):
         ['fernand at localhost', 'lucien at localhost', 'jean at localhost'])
 
     # Jean left activity 1
-    message = domish.Element(('jabber:client', 'message'))
-    message['from'] = 'gadget.localhost'
-    message['to'] = 'alice at localhost'
-    message['type'] = 'notice'
+    message = create_gadget_message('alice at localhost')
 
     activity = message.addElement((NS_OLPC_ACTIVITY, 'activity'))
     activity['room'] = 'room1 at conference.localhost'
@@ -403,11 +383,6 @@ def test(q, bus, conn, stream):
     left = activity.addElement((None, 'left'))
     left['jid'] = 'jean at localhost'
 
-    amp = message.addElement((NS_AMP, 'amp'))
-    rule = amp.addElement((None, 'rule'))
-    rule['condition'] = 'deliver-at'
-    rule['value'] = 'stored'
-    rule['action'] ='error'
     stream.send(message)
 
     ## Current views ##
@@ -425,20 +400,14 @@ def test(q, bus, conn, stream):
         ['fernand at localhost', 'lucien at localhost', 'jean at localhost'])
 
     # remove activity 1 from view 0
-    message = domish.Element((None, 'message'))
-    message['from'] = 'gadget.localhost'
-    message['to'] = 'alice at localhost'
-    message['type'] = 'notice'
+    message = create_gadget_message('alice at localhost')
+
     removed = message.addElement((NS_OLPC_ACTIVITY, 'removed'))
     removed['id'] = '0'
     activity = removed.addElement((None, 'activity'))
     activity['id'] = 'activity1'
     activity['room'] = 'room1 at conference.localhost'
-    amp = message.addElement((NS_AMP, 'amp'))
-    rule = amp.addElement((None, 'rule'))
-    rule['condition'] = 'deliver-at'
-    rule['value'] = 'stored'
-    rule['action'] ='error'
+
     stream.send(message)
 
     ## Current views ##
-- 
1.5.6.5