Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2014-05-09 14:25:29 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2014-05-12 08:49:36 (GMT) |
| commit | 634555e64572531fece2a955d1168a88c7979d09 (patch) | |
| tree | 4a7d50488d4adf60b24091e6308e7d4c30b350e7 /Swiften | |
| parent | afa4aa4a38991fc219d71604baab4d64a2082629 (diff) | |
| download | swift-634555e64572531fece2a955d1168a88c7979d09.zip swift-634555e64572531fece2a955d1168a88c7979d09.tar.bz2 | |
Add support for <before/> to ResultSet
Change-Id: I46bd9f24fc887b180cee3c2aa75a6c9e1761473b
Diffstat (limited to 'Swiften')
5 files changed, 31 insertions, 0 deletions
diff --git a/Swiften/Elements/ResultSet.h b/Swiften/Elements/ResultSet.h index 871b699..e84be35 100644 --- a/Swiften/Elements/ResultSet.h +++ b/Swiften/Elements/ResultSet.h @@ -30,6 +30,9 @@ namespace Swift { void setLastID(const boost::optional<std::string>& lastID) { lastID_ = lastID; } const boost::optional<std::string>& getLastID() const { return lastID_; } + void setBefore(const boost::optional<std::string>& before) { before_ = before; } + const boost::optional<std::string>& getBefore() const { return before_; } + void setAfter(const boost::optional<std::string>& after) { after_ = after; } const boost::optional<std::string>& getAfter() const { return after_; } @@ -39,6 +42,7 @@ namespace Swift { boost::optional<int> firstIndex_; boost::optional<std::string> firstID_; boost::optional<std::string> lastID_; + boost::optional<std::string> before_; boost::optional<std::string> after_; }; } diff --git a/Swiften/Parser/PayloadParsers/ResultSetParser.cpp b/Swiften/Parser/PayloadParsers/ResultSetParser.cpp index 95960d7..4c8283b 100644 --- a/Swiften/Parser/PayloadParsers/ResultSetParser.cpp +++ b/Swiften/Parser/PayloadParsers/ResultSetParser.cpp @@ -47,6 +47,8 @@ void ResultSetParser::handleEndElement(const std::string& element, const std::st getPayloadInternal()->setFirstID(currentText_); } else if (element == "last") { getPayloadInternal()->setLastID(currentText_); + } else if (element == "before") { + getPayloadInternal()->setBefore(currentText_); } else if (element == "after") { getPayloadInternal()->setAfter(currentText_); } diff --git a/Swiften/Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp index 68df71b..e345323 100644 --- a/Swiften/Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp +++ b/Swiften/Parser/PayloadParsers/UnitTest/ResultSetParserTest.cpp @@ -28,6 +28,7 @@ class ResultSetParserTest : public CppUnit::TestFixture "<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>")); @@ -43,6 +44,8 @@ class ResultSetParserTest : public CppUnit::TestFixture CPPUNIT_ASSERT_EQUAL(123, *payload->getFirstIDIndex()); CPPUNIT_ASSERT(payload->getLastID()); CPPUNIT_ASSERT_EQUAL(std::string("peterpan@neverland.lit"), *payload->getLastID()); + CPPUNIT_ASSERT(payload->getBefore()); + CPPUNIT_ASSERT_EQUAL(std::string("decaf-badba-dbad1"), *payload->getBefore()); CPPUNIT_ASSERT(payload->getAfter()); CPPUNIT_ASSERT_EQUAL(std::string("09af3-cc343-b409f"), *payload->getAfter()); } 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 @@ -45,6 +45,10 @@ std::string ResultSetSerializer::serializePayload(boost::shared_ptr<ResultSet> p 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())); } 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 @@ -19,6 +19,7 @@ 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(); @@ -35,6 +36,7 @@ class ResultSetSerializerTest : public CppUnit::TestFixture { 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\">" @@ -42,6 +44,7 @@ class ResultSetSerializerTest : public CppUnit::TestFixture { "<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>"; @@ -63,6 +66,21 @@ class ResultSetSerializerTest : public CppUnit::TestFixture { 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; |