Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2014-10-30 09:22:16 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-10-30 22:40:07 (GMT) |
| commit | 9b762e1cf26cfe12cf601d9ea95cf91b3f95c799 (patch) | |
| tree | 854e8e602a1e98b38d66cc716f4ef878620d531b /Swiften/Serializer | |
| parent | 8096f80861667381b777af774cfd446d6fc8cda8 (diff) | |
| download | swift-9b762e1cf26cfe12cf601d9ea95cf91b3f95c799.zip swift-9b762e1cf26cfe12cf601d9ea95cf91b3f95c799.tar.bz2 | |
Add node attribute to MAMQuery
Added node to MAMQuery, the serializers, unit tests and the Sluift
ElementConvertor.
Test-Information:
Unit tests pass on OS X 10.9
Sluift script querying a pubsub archive sent the right query.
Change-Id: If8620104a11b402d7b51a6e9b34ccbe1b7e6d15a
Diffstat (limited to 'Swiften/Serializer')
| -rw-r--r-- | Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.cpp | 4 | ||||
| -rw-r--r-- | Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.cpp b/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.cpp index 6a12f8e..591e73c 100644 --- a/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.cpp @@ -33,6 +33,10 @@ std::string MAMQuerySerializer::serializePayload(boost::shared_ptr<MAMQuery> pay element.setAttribute("queryid", *payload->getQueryID()); } + if (payload->getNode()) { + element.setAttribute("node", *payload->getNode()); + } + if (payload->getForm()) { element.addNode(boost::make_shared<XMLRawTextNode>(FormSerializer().serialize(payload->getForm()))); } diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp index 7f6cbd9..1d695cd 100644 --- a/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp +++ b/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp @@ -44,11 +44,12 @@ class MAMQuerySerializerTest : public CppUnit::TestFixture { boost::shared_ptr<MAMQuery> query(boost::make_shared<MAMQuery>()); query->setQueryID(std::string("id0")); + query->setNode(std::string("node1")); query->setForm(parameters); query->setResultSet(set); std::string expectedResult = - "<query queryid=\"id0\" xmlns=\"urn:xmpp:mam:0\">" + "<query node=\"node1\" queryid=\"id0\" xmlns=\"urn:xmpp:mam:0\">" "<x type=\"form\" xmlns=\"jabber:x:data\">" "<field type=\"text-single\" var=\"FORM_TYPE\">" "<value>urn:xmpp:mam:0</value>" |