2 files changed, 177 insertions, 0 deletions
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/FormParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/FormParserTest.cpp
index 86845be..c36fbeb 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/FormParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/FormParserTest.cpp
@@ -1,53 +1,54 @@
 /*
  * Copyright (c) 2010 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include <Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h>
 #include <Swiften/Elements/Form.h>
 
 using namespace Swift;
 
 class FormParserTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(FormParserTest);
 		CPPUNIT_TEST(testParse_FormInformation);
 		CPPUNIT_TEST(testParse);
+		CPPUNIT_TEST(testParse_FormItems);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void testParse_FormInformation() {
 			PayloadsParserTester parser;
 
 			CPPUNIT_ASSERT(parser.parse(
 				"<x type=\"submit\" xmlns=\"jabber:x:data\">"
 						"<title>Bot Configuration</title>"
 						"<instructions>Hello!</instructions>"
 						"<instructions>Fill out this form to configure your new bot!</instructions>"
 					"</x>"
 				));
 
 			Form* payload = dynamic_cast<Form*>(parser.getPayload().get());
 			CPPUNIT_ASSERT_EQUAL(std::string("Bot Configuration"), payload->getTitle());
 			CPPUNIT_ASSERT_EQUAL(std::string("Hello!\nFill out this form to configure your new bot!"), payload->getInstructions());
 			CPPUNIT_ASSERT_EQUAL(Form::SubmitType, payload->getType());
 		}
 
 		void testParse() {
 			PayloadsParserTester parser;
 
 			CPPUNIT_ASSERT(parser.parse(
 				"<x type=\"form\" xmlns=\"jabber:x:data\">"
 						"<field type=\"hidden\" var=\"FORM_TYPE\">"
 							"<value>jabber:bot</value>"
 						"</field>"
 						"<field type=\"fixed\"><value>Section 1: Bot Info</value></field>"
 						"<field label=\"The name of your bot\" type=\"text-single\" var=\"botname\"/>"
 						"<field label=\"Helpful description of your bot\" type=\"text-multi\" var=\"description\"><value>This is a bot.</value><value>A quite good one actually</value></field>"
 						"<field label=\"Public bot?\" type=\"boolean\" var=\"public\">"
 							"<required/>"
 							"<value>1</value>"
 						"</field>"
@@ -83,38 +84,104 @@ class FormParserTest : public CppUnit::TestFixture {
 			Form* payload = dynamic_cast<Form*>(parser.getPayload().get());
 
 			CPPUNIT_ASSERT_EQUAL(10, static_cast<int>(payload->getFields().size()));
 			CPPUNIT_ASSERT_EQUAL(std::string("jabber:bot"), boost::dynamic_pointer_cast<HiddenFormField>(payload->getFields()[0])->getValue());
 			CPPUNIT_ASSERT_EQUAL(std::string("FORM_TYPE"), payload->getFields()[0]->getName());
 			CPPUNIT_ASSERT(!payload->getFields()[0]->getRequired());
 
 			CPPUNIT_ASSERT_EQUAL(std::string("Section 1: Bot Info"), boost::dynamic_pointer_cast<FixedFormField>(payload->getFields()[1])->getValue());
 
 			CPPUNIT_ASSERT_EQUAL(std::string("The name of your bot"), payload->getFields()[2]->getLabel());
 
 			CPPUNIT_ASSERT_EQUAL(std::string("This is a bot.\nA quite good one actually"), boost::dynamic_pointer_cast<TextMultiFormField>(payload->getFields()[3])->getValue());
 
 			CPPUNIT_ASSERT_EQUAL(true, boost::dynamic_pointer_cast<BooleanFormField>(payload->getFields()[4])->getValue());
 			CPPUNIT_ASSERT(payload->getFields()[4]->getRequired());
 			CPPUNIT_ASSERT_EQUAL(std::string("1"),  boost::dynamic_pointer_cast<BooleanFormField>(payload->getFields()[4])->getRawValues()[0]);
 
 			CPPUNIT_ASSERT_EQUAL(std::string("news"), boost::dynamic_pointer_cast<ListMultiFormField>(payload->getFields()[6])->getValue()[0]);
 			CPPUNIT_ASSERT_EQUAL(std::string("news"), payload->getFields()[6]->getRawValues()[0]);
 			CPPUNIT_ASSERT_EQUAL(std::string("search"), boost::dynamic_pointer_cast<ListMultiFormField>(payload->getFields()[6])->getValue()[1]);
 			CPPUNIT_ASSERT_EQUAL(std::string("search"), payload->getFields()[6]->getRawValues()[1]);
 			CPPUNIT_ASSERT_EQUAL(5, static_cast<int>(payload->getFields()[6]->getOptions().size()));
 			CPPUNIT_ASSERT_EQUAL(std::string("Contests"), payload->getFields()[6]->getOptions()[0].label);
 			CPPUNIT_ASSERT_EQUAL(std::string("contests"), payload->getFields()[6]->getOptions()[0].value);
 			CPPUNIT_ASSERT_EQUAL(std::string("News"), payload->getFields()[6]->getOptions()[1].label);
 			CPPUNIT_ASSERT_EQUAL(std::string("news"), payload->getFields()[6]->getOptions()[1].value);
 
 			CPPUNIT_ASSERT_EQUAL(std::string("20"), boost::dynamic_pointer_cast<ListSingleFormField>(payload->getFields()[7])->getValue());
 
 			CPPUNIT_ASSERT_EQUAL(JID("foo@bar.com"), boost::dynamic_pointer_cast<JIDMultiFormField>(payload->getFields()[8])->getValue()[0]);
 			CPPUNIT_ASSERT_EQUAL(JID("baz@fum.org"), boost::dynamic_pointer_cast<JIDMultiFormField>(payload->getFields()[8])->getValue()[1]);
 			CPPUNIT_ASSERT_EQUAL(std::string("Tell all your friends about your new bot!"), payload->getFields()[8]->getDescription());
 
 			CPPUNIT_ASSERT_EQUAL(std::string("foo"), boost::dynamic_pointer_cast<TextSingleFormField>(payload->getFields()[9])->getValue());
 		}
+
+		void testParse_FormItems() {
+			PayloadsParserTester parser;
+
+			CPPUNIT_ASSERT(parser.parse(
+				"<x xmlns='jabber:x:data' type='result'>"
+					"<field type='hidden' var='FORM_TYPE'>"
+						"<value>jabber:iq:search</value>"
+					"</field>"
+					"<reported>"
+						"<field var='first' label='Given Name' type='text-single'/>"
+						"<field var='last' label='Family Name' type='text-single'/>"
+						"<field var='jid' label='Jabber ID' type='jid-single'/>"
+						"<field var='x-gender' label='Gender' type='list-single'/>"
+					"</reported>"
+					"<item>"
+						"<field var='first'><value>Benvolio</value></field>"
+						"<field var='last'><value>Montague</value></field>"
+						"<field var='jid'><value>benvolio@montague.net</value></field>"
+						"<field var='x-gender'><value>male</value></field>"
+					"</item>"
+					"<item>"
+						"<field var='first'><value>Romeo</value></field>"
+						"<field var='last'><value>Montague</value></field>"
+						"<field var='jid'><value>romeo@montague.net</value></field>"
+						"<field var='x-gender'><value>male</value></field>"
+					"</item>"
+				"</x>"));
+
+			Form* dataForm = dynamic_cast<Form*>(parser.getPayload().get());
+			CPPUNIT_ASSERT(dataForm);
+
+			Form::FormItem reported = dataForm->getReportedFields();
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(4), reported.size());
+
+			std::vector<Form::FormItem> items = dataForm->getItems();
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), items.size());
+
+			Form::FormItem item = items[0];
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(4), item.size());
+
+			CPPUNIT_ASSERT_EQUAL(std::string("Benvolio"), item[0]->getRawValues()[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("first"), item[0]->getName());
+			CPPUNIT_ASSERT_EQUAL(std::string("Montague"), item[1]->getRawValues()[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("last"), item[1]->getName());
+			JIDSingleFormField::ref jidField = boost::dynamic_pointer_cast<JIDSingleFormField>(item[2]);
+			CPPUNIT_ASSERT(jidField);
+			CPPUNIT_ASSERT_EQUAL(JID("benvolio@montague.net"), jidField->getValue());
+			CPPUNIT_ASSERT_EQUAL(std::string("jid"), item[2]->getName());
+			CPPUNIT_ASSERT_EQUAL(std::string("male"), item[3]->getRawValues()[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("x-gender"), item[3]->getName());
+
+			item = items[1];
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(4), item.size());
+
+			CPPUNIT_ASSERT_EQUAL(std::string("Romeo"), item[0]->getRawValues()[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("first"), item[0]->getName());
+			CPPUNIT_ASSERT_EQUAL(std::string("Montague"), item[1]->getRawValues()[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("last"), item[1]->getName());
+			jidField = boost::dynamic_pointer_cast<JIDSingleFormField>(item[2]);
+			CPPUNIT_ASSERT(jidField);
+			CPPUNIT_ASSERT_EQUAL(JID("romeo@montague.net"), jidField->getValue());
+			CPPUNIT_ASSERT_EQUAL(std::string("jid"), item[2]->getName());
+			CPPUNIT_ASSERT_EQUAL(std::string("male"), item[3]->getRawValues()[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("x-gender"), item[3]->getName());
+		}
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(FormParserTest);
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/SearchPayloadParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/SearchPayloadParserTest.cpp
index c07cd7f..ef48ced 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/SearchPayloadParserTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/SearchPayloadParserTest.cpp
@@ -1,71 +1,181 @@
 /*
  * Copyright (c) 2010 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include <Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h>
 #include <Swiften/Elements/SearchPayload.h>
 
 using namespace Swift;
 
 class SearchPayloadParserTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(SearchPayloadParserTest);
 		CPPUNIT_TEST(testParse_FormRequestResponse);
 		CPPUNIT_TEST(testParse_Results);
+		CPPUNIT_TEST(testParse_FormRequestResponse_XDATA);
+		CPPUNIT_TEST(testParse_Results_XDATA);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void testParse_FormRequestResponse() {
 			PayloadsParserTester parser;
 
 			CPPUNIT_ASSERT(parser.parse(
 					"<query xmlns=\"jabber:iq:search\">"
 						"<instructions>Foo</instructions>"
 						"<first/>"
 						"<last/>"
 					"</query>"
 				));
 
 			SearchPayload::ref payload = parser.getPayload<SearchPayload>();
 			CPPUNIT_ASSERT_EQUAL(std::string("Foo"), *payload->getInstructions());
 			CPPUNIT_ASSERT(payload->getFirst());
 			CPPUNIT_ASSERT(payload->getLast());
 			CPPUNIT_ASSERT(!payload->getNick());
 		}
 
 		void testParse_Results() {
 			PayloadsParserTester parser;
 
 			CPPUNIT_ASSERT(parser.parse(
 					"<query xmlns=\"jabber:iq:search\">"
 						"<item jid=\"juliet@capulet.com\">"
 							"<first>Juliet</first>"
 							"<last>Capulet</last>"
 							"<nick>JuliC</nick>"
 							"<email>juliet@shakespeare.lit</email>"
 						"</item>"
 						"<item jid=\"tybalt@shakespeare.lit\">"
 							"<first>Tybalt</first>"
 							"<last>Capulet</last>"
 							"<nick>ty</nick>"
 							"<email>tybalt@shakespeare.lit</email>"
 						"</item>"
 					"</query>"
 				));
 
 			SearchPayload::ref payload = parser.getPayload<SearchPayload>();
 			CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(payload->getItems().size()));
 			CPPUNIT_ASSERT_EQUAL(JID("juliet@capulet.com"), payload->getItems()[0].jid);
 			CPPUNIT_ASSERT_EQUAL(std::string("Juliet"), payload->getItems()[0].first);
 			CPPUNIT_ASSERT_EQUAL(std::string("Capulet"), payload->getItems()[0].last);
 			CPPUNIT_ASSERT_EQUAL(std::string("JuliC"), payload->getItems()[0].nick);
 			CPPUNIT_ASSERT_EQUAL(std::string("juliet@shakespeare.lit"), payload->getItems()[0].email);
 			CPPUNIT_ASSERT_EQUAL(JID("tybalt@shakespeare.lit"), payload->getItems()[1].jid);
 		}
+
+		void testParse_FormRequestResponse_XDATA() {
+			PayloadsParserTester parser;
+
+			CPPUNIT_ASSERT(parser.parse(
+							"<query xmlns='jabber:iq:search'>"
+								"<instructions>"
+									"Use the enclosed form to search. If your Jabber client does not"
+									" support Data Forms, visit http://shakespeare.lit/"
+								"</instructions>"
+								"<x xmlns='jabber:x:data' type='form'>"
+									"<title>User Directory Search</title>"
+									"<instructions>"
+										"Please provide the following information"
+										" to search for Shakespearean characters."
+									"</instructions>"
+									"<field type='hidden'"
+										" var='FORM_TYPE'>"
+										"<value>jabber:iq:search</value>"
+									"</field>"
+									"<field type='text-single'"
+									" label='Given Name'"
+									" var='first'/>"
+									"<field type='text-single'"
+									" label='Family Name'"
+									" var='last'/>"
+									"<field type='list-single'"
+									" label='Gender'"
+									" var='x-gender'>"
+										"<option label='Male'><value>male</value></option>"
+										"<option label='Female'><value>female</value></option>"
+									"</field>"
+								"</x>"
+							"</query>"
+				));
+
+			SearchPayload::ref payload = parser.getPayload<SearchPayload>();
+			CPPUNIT_ASSERT_EQUAL(std::string("Use the enclosed form to search. If your Jabber client does not"
+											 " support Data Forms, visit http://shakespeare.lit/"), *payload->getInstructions());
+			CPPUNIT_ASSERT(payload->getForm());
+			CPPUNIT_ASSERT_EQUAL(std::string("Please provide the following information"
+											 " to search for Shakespearean characters."), payload->getForm()->getInstructions());
+		}
+
+		void testParse_Results_XDATA() {
+			PayloadsParserTester parser;
+
+			CPPUNIT_ASSERT(parser.parse("<query xmlns='jabber:iq:search'>"
+										"	<x xmlns='jabber:x:data' type='result'>"
+										"		<field type='hidden' var='FORM_TYPE'>"
+										"			<value>jabber:iq:search</value>"
+										"		</field>"
+										"		<reported>"
+										"			<field var='first' label='Given Name' type='text-single'/>"
+										"			<field var='last' label='Family Name' type='text-single'/>"
+										"			<field var='jid' label='Jabber ID' type='jid-single'/>"
+										"			<field var='x-gender' label='Gender' type='list-single'/>"
+										"		</reported>"
+										"		<item>"
+										"			<field var='first'><value>Benvolio</value></field>"
+										"			<field var='last'><value>Montague</value></field>"
+										"			<field var='jid'><value>benvolio@montague.net</value></field>"
+										"			<field var='x-gender'><value>male</value></field>"
+										"		</item>"
+										"		<item>"
+										"			<field var='first'><value>Romeo</value></field>"
+										"			<field var='last'><value>Montague</value></field>"
+										"			<field var='jid'><value>romeo@montague.net</value></field>"
+										"			<field var='x-gender'><value>male</value></field>"
+										"		</item>"
+										"	</x>"
+										"</query>"));
+			SearchPayload::ref payload = parser.getPayload<SearchPayload>();
+			CPPUNIT_ASSERT(payload);
+
+			Form::ref dataForm = payload->getForm();
+			CPPUNIT_ASSERT(dataForm);
+
+			Form::FormItem reported = dataForm->getReportedFields();
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(4), reported.size());
+
+			std::vector<Form::FormItem> items = dataForm->getItems();
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), items.size());
+
+			Form::FormItem item = items[0];
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(4), item.size());
+
+			CPPUNIT_ASSERT_EQUAL(std::string("Benvolio"), item[0]->getRawValues()[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("first"), item[0]->getName());
+			CPPUNIT_ASSERT_EQUAL(std::string("Montague"), item[1]->getRawValues()[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("last"), item[1]->getName());
+			CPPUNIT_ASSERT_EQUAL(std::string("benvolio@montague.net"), item[2]->getRawValues()[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("jid"), item[2]->getName());
+			CPPUNIT_ASSERT_EQUAL(std::string("male"), item[3]->getRawValues()[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("x-gender"), item[3]->getName());
+
+			item = items[1];
+			CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(4), item.size());
+
+			CPPUNIT_ASSERT_EQUAL(std::string("Romeo"), item[0]->getRawValues()[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("first"), item[0]->getName());
+			CPPUNIT_ASSERT_EQUAL(std::string("Montague"), item[1]->getRawValues()[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("last"), item[1]->getName());
+			CPPUNIT_ASSERT_EQUAL(std::string("romeo@montague.net"), item[2]->getRawValues()[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("jid"), item[2]->getName());
+			CPPUNIT_ASSERT_EQUAL(std::string("male"), item[3]->getRawValues()[0]);
+			CPPUNIT_ASSERT_EQUAL(std::string("x-gender"), item[3]->getName());
+		}
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SearchPayloadParserTest);