source: ralphm-patches/data_form_parse_type.patch @ 12:fc40892815eb

wokkel/data_form.py

@@ -295 +295 @@
     @staticmethod
     def _parse_value(field, element):
         value = unicode(element)
-        if field.fieldType == 'boolean':
-            value = value.lower() in ('1', 'true')
-        elif field.fieldType in ('jid-multi', 'jid-single'):
-            value = JID(value)
         field.values.append(value)
 
 

wokkel/test/test_data_form.py

@@ -229 +229 @@
         self.assertEquals(None, field.fieldType)
 
 
-    def test_fromElementValue(self):
+    def test_fromElementValueTextSingle(self):
+        """
+        Parsed text-single field values should be of type C{unicode}.
+        """
         element = domish.Element((NS_X_DATA, 'field'))
-        element.addElement("value", content="text")
+        element['type'] = 'text-single'
+        element.addElement('value', content=u'text')
         field = data_form.Field.fromElement(element)
         self.assertEquals('text', field.value)
+
+
+    def test_fromElementValueJID(self):
+        """
+        Parsed jid-single field values should be of type C{unicode}.
+        """
+        element = domish.Element((NS_X_DATA, 'field'))
+        element['type'] = 'jid-single'
+        element.addElement('value', content=u'user@example.org')
+        field = data_form.Field.fromElement(element)
+        self.assertEquals(u'user@example.org', field.value)
+
+    def test_fromElementValueJIDMalformed(self):
+        """
+        Parsed jid-single field values should be of type C{unicode}.
+
+        No validation should be done at this point, so invalid JIDs should
+        also be passed as-is.
+        """
+        element = domish.Element((NS_X_DATA, 'field'))
+        element['type'] = 'jid-single'
+        element.addElement('value', content=u'@@')
+        field = data_form.Field.fromElement(element)
+        self.assertEquals(u'@@', field.value)
+
+
+    def test_fromElementValueBoolean(self):
+        """
+        Parsed boolean field values should be of type C{unicode}.
+        """
+        element = domish.Element((NS_X_DATA, 'field'))
+        element['type'] = 'boolean'
+        element.addElement('value', content=u'false')
+        field = data_form.Field.fromElement(element)
+        self.assertEquals(u'false', field.value)
 
 
 

wokkel/test/test_pubsub.py

@@ -708 +708 @@
                      "label": "Persist items to storage"},
                 "pubsub#deliver_payloads":
                     {"type": "boolean",
-                     "label": "Deliver payloads with event notifications"}
+                     "label": "Deliver payloads with event notifications"},
+                "pubsub#owner":
+                    {"type": "jid-single",
+                     "label": "Owner of the node"}
                 }
 
         def getConfiguration(requestor, service, nodeIdentifier):
@@ -717 +720 @@
             self.assertEqual('test', nodeIdentifier)
 
             return defer.succeed({'pubsub#deliver_payloads': '0',
-                                  'pubsub#persist_items': '1'})
+                                  'pubsub#persist_items': '1',
+                                  'pubsub#owner': JID('user@example.org')})
 
         def cb(element):
             self.assertEqual('pubsub', element.name)
@@ -730 +734 @@
             self.assertIn('pubsub#deliver_payloads', fields)
             field = fields['pubsub#deliver_payloads']
             self.assertEqual('boolean', field.fieldType)
+            field.typeCheck()
             self.assertEqual(False, field.value)
 
             self.assertIn('pubsub#persist_items', fields)
             field = fields['pubsub#persist_items']
             self.assertEqual('boolean', field.fieldType)
+            field.typeCheck()
             self.assertEqual(True, field.value)
+
+            self.assertIn('pubsub#owner', fields)
+            field = fields['pubsub#owner']
+            self.assertEqual('jid-single', field.fieldType)
+            field.typeCheck()
+            self.assertEqual(JID('user@example.org'), field.value)
 
         self.service.getConfigurationOptions = getConfigurationOptions
         self.service.getConfiguration = getConfiguration