Changeset 173:6b0eb01b5744 for wokkel/test/test_xmppim.py

Timestamp:

May 9, 2012, 2:24:28 PM (10 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Add support for roster versioning.

File:

• wokkel/test/test_xmppim.py (modified) (6 diffs)

wokkel/test/test_xmppim.py

@@ -838 +838 @@
         self.assertEqual(JID('this@example.org'), request.sender)
         self.assertEqual(None, request.item)
+        self.assertEqual(None, request.version)
 
 
@@ -855 +856 @@
         self.assertNotIdentical(None, request.item)
         self.assertEqual(JID('user@example.org'), request.item.entity)
+
+
+    def test_fromElementVersion(self):
+        """
+        If a ver attribute is present, put it in the request version.
+        """
+        xml = """
+            <iq type='set' to='this@example.org/Home' from='this@example.org'>
+              <query xmlns='jabber:iq:roster' ver='ver72'>
+                <item jid='user@example.org'/>
+              </query>
+            </iq>
+        """
+        request = xmppim.RosterRequest.fromElement(parseXml(xml))
+        self.assertEqual('ver72', request.version)
+
+
+    def test_fromElementVersionEmpty(self):
+        """
+        The ver attribute may be empty.
+        """
+        xml = """
+            <iq type='get' to='this@example.org/Home' from='this@example.org'>
+              <query xmlns='jabber:iq:roster' ver=''/>
+            </iq>
+        """
+        request = xmppim.RosterRequest.fromElement(parseXml(xml))
+        self.assertEqual('', request.version)
 
 
@@ -904 +933 @@
 
 
+    def test_toElementVersion(self):
+        """
+        If the roster version is set, a 'ver' attribute is added.
+        """
+        request = xmppim.RosterRequest()
+        request.version = 'ver72'
+        element = request.toElement()
+        self.assertEqual('ver72', element.query.getAttribute('ver'))
+
+
+    def test_toElementVersionEmpty(self):
+        """
+        If the roster version is the empty string, it should add 'ver', too.
+        """
+        request = xmppim.RosterRequest()
+        request.version = ''
+        element = request.toElement()
+        self.assertEqual('', element.query.getAttribute('ver'))
+
+
 
 class RosterClientProtocolTest(unittest.TestCase, TestableRequestHandlerMixin):
@@ -950 +999 @@
         def cb(roster):
             self.assertIn(JID('user@example.org'), roster)
+            self.assertIdentical(None, getattr(roster, 'version'))
 
         d = self.service.getRoster()
@@ -960 +1010 @@
         self.assertNotIdentical(None, iq.query)
         self.assertEqual(NS_ROSTER, iq.query.uri)
+        self.assertFalse(iq.query.hasAttribute('ver'))
 
         # Fake successful response
@@ -967 +1018 @@
         item['jid'] = 'user@example.org'
 
+        d.callback(response)
+        return d
+
+
+    def test_getRosterVer(self):
+        """
+        A request for the roster with version passes the version on.
+        """
+        def cb(roster):
+            self.assertEqual('ver96', getattr(roster, 'version'))
+
+        d = self.service.getRoster(version='ver72')
+        d.addCallback(cb)
+
+        # Inspect outgoing iq request
+
+        iq = self.stub.output[-1]
+        self.assertEqual('ver72', iq.query.getAttribute('ver'))
+
+        # Fake successful response
+        response = toResponse(iq, 'result')
+        query = response.addElement((NS_ROSTER, 'query'))
+        query['ver'] = 'ver96'
+        item = query.addElement('item')
+        item['jid'] = 'user@example.org'
+
+        d.callback(response)
+        return d
+
+
+    def test_getRosterVerEmptyResult(self):
+        """
+        An empty response is returned as None.
+        """
+        def cb(response):
+            self.assertIdentical(None, response)
+
+        d = self.service.getRoster(version='ver72')
+        d.addCallback(cb)
+
+        # Inspect outgoing iq request
+
+        iq = self.stub.output[-1]
+
+        # Fake successful response
+        response = toResponse(iq, 'result')
         d.callback(response)
         return d