summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Mons <edwin.mons@isode.com>2016-09-22 10:09:49 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-10-19 19:11:45 (GMT)
commit08a340dbfc9208d1c0e6d574fed244a98e104f01 (patch)
tree936263f06740ee377928c18abdc4ee0a156bcf44 /Sluift/Tests
parentbcd3660a3527327117b46e104d16204a64fe0b9f (diff)
downloadswift-08a340dbfc9208d1c0e6d574fed244a98e104f01.zip
swift-08a340dbfc9208d1c0e6d574fed244a98e104f01.tar.bz2
Always add a fields table member in FormConvertor
The fields member of the forms generated by FormConvertor is used for lookups in the __index metafunction. If a form is parsed with no fields (and possibly no items), there wouldn't be a member 'fields', causing another __index lookup, triggering infinite recursion. There will now always be a fields array, which may be empty. Sluift/Tests/FormTest.lua has been updated to test against an empty form. Test-Information: Updated FormTest.lua works without issues. Change-Id: Idee98f23bf42e1213ca3d03707f908ed5317dad6
Diffstat (limited to 'Sluift/Tests')
-rw-r--r--Sluift/Tests/FormTest.lua14
1 files changed, 13 insertions, 1 deletions
diff --git a/Sluift/Tests/FormTest.lua b/Sluift/Tests/FormTest.lua
index 8065360..d584646 100644
--- a/Sluift/Tests/FormTest.lua
+++ b/Sluift/Tests/FormTest.lua
@@ -1,5 +1,5 @@
--[[
- Copyright (c) 2013 Isode Limited.
+ Copyright (c) 2013-2016 Isode Limited.
All rights reserved.
See the COPYING file for more information.
--]]
@@ -90,3 +90,15 @@ assert(type(text_multi_field['value']) == 'table')
--print(sluift.to_xml({type = 'form', data = form}))
+
+-- test parsing an empty form -- this had issues as reported in SWIFT-174
+empty_form = [[<x xmlns='jabber:x:data' type='form'/>]]
+form = sluift.from_xml(empty_form)
+-- and check if we can access all fields without problems
+assert(type(form._type))
+assert(type(form.title))
+assert(type(form.instructions))
+assert(type(form.type))
+assert(type(form.fields))
+assert(type(form.items))
+assert(type(form.reported_items))