1 files changed, 18 insertions, 0 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp
index 641b856..354db85 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp
@@ -13,41 +13,44 @@
 #include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
 #include <Swiften/Elements/ResultSet.h>
 
 using namespace Swift;
 
 class ResultSetSerializerTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(ResultSetSerializerTest);
 		CPPUNIT_TEST(testSerializeFull);
 		CPPUNIT_TEST(testSerializeMaxItems);
+		CPPUNIT_TEST(testSerializeEmptyBefore);
 		CPPUNIT_TEST(testSerializeFirst);
 		CPPUNIT_TEST(testSerializeFirstWithIndex);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void testSerializeFull() {
 			ResultSetSerializer serializer;
 
 			boost::shared_ptr<ResultSet> resultSet(boost::make_shared<ResultSet>());
 
 			resultSet->setMaxItems(100);
 			resultSet->setCount(800);
 			resultSet->setFirstIDIndex(123);
 			resultSet->setFirstID(std::string("stpeter@jabber.org"));
 			resultSet->setLastID(std::string("peterpan@neverland.lit"));
 			resultSet->setAfter(std::string("09af3-cc343-b409f"));
+			resultSet->setBefore(std::string("decaf-badba-dbad1"));
 
 			std::string expectedResult = 
 				"<set xmlns=\"http://jabber.org/protocol/rsm\">"
 					"<max>100</max>"
 					"<count>800</count>"
 					"<first index=\"123\">stpeter@jabber.org</first>"
 					"<last>peterpan@neverland.lit</last>"
+					"<before>decaf-badba-dbad1</before>"
 					"<after>09af3-cc343-b409f</after>"
 				"</set>";
 
 			CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(resultSet));
 		}
 
 		void testSerializeMaxItems() {
 			ResultSetSerializer serializer;
 
@@ -57,18 +60,33 @@ class ResultSetSerializerTest : public CppUnit::TestFixture {
 
 			std::string expectedResult = 
 				"<set xmlns=\"http://jabber.org/protocol/rsm\">"
 					"<max>100</max>"
 				"</set>";
 
 			CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(resultSet));
 		}
 
+		void testSerializeEmptyBefore() {
+			ResultSetSerializer serializer;
+
+			boost::shared_ptr<ResultSet> resultSet(boost::make_shared<ResultSet>());
+
+			resultSet->setBefore(std::string());
+
+			std::string expectedResult =
+				"<set xmlns=\"http://jabber.org/protocol/rsm\">"
+					"<before/>"
+				"</set>";
+
+			CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(resultSet));
+		}
+
 		void testSerializeFirst() {
 			ResultSetSerializer serializer;
 
 			boost::shared_ptr<ResultSet> resultSet(boost::make_shared<ResultSet>());
 
 			resultSet->setFirstID(std::string("stpeter@jabber.org"));
 
 			std::string expectedResult = 
 				"<set xmlns=\"http://jabber.org/protocol/rsm\">"