comparison src/test/test_plugin_xep_0033.py @ 944:e1842ebcb2f3

core, plugin XEP-0115: discovery refactoring: - hashing algorithm of XEP-0115 has been including in core - our own hash is still calculated by XEP-0115 and can be regenerated with XEP_0115.recalculateHash - old discovery methods have been removed. Now the following methods are used: - hasFeature: tell if a feature is available for an entity - getDiscoInfos: self explaining - getDiscoItems: self explaining - findServiceEntities: return all available items of an entity which given (category, type) - findFeaturesSet: search for a set of features in entity + entity's items all these methods are asynchronous, and manage cache automatically - XEP-0115 manage in a better way hashes, and now use a trigger for presence instead of monkey patch - new FeatureNotFound exception, when we want to do something which is not available - refactored client initialisation sequence, removed client.initialized Deferred - added constant APP_URL - test_plugin_xep_0033.py has been temporarly deactivated, the time to adapt it - lot of cleaning
author Goffi <goffi@goffi.org>
date Fri, 28 Mar 2014 18:07:22 +0100
parents 861593a5652b
children 301b342c697a
comparison
equal deleted inserted replaced
943:71926ec2114d 944:e1842ebcb2f3
30 from twisted.words.protocols.jabber.jid import JID 30 from twisted.words.protocols.jabber.jid import JID
31 import logging 31 import logging
32 32
33 33
34 class XEP_0033Test(helpers.SatTestCase): 34 class XEP_0033Test(helpers.SatTestCase):
35 skip = "Must be fixed after disco changes"
35 36
36 def setUp(self): 37 def setUp(self):
37 self.host = helpers.FakeSAT() 38 self.host = helpers.FakeSAT()
38 self.plugin = plugin.XEP_0033(self.host) 39 self.plugin = plugin.XEP_0033(self.host)
39 40
149 trigger(data, AbortSendMessage) 150 trigger(data, AbortSendMessage)
150 151
151 # feature is supported 152 # feature is supported
152 self.host.init() 153 self.host.init()
153 self.host.memory.init() 154 self.host.memory.init()
154 self.host.memory.addServerFeature(plugin.NS_ADDRESS, self.host.getClientHostJid(Const.PROFILE[0]), Const.PROFILE[0])
155 data = deepcopy(mess_data) 155 data = deepcopy(mess_data)
156 trigger(data, MessageSentAndStored) 156 trigger(data, MessageSentAndStored)
157 checkSentAndStored() 157 checkSentAndStored()
158 158
159 # check that a wrong recipient entity is fixed by the backend 159 # check that a wrong recipient entity is fixed by the backend
160 self.host.init() 160 self.host.init()
161 self.host.memory.init() 161 self.host.memory.init()
162 self.host.memory.addServerFeature(plugin.NS_ADDRESS, self.host.getClientHostJid(Const.PROFILE[0]), Const.PROFILE[0])
163 data = deepcopy(mess_data) 162 data = deepcopy(mess_data)
164 data["to"] = Const.JID[0] 163 data["to"] = Const.JID[0]
165 trigger(data, MessageSentAndStored) 164 trigger(data, MessageSentAndStored)
166 checkSentAndStored() 165 checkSentAndStored()