2 files changed, 64 insertions, 41 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MAMArchivedSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MAMArchivedSerializerTest.cpp
deleted file mode 100644
index 2bd5c6a..0000000
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/MAMArchivedSerializerTest.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2014 Kevin Smith and Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#include <boost/smart_ptr/make_shared.hpp>
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-
-#include <Swiften/Base/DateTime.h>
-#include <Swiften/Serializer/PayloadSerializers/MAMArchivedSerializer.h>
-#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
-
-using namespace Swift;
-
-class MAMArchivedSerializerTest : public CppUnit::TestFixture {
-		CPPUNIT_TEST_SUITE(MAMArchivedSerializerTest);
-		CPPUNIT_TEST(testSerialize);
-		CPPUNIT_TEST_SUITE_END();
-
-	public:
-		void testSerialize() {
-			MAMArchivedSerializer serializer;
-
-			boost::shared_ptr<MAMArchived> archived(boost::make_shared<MAMArchived>());
-			archived->setBy("juliet@capulet.lit");
-			archived->setID("28482-98726-73623");
-
-			std::string expectedResult =
-				"<archived by=\"juliet@capulet.lit\" id=\"28482-98726-73623\" xmlns=\"urn:xmpp:mam:0\"/>";
-
-			CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(archived));
-		}
-
-	private:
-		FullPayloadSerializerCollection serializers;
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(MAMArchivedSerializerTest);
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MAMFinSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MAMFinSerializerTest.cpp
new file mode 100644
index 0000000..372af97
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/MAMFinSerializerTest.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2014 Kevin Smith and Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <boost/smart_ptr/make_shared.hpp>
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
+#include <Swiften/Serializer/PayloadSerializers/MAMFinSerializer.h>
+#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
+
+using namespace Swift;
+
+class MAMFinSerializerTest : public CppUnit::TestFixture {
+		CPPUNIT_TEST_SUITE(MAMFinSerializerTest);
+		CPPUNIT_TEST(testSerialize_XEP0313_Exmaple1);
+		CPPUNIT_TEST(testSerialize_XEP0313_Exmaple9);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		void testSerialize_XEP0313_Exmaple1() {
+			MAMFinSerializer serializer;
+
+			boost::shared_ptr<MAMFin> fin = boost::make_shared<MAMFin>();
+			fin->setQueryID("f27");
+
+			std::string expectedResult = 
+				"<fin queryid=\"f27\" xmlns=\"urn:xmpp:mam:0\"/>";
+			CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(fin));
+		}
+
+		void testSerialize_XEP0313_Exmaple9() {
+			MAMFinSerializer serializer;
+
+			boost::shared_ptr<MAMFin> fin = boost::make_shared<MAMFin>();
+			fin->setComplete(true);
+
+			boost::shared_ptr<ResultSet> set = boost::make_shared<ResultSet>();
+			set->setFirstID(std::string("23452-4534-1"));
+			set->setFirstIDIndex(0);
+			set->setLastID(std::string("390-2342-22"));
+			set->setCount(16);
+
+			fin->setResultSet(set);
+
+			std::string expectedResult = 
+				"<fin complete=\"true\" xmlns=\"urn:xmpp:mam:0\">"
+					"<set xmlns=\"http://jabber.org/protocol/rsm\">"
+						"<count>16</count>"
+						"<first index=\"0\">23452-4534-1</first>"
+						"<last>390-2342-22</last>"
+					"</set>"
+				"</fin>";
+			CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(fin));
+		}
+
+	private:
+		FullPayloadSerializerCollection serializers;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(MAMFinSerializerTest);