Changeset 226:2532cfb12c7c for wokkel/test/test_pubsub.py

Timestamp:

Oct 4, 2016, 9:53:27 AM (6 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Parents:

225:58dd11c3ddd5 (diff), 224:16fca7e4806f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

hg-git-rename-source:

git

Message:

Merge branch 'master' into item-retract

Files:

• wokkel/test/test_pubsub.py (modified) (1 diff)
• wokkel/test/test_pubsub.py (modified) (4 diffs)

wokkel/test/test_pubsub.py

@@ -907 +907 @@
 
 
+    def test_retractItems(self):
+        """
+        Test sending items retraction.
+        """
+        d = self.protocol.retractItems(JID('pubsub.example.org'), 'test',
+                                       itemIdentifiers=['item1', 'item2'])
+
+        iq = self.stub.output[-1]
+        self.assertEquals('pubsub.example.org', iq.getAttribute('to'))
+        self.assertEquals('set', iq.getAttribute('type'))
+        self.assertEquals('pubsub', iq.pubsub.name)
+        self.assertEquals(NS_PUBSUB, iq.pubsub.uri)
+        children = list(domish.generateElementsQNamed(iq.pubsub.children,
+                                                      'retract', NS_PUBSUB))
+        self.assertEquals(1, len(children))
+        child = children[0]
+        self.assertEquals('test', child['node'])
+        itemIdentifiers = [item.getAttribute('id') for item in
+                           domish.generateElementsQNamed(child.children, 'item',
+                                                         NS_PUBSUB)]
+        self.assertEquals(['item1', 'item2'], itemIdentifiers)
+
+        self.stub.send(toResponse(iq, 'result'))
+        return d
+
+
+    def test_retractItemsWithSender(self):
+        """
+        Test retracting items request from a specific JID.
+        """
+        d = self.protocol.retractItems(JID('pubsub.example.org'), 'test',
+                                       itemIdentifiers=['item1', 'item2'],
+                                       sender=JID('user@example.org'))
+
+        iq = self.stub.output[-1]
+        self.assertEquals('user@example.org', iq['from'])
+
+        self.stub.send(toResponse(iq, 'result'))
+        return d
+
+
     def test_getOptions(self):
         def cb(form):

wokkel/test/test_pubsub.py

@@ -5 +5 @@
 Tests for L{wokkel.pubsub}
 """
+
+from __future__ import division, absolute_import
 
 from zope.interface import verify
@@ -113 +115 @@
         element = subscription.toElement()
         self.assertEqual('1234', element.getAttribute('subid'))
+
+
+
+class ItemTests(unittest.TestCase):
+    """
+    Tests for L{pubsub.Item}.
+    """
+
+    def test_payloadRaw(self):
+        """
+        Adding a payload as a string assumes serialized XML.
+        """
+        payload = "<test xmlns='foo'/>"
+        item = pubsub.Item(payload=payload)
+        self.assertEqual(payload, item.children[0])
+
+
+    def test_payloadElement(self):
+        """
+        Adding a payload as an domish Element, just adds that element as child.
+        """
+        payload = domish.Element(('foo', 'test'))
+        item = pubsub.Item(payload=payload)
+        self.assertIs(payload, item.children[0])
 
 
@@ -802 +828 @@
 
 
+    def test_itemsWithItemIdentifiers(self):
+        """
+        Test sending items request with item identifiers.
+        """
+        def cb(items):
+            self.assertEquals(2, len(items))
+            self.assertEquals([item1, item2], items)
+
+        d = self.protocol.items(JID('pubsub.example.org'), 'test',
+                                itemIdentifiers=['item1', 'item2'])
+        d.addCallback(cb)
+
+        iq = self.stub.output[-1]
+        self.assertEquals('pubsub.example.org', iq.getAttribute('to'))
+        self.assertEquals('get', iq.getAttribute('type'))
+        self.assertEquals('pubsub', iq.pubsub.name)
+        self.assertEquals(NS_PUBSUB, iq.pubsub.uri)
+        children = list(domish.generateElementsQNamed(iq.pubsub.children,
+                                                      'items', NS_PUBSUB))
+        self.assertEquals(1, len(children))
+        child = children[0]
+        self.assertEquals('test', child['node'])
+        itemIdentifiers = [item.getAttribute('id') for item in
+                           domish.generateElementsQNamed(child.children, 'item',
+                                                         NS_PUBSUB)]
+        self.assertEquals(['item1', 'item2'], itemIdentifiers)
+
+        response = toResponse(iq, 'result')
+        items = response.addElement((NS_PUBSUB, 'pubsub')).addElement('items')
+        items['node'] = 'test'
+        item1 = items.addElement('item')
+        item1['id'] = 'item1'
+        item2 = items.addElement('item')
+        item2['id'] = 'item2'
+
+        self.stub.send(response)
+
+        return d
+
+
     def test_itemsWithSubscriptionIdentifier(self):
         """
@@ -2955 +3021 @@
         def configureSet(request):
             self.assertEquals(['pubsub#deliver_payloads'],
-                              request.options.keys())
+                              list(request.options.keys()))
 
         self.resource.getConfigurationOptions = getConfigurationOptions