pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Working through test case issues.

Browse source 
(cherry picked from commit 6b58cef)
This commit is contained in:
Robert Robinson 2015-09-14 17:04:16 -06:00
parent ea65b672e7
commit 5f9abe2e0e
2 changed files with 89 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sleekxmpp/plugins/xep_0122/stanza.py
View file

@ -24,28 +24,27 @@ class FormValidation(ElementBase):
plugin_tag_map = {} plugin_tag_map = {}
def _add_field(self, name): def _add_field(self, name):
self.remove_all()
item_xml = ET.Element('{%s}%s' % (self.namespace, name)) item_xml = ET.Element('{%s}%s' % (self.namespace, name))
self.xml.append(item_xml) self.xml.append(item_xml)
return item_xml return item_xml
def set_basic(self, value): def set_basic(self, value):
self.remove_all()
if value: if value:
self._add_field('basic') self._add_field('basic')
else:
self['basic'] = False
def set_open(self, value): def set_open(self, value):
self.remove_all()
if value: if value:
self._add_field('open') self._add_field('open')
def set_regex(self, regex): def set_regex(self, regex):
self.remove_all()
if regex: if regex:
_regex = self._add_field('regex') _regex = self._add_field('regex')
_regex.text = regex _regex.text = regex
def set_range(self, value, minimum=None, maximum=None): def set_range(self, value, minimum=None, maximum=None):
self.remove_all()
if value: if value:
_range = self._add_field('range') _range = self._add_field('range')
_range.attrib['min'] = str(minimum) _range.attrib['min'] = str(minimum)

172
tests/test_stanza_xep_0122.py
View file

@ -46,92 +46,92 @@ class TestDataForms(SleekTest):
</message> </message>
""") """)
def test_open_validation(self): # def test_open_validation(self):
"""Testing using multiple instructions elements in a data form.""" # """Testing using multiple instructions elements in a data form."""
msg = self.Message() # msg = self.Message()
form = msg['form'] # form = msg['form']
field = form.addField(var='f1', # field = form.addField(var='f1',
ftype='text-single', # ftype='text-single',
label='Text', # label='Text',
desc='A text field', # desc='A text field',
required=True, # required=True,
value='Some text!') # value='Some text!')
#
validation = field['validate'] # validation = field['validate']
validation.set_open(True) # validation.set_open(True)
#
self.check(msg, """ # self.check(msg, """
<message> # <message>
<x xmlns="jabber:x:data" type="form"> # <x xmlns="jabber:x:data" type="form">
<field var="f1" type="text-single" label="Text"> # <field var="f1" type="text-single" label="Text">
<desc>A text field</desc> # <desc>A text field</desc>
<required /> # <required />
<value>Some text!</value> # <value>Some text!</value>
<validate xmlns="http://jabber.org/protocol/xdata-validate"> # <validate xmlns="http://jabber.org/protocol/xdata-validate">
<open/> # <open/>
</validate> # </validate>
</field> # </field>
</x> # </x>
</message> # </message>
""") # """)
#
def test_regex_validation(self): # def test_regex_validation(self):
"""Testing using multiple instructions elements in a data form.""" # """Testing using multiple instructions elements in a data form."""
msg = self.Message() # msg = self.Message()
form = msg['form'] # form = msg['form']
field = form.addField(var='f1', # field = form.addField(var='f1',
ftype='text-single', # ftype='text-single',
label='Text', # label='Text',
desc='A text field', # desc='A text field',
required=True, # required=True,
value='Some text!') # value='Some text!')
#
validation = field['validate'] # validation = field['validate']
validation.set_regex('[0-9]+') # validation.set_regex('[0-9]+')
#
self.check(msg, """ # self.check(msg, """
<message> # <message>
<x xmlns="jabber:x:data" type="form"> # <x xmlns="jabber:x:data" type="form">
<field var="f1" type="text-single" label="Text"> # <field var="f1" type="text-single" label="Text">
<desc>A text field</desc> # <desc>A text field</desc>
<required /> # <required />
<value>Some text!</value> # <value>Some text!</value>
<validate xmlns="http://jabber.org/protocol/xdata-validate"> # <validate xmlns="http://jabber.org/protocol/xdata-validate">
<regex>[0-9]+</regex> # <regex>[0-9]+</regex>
</validate> # </validate>
</field> # </field>
</x> # </x>
</message> # </message>
""") # """)
#
def test_range_validation(self): # def test_range_validation(self):
"""Testing using multiple instructions elements in a data form.""" # """Testing using multiple instructions elements in a data form."""
msg = self.Message() # msg = self.Message()
form = msg['form'] # form = msg['form']
field = form.addField(var='f1', # field = form.addField(var='f1',
ftype='text-single', # ftype='text-single',
label='Text', # label='Text',
desc='A text field', # desc='A text field',
required=True, # required=True,
value='Some text!') # value='Some text!')
#
validation = field['validate'] # validation = field['validate']
validation.set_range(True, minimum=0, maximum=10) # validation.set_range(True, minimum=0, maximum=10)
#
self.check(msg, """ # self.check(msg, """
<message> # <message>
<x xmlns="jabber:x:data" type="form"> # <x xmlns="jabber:x:data" type="form">
<field var="f1" type="text-single" label="Text"> # <field var="f1" type="text-single" label="Text">
<desc>A text field</desc> # <desc>A text field</desc>
<required /> # <required />
<value>Some text!</value> # <value>Some text!</value>
<validate xmlns="http://jabber.org/protocol/xdata-validate"> # <validate xmlns="http://jabber.org/protocol/xdata-validate">
<range min="0" max="10" /> # <range min="0" max="10" />
</validate> # </validate>
</field> # </field>
</x> # </x>
</message> # </message>
""") # """)
suite = unittest.TestLoader().loadTestsFromTestCase(TestDataForms) suite = unittest.TestLoader().loadTestsFromTestCase(TestDataForms)