4 files changed, 214 insertions, 6 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/FormSerializer.cpp b/Swiften/Serializer/PayloadSerializers/FormSerializer.cpp
index 7a6bb79..15c4f32 100644
--- a/Swiften/Serializer/PayloadSerializers/FormSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/FormSerializer.cpp
@@ -52,12 +52,27 @@ std::string FormSerializer::serializePayload(boost::shared_ptr<Form> form)  cons
 		multiLineify(form->getInstructions(), "instructions", formElement);
 	}
 	foreach(boost::shared_ptr<FormField> field, form->getFields()) {
-		formElement->addNode(fieldToXML(field));
+		formElement->addNode(fieldToXML(field, true));
 	}
+	if (!form->getReportedFields().empty()) {
+		boost::shared_ptr<XMLElement> reportedElement(new XMLElement("reported"));
+		foreach(FormField::ref field, form->getReportedFields()) {
+			reportedElement->addNode(fieldToXML(field, true));
+		}
+		formElement->addNode(reportedElement);
+	}
+	foreach(Form::FormItem item, form->getItems()) {
+		boost::shared_ptr<XMLElement> itemElement(new XMLElement("item"));
+		foreach(FormField::ref field, item) {
+			itemElement->addNode(fieldToXML(field, false));
+		}
+		formElement->addNode(itemElement);
+	}
+
 	return formElement->serialize();
 }
 
-boost::shared_ptr<XMLElement> FormSerializer::fieldToXML(boost::shared_ptr<FormField> field) const {
+boost::shared_ptr<XMLElement> FormSerializer::fieldToXML(boost::shared_ptr<FormField> field, bool withTypeAttribute) const {
 	boost::shared_ptr<XMLElement> fieldElement(new XMLElement("field"));
 	if (!field->getName().empty()) {
 		fieldElement->setAttribute("var", field->getName());
@@ -115,7 +130,7 @@ boost::shared_ptr<XMLElement> FormSerializer::fieldToXML(boost::shared_ptr<FormF
 		fieldType = "jid-single";
 		boost::shared_ptr<XMLElement> valueElement(new XMLElement("value"));
 		valueElement->addNode(XMLTextNode::create(boost::dynamic_pointer_cast<JIDSingleFormField>(field)->getValue().toString()));
-		fieldElement->addNode(valueElement);
+		if ( boost::dynamic_pointer_cast<JIDSingleFormField>(field)->getValue().isValid()) fieldElement->addNode(valueElement);
 	}
 	else if (boost::dynamic_pointer_cast<ListMultiFormField>(field)) {
 		fieldType = "list-multi";
@@ -133,7 +148,7 @@ boost::shared_ptr<XMLElement> FormSerializer::fieldToXML(boost::shared_ptr<FormF
 	else {
 		assert(false);
 	}
-	if (!fieldType.empty()) {
+	if (!fieldType.empty() && withTypeAttribute) {
 		fieldElement->setAttribute("type", fieldType);
 	}
 
diff --git a/Swiften/Serializer/PayloadSerializers/FormSerializer.h b/Swiften/Serializer/PayloadSerializers/FormSerializer.h
index 43db9e8..d10f649 100644
--- a/Swiften/Serializer/PayloadSerializers/FormSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/FormSerializer.h
@@ -19,7 +19,7 @@ namespace Swift {
 			virtual std::string serializePayload(boost::shared_ptr<Form>)  const;
 
 		private:
-			boost::shared_ptr<XMLElement> fieldToXML(boost::shared_ptr<FormField> field) const;
+			boost::shared_ptr<XMLElement> fieldToXML(boost::shared_ptr<FormField> field, bool withTypeAttribute) const;
 			void multiLineify(const std::string& text, const std::string& elementName, boost::shared_ptr<XMLElement> parent) const;
 	};
 }
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/FormSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/FormSerializerTest.cpp
index 29e7e59..4608522 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/FormSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/FormSerializerTest.cpp
@@ -8,13 +8,13 @@
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include <Swiften/Serializer/PayloadSerializers/FormSerializer.h>
-
 using namespace Swift;
 
 class FormSerializerTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(FormSerializerTest);
 		CPPUNIT_TEST(testSerializeFormInformation);
 		CPPUNIT_TEST(testSerializeFields);
+		CPPUNIT_TEST(testSerializeFormItems);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
@@ -134,6 +134,99 @@ class FormSerializerTest : public CppUnit::TestFixture {
 						"</field>"
 					"</x>"), testling.serialize(form));
 		}
+
+		void testSerializeFormItems() {
+			FormSerializer testling;
+			boost::shared_ptr<Form> form(new Form(Form::ResultType));
+
+
+			FormField::ref field = HiddenFormField::create("jabber:iq:search");
+			field->setName("FORM_TYPE");
+			form->addField(field);
+
+			// reported fields
+			field = TextSingleFormField::create();
+			field->setName("first");
+			field->setLabel("Given Name");
+			form->addReportedField(field);
+
+			field = TextSingleFormField::create();
+			field->setName("last");
+			field->setLabel("Family Name");
+			form->addReportedField(field);
+
+			field = JIDSingleFormField::create();
+			field->setName("jid");
+			field->setLabel("Jabber ID");
+			form->addReportedField(field);
+
+			field = ListSingleFormField::create();
+			field->setName("x-gender");
+			field->setLabel("Gender");
+			form->addReportedField(field);
+
+			Form::FormItem firstItem;
+			field = TextSingleFormField::create("Benvolio");
+			field->setName("first");
+			firstItem.push_back(field);
+
+			field = TextSingleFormField::create("Montague");
+			field->setName("last");
+			firstItem.push_back(field);
+
+			field = JIDSingleFormField::create(JID("benvolio@montague.net"));
+			field->setName("jid");
+			firstItem.push_back(field);
+
+			field = ListSingleFormField::create("male");
+			field->setName("x-gender");
+			firstItem.push_back(field);
+
+			Form::FormItem secondItem;
+			field = TextSingleFormField::create("Romeo");
+			field->setName("first");
+			secondItem.push_back(field);
+
+			field = TextSingleFormField::create("Montague");
+			field->setName("last");
+			secondItem.push_back(field);
+
+			field = JIDSingleFormField::create(JID("romeo@montague.net"));
+			field->setName("jid");
+			secondItem.push_back(field);
+
+			field = ListSingleFormField::create("male");
+			field->setName("x-gender");
+			secondItem.push_back(field);
+
+			form->addItem(firstItem);
+			form->addItem(secondItem);
+
+			CPPUNIT_ASSERT_EQUAL(std::string(
+				"<x type=\"result\" xmlns=\"jabber:x:data\">"
+					"<field type=\"hidden\" var=\"FORM_TYPE\">"
+						"<value>jabber:iq:search</value>"
+					"</field>"
+					"<reported>"
+						"<field label=\"Given Name\" type=\"text-single\" var=\"first\"/>"
+						"<field label=\"Family Name\" type=\"text-single\" var=\"last\"/>"
+						"<field label=\"Jabber ID\" type=\"jid-single\" var=\"jid\"/>"
+						"<field label=\"Gender\" type=\"list-single\" var=\"x-gender\"/>"
+					"</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>"), testling.serialize(form));
+		}
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(FormSerializerTest);
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/SearchPayloadSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/SearchPayloadSerializerTest.cpp
index d0dcbef..42bff72 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/SearchPayloadSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/SearchPayloadSerializerTest.cpp
@@ -15,6 +15,7 @@ class SearchPayloadSerializerTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(SearchPayloadSerializerTest);
 		CPPUNIT_TEST(testSerialize_Request);
 		CPPUNIT_TEST(testSerialize_Items);
+		CPPUNIT_TEST(testSerialize_DataForm);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
@@ -70,6 +71,105 @@ class SearchPayloadSerializerTest : public CppUnit::TestFixture {
 					"</query>"
 				), testling.serialize(payload));
 		}
+
+		void testSerialize_DataForm() {
+			SearchPayloadSerializer testling;
+
+			SearchPayload::ref payload(new SearchPayload());
+			boost::shared_ptr<Form> form(new Form(Form::ResultType));
+
+			FormField::ref field = HiddenFormField::create("jabber:iq:search");
+			field->setName("FORM_TYPE");
+			form->addField(field);
+
+			// reported fields
+			field = TextSingleFormField::create();
+			field->setName("first");
+			field->setLabel("Given Name");
+			form->addReportedField(field);
+
+			field = TextSingleFormField::create();
+			field->setName("last");
+			field->setLabel("Family Name");
+			form->addReportedField(field);
+
+			field = JIDSingleFormField::create();
+			field->setName("jid");
+			field->setLabel("Jabber ID");
+			form->addReportedField(field);
+
+			field = ListSingleFormField::create();
+			field->setName("x-gender");
+			field->setLabel("Gender");
+			form->addReportedField(field);
+
+			Form::FormItem firstItem;
+			field = TextSingleFormField::create("Benvolio");
+			field->setName("first");
+			firstItem.push_back(field);
+
+			field = TextSingleFormField::create("Montague");
+			field->setName("last");
+			firstItem.push_back(field);
+
+			field = TextSingleFormField::create("benvolio@montague.net");
+			field->setName("jid");
+			firstItem.push_back(field);
+
+			field = ListSingleFormField::create("male");
+			field->setName("x-gender");
+			firstItem.push_back(field);
+
+			Form::FormItem secondItem;
+			field = TextSingleFormField::create("Romeo");
+			field->setName("first");
+			secondItem.push_back(field);
+
+			field = TextSingleFormField::create("Montague");
+			field->setName("last");
+			secondItem.push_back(field);
+
+			field = TextSingleFormField::create("romeo@montague.net");
+			field->setName("jid");
+			secondItem.push_back(field);
+
+			field = ListSingleFormField::create("male");
+			field->setName("x-gender");
+			secondItem.push_back(field);
+
+			form->addItem(firstItem);
+			form->addItem(secondItem);
+
+			payload->setForm(form);
+
+			CPPUNIT_ASSERT_EQUAL(std::string(
+				"<query xmlns=\"jabber:iq:search\">"
+					"<x type=\"result\" xmlns=\"jabber:x:data\">"
+						"<field type=\"hidden\" var=\"FORM_TYPE\">"
+							"<value>jabber:iq:search</value>"
+						"</field>"
+						"<reported>"
+							"<field label=\"Given Name\" type=\"text-single\" var=\"first\"/>"
+							"<field label=\"Family Name\" type=\"text-single\" var=\"last\"/>"
+							"<field label=\"Jabber ID\" type=\"jid-single\" var=\"jid\"/>"
+							"<field label=\"Gender\" type=\"list-single\" var=\"x-gender\"/>"
+						"</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>"), testling.serialize(payload));
+
+		}
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SearchPayloadSerializerTest);