diff src/test/test_plugin_xep_0277.py @ 1913:ee1125fffba8

plugin XEP-0277, test: set keys of data dict as unicode + fix the tests
author souliane <souliane@mailoo.org>
date Fri, 18 Mar 2016 08:58:22 +0100
parents 55440ee00905
children 2daf7b4c6756
line wrap: on
line diff
--- a/src/test/test_plugin_xep_0277.py	Tue Mar 15 16:25:42 2016 +0100
+++ b/src/test/test_plugin_xep_0277.py	Fri Mar 18 08:58:22 2016 +0100
@@ -24,13 +24,14 @@
 from sat.plugins import plugin_xep_0060
 from sat.plugins import plugin_misc_text_syntaxes
 from sat.tools.xml_tools import ElementParser
+from wokkel.pubsub import NS_PUBSUB
 
 
 class XEP_0277Test(helpers.SatTestCase):
 
-    PUBSUB_ENTRY_1 = """
-    <item id="c745a688-9b02-11e3-a1a3-c0143dd4fe51" xmlns="%s">
-        <entry>
+    PUBSUB_ENTRY_1 = u"""
+    <item id="c745a688-9b02-11e3-a1a3-c0143dd4fe51">
+        <entry xmlns="%s">
             <title type="text">&lt;span&gt;titre&lt;/span&gt;</title>
             <id>c745a688-9b02-11e3-a1a3-c0143dd4fe51</id>
             <updated>2014-02-21T16:16:39+02:00</updated>
@@ -42,24 +43,25 @@
         </author>
     </entry>
     </item>
-    """ % plugin_xep_0277.NS_PUBSUB
+    """ % plugin_xep_0277.NS_ATOM
 
-    PUBSUB_ENTRY_2 = """
-    <item id="c745a688-9b02-11e3-a1a3-c0143dd4fe51" xmlns="%s">
-        <entry xmlns=''>
+    PUBSUB_ENTRY_2 = u"""
+    <item id="c745a688-9b02-11e3-a1a3-c0143dd4fe51">
+        <entry xmlns='%s'>
             <title type="text">&lt;div&gt;titre&lt;/div&gt;</title>
             <title type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><div style="background-image: url('xxx');">titre</div></div></title>
             <id>c745a688-9b02-11e3-a1a3-c0143dd4fe51</id>
             <updated>2014-02-21T16:16:39+02:00</updated>
             <published>2014-02-21T16:16:38+02:00</published>
             <content type="text">&lt;div&gt;&lt;p&gt;contenu&lt;/p&gt;texte dans balise&lt;p&gt;autre contenu&lt;/p&gt;&lt;/div&gt;</content>
-            <content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><div><p>contenu</p>texte dans balise<p>autre contenu</p></div></div></content>
+            <content type="xhtml"><div xmlns="http://www.w3.org/1999/xhtml"><p>contenu</p>texte dans balise<p>autre contenu</p></div></content>
         <author>
-            <nick>test1@souliane.org</nick>
+            <name>test1@souliane.org</name>
+            <nick>test1</nick>
         </author>
     </entry>
     </item>
-    """ % plugin_xep_0277.NS_PUBSUB
+    """ % plugin_xep_0277.NS_ATOM
 
     def setUp(self):
         self.host = helpers.FakeSAT()
@@ -77,28 +79,32 @@
         self.plugin = plugin_xep_0277.XEP_0277(self.host)
 
     def test_item2mbdata_1(self):
-        expected = {'id': 'c745a688-9b02-11e3-a1a3-c0143dd4fe51',
-                    'title': '<span>titre</span>',
-                    'updated': '1392992199.0',
-                    'published': '1392992198.0',
-                    'content': '<p>contenu</p>texte sans balise<p>autre contenu</p>',
-                    'content_xhtml': '<div><p>contenu</p>texte sans balise<p>autre contenu</p></div>',
-                    'author': 'test1@souliane.org'
+        expected = {u'id': u'c745a688-9b02-11e3-a1a3-c0143dd4fe51',
+                    u'atom_id': u'c745a688-9b02-11e3-a1a3-c0143dd4fe51',
+                    u'title': u'<span>titre</span>',
+                    u'updated': u'1392992199.0',
+                    u'published': u'1392992198.0',
+                    u'content': u'<p>contenu</p>texte sans balise<p>autre contenu</p>',
+                    u'content_xhtml': u'<div><p>contenu</p>texte sans balise<p>autre contenu</p></div>',
+                    u'author': u'test1@souliane.org'
                     }
-        d = self.plugin.item2mbdata(ElementParser()(self.PUBSUB_ENTRY_1))
+        item_elt = ElementParser()(self.PUBSUB_ENTRY_1, namespace=NS_PUBSUB).elements().next()
+        d = self.plugin.item2mbdata(item_elt)
         d.addCallback(self.assertEqual, expected)
         return d
 
     def test_item2mbdata_2(self):
-        expected = {'id': 'c745a688-9b02-11e3-a1a3-c0143dd4fe51',
-                    'title': '<div>titre</div>',
-                    'title_xhtml': '<div style="">titre</div>',
-                    'updated': '1392992199.0',
-                    'published': '1392992198.0',
-                    'content': '<div><p>contenu</p>texte dans balise<p>autre contenu</p></div>',
-                    'content_xhtml': '<div><p>contenu</p>texte dans balise<p>autre contenu</p></div>',
-                    'author': 'test1@souliane.org'
+        expected = {u'id': u'c745a688-9b02-11e3-a1a3-c0143dd4fe51',
+                    u'atom_id': u'c745a688-9b02-11e3-a1a3-c0143dd4fe51',
+                    u'title': u'<div>titre</div>',
+                    u'title_xhtml': u'<div><div style="">titre</div></div>',
+                    u'updated': u'1392992199.0',
+                    u'published': u'1392992198.0',
+                    u'content': u'<div><p>contenu</p>texte dans balise<p>autre contenu</p></div>',
+                    u'content_xhtml': u'<div><p>contenu</p>texte dans balise<p>autre contenu</p></div>',
+                    u'author': u'test1@souliane.org'
                     }
-        d = self.plugin.item2mbdata(ElementParser()(self.PUBSUB_ENTRY_2))
+        item_elt = ElementParser()(self.PUBSUB_ENTRY_2, namespace=NS_PUBSUB).elements().next()
+        d = self.plugin.item2mbdata(item_elt)
         d.addCallback(self.assertEqual, expected)
         return d