Changeset 28:65fd5f2bd59e

Timestamp:

Jul 28, 2008, 5:07:40 PM (14 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

svn:b33ecbfc-034c-dc11-8662-000475d9059e/trunk@58

Message:

Add client side support for removing a roster item.

Location:

wokkel

Files:

• test/test_xmppim.py (modified) (2 diffs)
• xmppim.py (modified) (1 diff)

wokkel/test/test_xmppim.py

@@ -8 +8 @@
 from twisted.trial import unittest
 from twisted.words.protocols.jabber.jid import JID
+from twisted.words.protocols.jabber.xmlstream import toResponse
+from twisted.words.xish import domish
+
 from wokkel import xmppim
+from wokkel.test.helpers import XmlStreamStub
+
+NS_ROSTER = 'jabber:iq:roster'
 
 class PresenceClientProtocolTest(unittest.TestCase):
@@ -68 +74 @@
         self.assertEquals(None, presence.getAttribute('to'))
         self.assertEquals("unavailable", presence.getAttribute('type'))
+
+
+class RosterClientProtocolTest(unittest.TestCase):
+    """
+    Tests for L{xmppim.RosterClientProtocol}.
+    """
+
+    def setUp(self):
+        self.stub = XmlStreamStub()
+        self.protocol = xmppim.RosterClientProtocol()
+        self.protocol.xmlstream = self.stub.xmlstream
+        self.protocol.connectionInitialized()
+
+
+    def test_removeItem(self):
+        """
+        Removing a roster item is setting an item with subscription C{remove}.
+        """
+        d = self.protocol.removeItem(JID('test@example.org'))
+
+        # Inspect outgoing iq request
+
+        iq = self.stub.output[-1]
+        self.assertEquals('set', iq.getAttribute('type'))
+        self.assertNotIdentical(None, iq.query)
+        self.assertEquals(NS_ROSTER, iq.query.uri)
+
+        children = list(domish.generateElementsQNamed(iq.query.children,
+                                                      'item', NS_ROSTER))
+        self.assertEquals(1, len(children))
+        child = children[0]
+        self.assertEquals('test@example.org', child['jid'])
+        self.assertEquals('remove', child['subscription'])
+
+        # Fake successful response
+
+        response = toResponse(iq, 'result')
+        self.stub.send(response)
+        return d

wokkel/xmppim.py

@@ -328 +328 @@
         return d
 
+
+    def removeItem(self, entity):
+        """
+        Remove an item from the contact list.
+
+        @param entity: The contact to remove the roster item for.
+        @type entity: L{JID<twisted.words.protocols.jabber.jid.JID>}
+        @rtype: L{twisted.internet.defer.Deferred}
+        """
+        iq = IQ(self.xmlstream, 'set')
+        iq.addElement((NS_ROSTER, 'query'))
+        item = iq.query.addElement('item')
+        item['jid'] = entity.full()
+        item['subscription'] = 'remove'
+        return iq.send()
+
+
     def _onRosterSet(self, iq):
         if iq.handled or \