jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lots of XEP-0004 bug fixes.

Browse Source 
Forms have default type of 'form'
setFields now uses a list of tuples instead of a dictionary because ordering is important.
getFields defaults to returning a list of tuples, but the use_dict parameter can change that
This commit is contained in:
Lance Stout
2010-07-20 12:16:57 -04:00
parent 9724efa123
commit de24e9ed45
2 changed files with 92 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
tests/test_forms.py
View File

@@ -1,5 +1,5 @@
from sleektest import *
import sleekxmpp.plugins.alt_0004 as xep_0004
import sleekxmpp.plugins.xep_0004 as xep_0004
class TestDataForms(SleekTest):
@@ -16,19 +16,19 @@ class TestDataForms(SleekTest):
self.checkMessage(msg, """
<message>
<x xmlns="jabber:x:data">
<x xmlns="jabber:x:data" type="form">
<instructions>Instructions</instructions>
<instructions>Second batch</instructions>
</x>
</message>
""", use_values=False)
""")
def testAddField(self):
"""Testing adding fields to a data form."""
msg = self.Message()
form = msg['form']
form.addField('f1',
form.addField(var='f1',
ftype='text-single',
label='Text',
desc='A text field',
@@ -37,7 +37,7 @@ class TestDataForms(SleekTest):
self.checkMessage(msg, """
<message>
<x xmlns="jabber:x:data">
<x xmlns="jabber:x:data" type="form">
<field var="f1" type="text-single" label="Text">
<desc>A text field</desc>
<required />
@@ -45,26 +45,26 @@ class TestDataForms(SleekTest):
</field>
</x>
</message>
""", use_values=False)
""")
form['fields'] = {'f1': {'type': 'text-single',
'label': 'Username',
'required': True},
'f2': {'type': 'text-private',
'label': 'Password',
'required': True},
'f3': {'type': 'text-multi',
'label': 'Message',
'value': 'Enter message.\nA long one even.'},
'f4': {'type': 'list-single',
'label': 'Message Type',
'options': [{'label': 'Cool!',
'value': 'cool'},
{'label': 'Urgh!',
'value': 'urgh'}]}}
form['fields'] = [('f1', {'type': 'text-single',
'label': 'Username',
'required': True}),
('f2', {'type': 'text-private',
'label': 'Password',
'required': True}),
('f3', {'type': 'text-multi',
'label': 'Message',
'value': 'Enter message.\nA long one even.'}),
('f4', {'type': 'list-single',
'label': 'Message Type',
'options': [{'label': 'Cool!',
'value': 'cool'},
{'label': 'Urgh!',
'value': 'urgh'}]})]
self.checkMessage(msg, """
<message>
<x xmlns="jabber:x:data">
<x xmlns="jabber:x:data" type="form">
<field var="f1" type="text-single" label="Username">
<required />
</field>
@@ -85,6 +85,31 @@ class TestDataForms(SleekTest):
</field>
</x>
</message>
""", use_values=False)
""")
def testSetValues(self):
"""Testing setting form values"""
msg = self.Message()
form = msg['form']
form.setFields([
('foo', {'type': 'text-single'}),
('bar', {'type': 'list-multi'})])
form.setValues({'foo': 'Foo!',
'bar': ['a', 'b']})
self.checkMessage(msg, """
<message>
<x xmlns="jabber:x:data" type="form">
<field var="foo" type="text-single">
<value>Foo!</value>
</field>
<field var="bar" type="list-multi">
<value>a</value>
<value>b</value>
</field>
</x>
</message>""")
suite = unittest.TestLoader().loadTestsFromTestCase(TestDataForms)