[commit-gajim] r10260 - in trunk/test: . lib - Commits

18 Aug 2008

Author: steve-e
Date: 2008-08-19 00:15:45 +0200 (Tue, 19 Aug 2008)
New Revision: 10260
Modified:
   trunk/test/lib/data.py
   trunk/test/test_roster.py
Log:
Unittest to reproduce #4208. With some tweaks to data.py it should also help to reproduce #4195.
Modified: trunk/test/lib/data.py
===================================================================

--- trunk/test/lib/data.py	2008-08-18 21:32:08 UTC (rev 10259)
+++ trunk/test/lib/data.py	2008-08-18 22:15:45 UTC (rev 10260)
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 account1 = u'acc1'
 account2 = u'Cool"chârßéµö'
+account3 = u'dingdong.org'
contacts = {}
 contacts[account1] = {
@@ -31,5 +32,40 @@
    		  'ask': None, 'groups': [u'GroupA', u'GroupB'], 'name': None, 
    		  'resources': {}, 'subscription': u'both'}
 }
+contacts[account3] = {
+	#u'guypsych0\40h.com@msn.dingdong.org': {
+	#		  'ask': None, 'groups': [], 'name': None, 'resources': {}, 
+	#		  'subscription': u'both'},
+	u'guypsych0%h.com@msn.delx.cjb.net': {
+			  'ask': u'subscribe', 'groups': [], 'name': None,
+			  'resources': {}, 'subscription': u'from'},
+	#u'guypsych0%h.com@msn.jabber.wiretrip.org': {
+	#		  'ask': None, 'groups': [], 'name': None, 'resources': {}, 
+	#		  'subscription': u'to'},
+	#u'guypsycho\40g.com@gtalk.dingdong.org': {
+	#		  'ask': None, 'groups': [], 'name': None, 
+	#		  'resources': {}, 'subscription': u'both'}
+}
-# vim: se ts=3:
+metacontact_data = [
+	[{'account': account3,
+	  'jid': u'guypsych0\40h.com@msn.dingdong.org',
+	  'order': 0},
+	 {'account': account3,
+	  'jid': u'guypsych0%h.com@msn.delx.cjb.net',
+	  'order': 0},
+	 {'account': account3,
+	  'jid': u'guypsych0%h.com@msn.jabber.wiretrip.org',
+	  'order': 0},
+	 {'account': account3,
+	  'jid': u'guypsycho\40g.com@gtalk.dingdong.org',
+	  'order': 0}],
+
+	[{'account': account1,
+	  'jid': u'samejid@gajim.org',
+	  'order': 0},
+	 {'account': account2,
+	  'jid': u'samejid@gajim.org',
+	  'order': 0}]
+	]
+
Modified: trunk/test/test_roster.py
===================================================================
--- trunk/test/test_roster.py	2008-08-18 21:32:08 UTC (rev 10259)
+++ trunk/test/test_roster.py	2008-08-18 22:15:45 UTC (rev 10260)
@@ -144,10 +144,16 @@
class TestRosterWindowMetaContacts(TestRosterWindowRegrouped):
-	def setUp(self):
-		gajim.contacts.add_metacontact(account1, u'samejid@gajim.org',
-			account2, u'samejid@gajim.org')
-		TestRosterWindowRegrouped.setUp(self)
+	def test_receive_metacontact_data(self):
+		for complete_data in metacontact_data:
+			t_acc = complete_data[0]['account']
+			t_jid = complete_data[0]['jid']
+			data = complete_data[1:]
+			for brother in data:
+				acc = brother['account']
+				jid = brother['jid']
+				gajim.contacts.add_metacontact(t_acc, t_jid, acc, jid)
+		self.roster.setup_and_draw_roster()
def test_connect_new_metacontact(self):
    	self.test_fill_roster_model()
@@ -165,6 +171,7 @@
    	self.assert_model_is_in_sync()
+
 if __name__ == '__main__':
    unittest.main()

    