Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/Serializer
diff options
context:
space:
mode:
authorEdwin Mons <edwin.mons@isode.com>2014-05-09 14:25:29 (GMT)
committerEdwin Mons <edwin.mons@isode.com>2014-05-12 08:49:36 (GMT)
commit634555e64572531fece2a955d1168a88c7979d09 (patch)
tree4a7d50488d4adf60b24091e6308e7d4c30b350e7 /Swiften/Serializer
parentafa4aa4a38991fc219d71604baab4d64a2082629 (diff)
downloadswift-contrib-634555e64572531fece2a955d1168a88c7979d09.zip
swift-contrib-634555e64572531fece2a955d1168a88c7979d09.tar.bz2
Add support for <before/> to ResultSet
Change-Id: I46bd9f24fc887b180cee3c2aa75a6c9e1761473b
Diffstat (limited to 'Swiften/Serializer')
-rw-r--r--Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp18
2 files changed, 22 insertions, 0 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp b/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp
index 86d8830..0f464a4 100644
--- a/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp
@@ -13,41 +13,45 @@
using namespace Swift;
ResultSetSerializer::ResultSetSerializer() {
}
ResultSetSerializer::~ResultSetSerializer() {
}
std::string ResultSetSerializer::serializePayload(boost::shared_ptr<ResultSet> payload) const {
if (!payload) {
return "";
}
XMLElement element("set", "http://jabber.org/protocol/rsm");
if (payload->getMaxItems()) {
element.addNode(boost::make_shared<XMLElement>("max", "", boost::lexical_cast<std::string>(*payload->getMaxItems())));
}
if (payload->getCount()) {
element.addNode(boost::make_shared<XMLElement>("count", "", boost::lexical_cast<std::string>(*payload->getCount())));
}
if (payload->getFirstID()) {
boost::shared_ptr<XMLElement> firstElement = boost::make_shared<XMLElement>("first", "", *payload->getFirstID());
if (payload->getFirstIDIndex()) {
firstElement->setAttribute("index", boost::lexical_cast<std::string>(*payload->getFirstIDIndex()));
}
element.addNode(firstElement);
}
if (payload->getLastID()) {
element.addNode(boost::make_shared<XMLElement>("last", "", *payload->getLastID()));
}
+ if (payload->getBefore()) {
+ element.addNode(boost::make_shared<XMLElement>("before", "", *payload->getBefore()));
+ }
+
if (payload->getAfter()) {
element.addNode(boost::make_shared<XMLElement>("after", "", *payload->getAfter()));
}
return element.serialize();
}
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
@@ -1,98 +1,116 @@
/*
* 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/ResultSetSerializer.h>
#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;
boost::shared_ptr<ResultSet> resultSet(boost::make_shared<ResultSet>());
resultSet->setMaxItems(100);
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\">"
"<first>stpeter@jabber.org</first>"
"</set>";
CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(resultSet));
}
void testSerializeFirstWithIndex() {
ResultSetSerializer serializer;
boost::shared_ptr<ResultSet> resultSet(boost::make_shared<ResultSet>());
resultSet->setFirstID(std::string("stpeter@jabber.org"));
resultSet->setFirstIDIndex(123);
std::string expectedResult =
"<set xmlns=\"http://jabber.org/protocol/rsm\">"
"<first index=\"123\">stpeter@jabber.org</first>"
"</set>";
CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(resultSet));
}
};
CPPUNIT_TEST_SUITE_REGISTRATION(ResultSetSerializerTest);