From b249168a5c7dfd4846729dcb79445afc2cf37391 Mon Sep 17 00:00:00 2001 From: Edwin Mons Date: Mon, 19 May 2014 15:08:55 +0200 Subject: Fix serialization of PubSubItem id attribute Extended the serialization unit tests with PubSubItem and PubSubItems test, also added a warning when serializing PubSubItems without a node name. Change-Id: Ie4c4021b1cca593187c4aa333aa43dd34239b1ca diff --git a/Swiften/SConscript b/Swiften/SConscript index 7656c83..7dbb19d 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -480,6 +480,8 @@ if env["SCONS_STAGE"] == "build" : File("Serializer/PayloadSerializers/UnitTest/MAMResultSerializerTest.cpp"), File("Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp"), File("Serializer/PayloadSerializers/UnitTest/MAMArchivedSerializerTest.cpp"), + File("Serializer/PayloadSerializers/UnitTest/PubSubItemSerializerTest.cpp"), + File("Serializer/PayloadSerializers/UnitTest/PubSubItemsSerializerTest.cpp"), File("Serializer/UnitTest/StreamFeaturesSerializerTest.cpp"), File("Serializer/UnitTest/AuthSuccessSerializerTest.cpp"), File("Serializer/UnitTest/AuthChallengeSerializerTest.cpp"), diff --git a/Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.cpp index 707f183..fbd4d53 100644 --- a/Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.cpp @@ -30,7 +30,9 @@ std::string PubSubItemSerializer::serializePayload(boost::shared_ptr foreach(boost::shared_ptr item, payload->getData()) { element.addNode(boost::make_shared(serializers->getPayloadSerializer(item)->serialize(item))); } - element.setAttribute("id", payload->getID()); + if (!payload->getID().empty()) { + element.setAttribute("id", payload->getID()); + } return element.serialize(); } diff --git a/Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.cpp index e2f7d6e..7c6d1f1 100644 --- a/Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include @@ -29,6 +30,9 @@ std::string PubSubItemsSerializer::serializePayload(boost::shared_ptrgetNode().empty()) { + SWIFT_LOG(warning) << "Serializing PubSubItems with empty node attribute"; + } element.setAttribute("node", payload->getNode()); foreach(boost::shared_ptr item, payload->getItems()) { element.addNode(boost::make_shared(PubSubItemSerializer(serializers).serialize(item))); diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemSerializerTest.cpp new file mode 100644 index 0000000..4ece9db --- /dev/null +++ b/Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemSerializerTest.cpp @@ -0,0 +1,59 @@ +/* + * 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 + +#include +#include + +#include +#include +#include +#include + +using namespace Swift; + +class PubSubItemSerializerTest : public CppUnit::TestFixture { + CPPUNIT_TEST_SUITE(PubSubItemSerializerTest); + CPPUNIT_TEST(testSerialize); + CPPUNIT_TEST(testSerializeEmptyID); + CPPUNIT_TEST_SUITE_END(); + + public: + void testSerialize() { + PubSubItemSerializer serializer(&serializers); + + boost::shared_ptr payload(boost::make_shared()); + payload->setRawXML(""); + + boost::shared_ptr item(boost::make_shared()); + item->addData(payload); + item->setID("pubsub-item-1"); + + std::string expectedResult = + "" + "" + ""; + + CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(item)); + } + + void testSerializeEmptyID() { + PubSubItemSerializer serializer(&serializers); + + boost::shared_ptr item(boost::make_shared()); + + std::string expectedResult = + ""; + + CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(item)); + } + + private: + FullPayloadSerializerCollection serializers; +}; + +CPPUNIT_TEST_SUITE_REGISTRATION(PubSubItemSerializerTest); diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemsSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemsSerializerTest.cpp new file mode 100644 index 0000000..dff2bce --- /dev/null +++ b/Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemsSerializerTest.cpp @@ -0,0 +1,77 @@ +/* + * 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 + +#include +#include + +#include +#include +#include +#include + +using namespace Swift; + +class PubSubItemsSerializerTest : public CppUnit::TestFixture { + CPPUNIT_TEST_SUITE(PubSubItemsSerializerTest); + CPPUNIT_TEST(testSerialize); + CPPUNIT_TEST(testSerializeEmptyItems); + CPPUNIT_TEST_SUITE_END(); + + public: + void testSerialize() { + PubSubItemsSerializer serializer(&serializers); + + boost::shared_ptr payload1(boost::make_shared()); + payload1->setRawXML(""); + + boost::shared_ptr item1(boost::make_shared()); + item1->addData(payload1); + item1->setID("pubsub-item-1"); + + boost::shared_ptr payload2(boost::make_shared()); + payload2->setRawXML(""); + + boost::shared_ptr item2(boost::make_shared()); + item2->addData(payload2); + item2->setID("pubsub-item-2"); + + boost::shared_ptr items(boost::make_shared()); + items->setNode("test-node"); + items->setSubscriptionID(std::string("sub-id")); + items->addItem(item1); + items->addItem(item2); + + std::string expectedResult = + "" + "" + "" + "" + "" + "" + "" + ""; + + CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(items)); + } + + void testSerializeEmptyItems() { + PubSubItemsSerializer serializer(&serializers); + + boost::shared_ptr items(boost::make_shared()); + + std::string expectedResult = + ""; + + CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(items)); + } + + private: + FullPayloadSerializerCollection serializers; +}; + +CPPUNIT_TEST_SUITE_REGISTRATION(PubSubItemsSerializerTest); -- cgit v0.10.2-6-g49f6