Changeset 22:bb77a1005b63 in ralphm-patches

Timestamp:

Dec 31, 2009, 2:39:14 PM (10 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Add bunch of missing tests.

Files:

• form-missing-tests.patch (added)
• pubsub-forms.patch (modified) (7 diffs)
• series (modified) (1 diff)

pubsub-forms.patch

@@ -1 @@
-diff -r 2ad7e6f72b63 -r 438b64816faa wokkel/data_form.py
---- a/wokkel/data_form.py       Wed Dec 30 21:16:04 2009 +0100
-+++ b/wokkel/data_form.py       Wed Dec 30 21:22:36 2009 +0100
+diff -r 5ccaacff8028 wokkel/data_form.py
+--- a/wokkel/data_form.py       Thu Dec 31 14:34:48 2009 +0100
++++ b/wokkel/data_form.py       Thu Dec 31 14:36:22 2009 +0100
 @@ -76,6 +76,7 @@
              option['label'] = self.label
@@ -59 +59 @@
              kwargs['options'] = options
  
-@@ -343,7 +345,7 @@
-     """
-     Data Form.
- 
--    There are two similarly named properties of forms. The L{formType} is the
-+    There are two similarly named properties of forms. The C{formType} is the
-     the so-called type of the form, and is set as the C{'type'} attribute
-     on the form's root element.
- 
-@@ -351,19 +353,25 @@
-     provide a context for the field names used in this form, by setting a
-     special hidden field named C{'FORM_TYPE'}, to put the names of all
-     other fields in the namespace of the value of that field. This namespace
--    is recorded in the L{formNamespace} instance variable.
-+    is recorded in the C{formNamespace} instance variable.
- 
-     @ivar formType: Type of form. One of C{'form'}, C{'submit'}, {'cancel'},
-                     or {'result'}.
--    @type formType: C{str}.
-+    @type formType: C{str}
-+
-     @ivar formNamespace: The optional namespace of the field names for this
--                         form. This goes in the special field named
--                         C{'FORM_TYPE'}, if set.
--    @type formNamespace: C{str}.
--    @ivar fields: Dictionary of fields that have a name. Note that this is
--                  meant to be used for reading, only. One should use
--                  L{addField} for adding fields.
-+        form. This goes in the special field named C{'FORM_TYPE'}, if set.
-+    @type formNamespace: C{str}
-+
-+    @ivar fields: Dictionary of named fields. Note that this is meant to be
-+        used for reading, only. One should use L{addField} or L{makeFields} and
-+        L{removeField} for adding and removing fields.
-     @type fields: C{dict}
-+
-+    @ivar fieldList: List of all fields, in the order they are added. Like
-+        C{fields}, this is meant to be used for reading, only.
-+    @type fieldList: C{list}
-+
-     """
- 
-     def __init__(self, formType, title=None, instructions=None,
-@@ -403,7 +411,7 @@
+@@ -415,7 +417,7 @@
          """
          Add a field to this form.
@@ -111 +68 @@
          adding new fields. Multiple fields with the same name are disallowed.
          """
-@@ -416,7 +424,71 @@
+@@ -428,7 +430,71 @@
          self.fieldList.append(field)
  
@@ -183 +140 @@
          form['type'] = self.formType
  
-@@ -477,7 +549,17 @@
+@@ -489,7 +555,17 @@
  
          return form
@@ -201 +158 @@
  
          for name, field in self.fields.iteritems():
-@@ -489,3 +571,48 @@
+@@ -501,3 +577,48 @@
              values[name] = value
  
@@ -250 +207 @@
 +        for field in filtered:
 +            self.removeField(field)
-diff -r 2ad7e6f72b63 -r 438b64816faa wokkel/pubsub.py
---- a/wokkel/pubsub.py  Wed Dec 30 21:16:04 2009 +0100
-+++ b/wokkel/pubsub.py  Wed Dec 30 21:22:36 2009 +0100
+diff -r 5ccaacff8028 wokkel/pubsub.py
+--- a/wokkel/pubsub.py  Thu Dec 31 14:34:48 2009 +0100
++++ b/wokkel/pubsub.py  Thu Dec 31 14:36:22 2009 +0100
 @@ -1012,29 +1012,11 @@
              return None
@@ -286 +243 @@
  
  
+diff -r 5ccaacff8028 wokkel/test/test_data_form.py
+--- a/wokkel/test/test_data_form.py     Thu Dec 31 14:34:48 2009 +0100
++++ b/wokkel/test/test_data_form.py     Thu Dec 31 14:36:22 2009 +0100
+@@ -544,3 +544,42 @@
+         field2 = data_form.Field(var='test', value='value2')
+         form.addField(field1)
+         self.assertRaises(data_form.Error, form.addField, field2)
++
++
++    def test_removeField(self):
++        """
++        A removed field should not occur in fieldList.
++        """
++        form = data_form.Form('result')
++        field = data_form.Field('fixed', value='Section 1')
++        form.addField(field)
++        form.removeField(field)
++        self.assertNotIn(field, form.fieldList)
++
++
++    def test_removeFieldNamed(self):
++        """
++        A removed named field should not occur in fields.
++        """
++        form = data_form.Form('result')
++        field = data_form.Field(var='test', value='test1')
++        form.addField(field)
++        form.removeField(field)
++        self.assertNotIn('test', form.fields)
++
++
++    def test_makeFieldsJID(self):
++        values = {'pubsub#creator': jid.JID('user@example.org')}
++        form = data_form.Form('result')
++        form.makeFields(values)
++        field = form.fields['pubsub#creator']
++        self.assertEqual('jid-single', field.fieldType)
++
++
++    def test_makeFieldsJIDMulti(self):
++        values = {'pubsub#contact': [jid.JID('user@example.org'),
++                                     jid.JID('other@example.org')]}
++        form = data_form.Form('result')
++        form.makeFields(values)
++        field = form.fields['pubsub#contact']
++        self.assertEqual('jid-multi', field.fieldType)

series

@@ +1 @@
+form-missing-tests.patch
 pubsub-forms.patch
 pubsub-request-options-form.patch