2 files changed, 77 insertions, 4 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/RosterItemExchangeSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/RosterItemExchangeSerializerTest.cpp
new file mode 100644
index 0000000..f4de783
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/RosterItemExchangeSerializerTest.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2011 Jan Kaluza
+ * Licensed under the Simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include "Swiften/Serializer/PayloadSerializers/RosterItemExchangeSerializer.h"
+
+using namespace Swift;
+
+class RosterItemExchangeSerializerTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(RosterItemExchangeSerializerTest);
+		CPPUNIT_TEST(testSerialize);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		RosterItemExchangeSerializerTest() {}
+
+		void testSerialize() {
+			RosterItemExchangeSerializer testling;
+			boost::shared_ptr<RosterItemExchangePayload> roster(new RosterItemExchangePayload());
+
+			RosterItemExchangePayload::Item item1;
+			item1.setJID("foo@bar.com");
+			item1.setName("Foo @ Bar");
+			item1.setAction(RosterItemExchangePayload::Item::Add);
+			item1.addGroup("Group 1");
+			item1.addGroup("Group 2");
+			roster->addItem(item1);
+
+			RosterItemExchangePayload::Item item2;
+			item2.setJID("baz@blo.com");
+			item2.setName("Baz");
+			item2.setAction(RosterItemExchangePayload::Item::Modify);
+			roster->addItem(item2);
+
+			std::string expectedResult = 
+				"<x xmlns=\"http://jabber.org/protocol/rosterx\">"
+					"<item action=\"add\" jid=\"foo@bar.com\" name=\"Foo @ Bar\">"
+						"<group>Group 1</group>"
+						"<group>Group 2</group>"
+					"</item>"
+					"<item action=\"modify\" jid=\"baz@blo.com\" name=\"Baz\"/>"
+				"</x>";
+
+			CPPUNIT_ASSERT_EQUAL(expectedResult, testling.serialize(roster));
+		}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(RosterItemExchangeSerializerTest);
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/RosterSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/RosterSerializerTest.cpp
index b8ceac3..61316df 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/RosterSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/RosterSerializerTest.cpp
@@ -11,16 +11,15 @@
 
 using namespace Swift;
 
-class RosterSerializerTest : public CppUnit::TestFixture
-{
+class RosterSerializerTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(RosterSerializerTest);
 		CPPUNIT_TEST(testSerialize);
 		CPPUNIT_TEST(testSerialize_ItemWithUnknownContent);
+		CPPUNIT_TEST(testSerialize_WithVersion);
+		CPPUNIT_TEST(testSerialize_WithEmptyVersion);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
-		RosterSerializerTest() {}
-
 		void testSerialize() {
 			RosterSerializer testling;
 			boost::shared_ptr<RosterPayload> roster(new RosterPayload());
@@ -77,6 +76,26 @@ class RosterSerializerTest : public CppUnit::TestFixture
 
 			CPPUNIT_ASSERT_EQUAL(expectedResult, testling.serialize(roster));
 		}
+
+		void testSerialize_WithVersion() {
+			RosterSerializer testling;
+			boost::shared_ptr<RosterPayload> roster(new RosterPayload());
+			roster->setVersion("ver20");
+
+			std::string expectedResult = "<query ver=\"ver20\" xmlns=\"jabber:iq:roster\"/>";
+
+			CPPUNIT_ASSERT_EQUAL(expectedResult, testling.serialize(roster));
+		}
+
+		void testSerialize_WithEmptyVersion() {
+			RosterSerializer testling;
+			boost::shared_ptr<RosterPayload> roster(new RosterPayload());
+			roster->setVersion("");
+
+			std::string expectedResult = "<query ver=\"\" xmlns=\"jabber:iq:roster\"/>";
+
+			CPPUNIT_ASSERT_EQUAL(expectedResult, testling.serialize(roster));
+		}
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(RosterSerializerTest);