Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
| commit | cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch) | |
| tree | 18d94153a302445196fc0c18586abf44a1ce4a38 /Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemsSerializerTest.cpp | |
| parent | 1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff) | |
| download | swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2 | |
Convert tabs to 4 spaces for all source files
Removed trailing spaces and whitespace on empty lines
in the process.
Changed CheckTabs.py tool to disallow hard tabs in source
files.
Test-Information:
Manually checked 30 random files that the conversion worked
as expected.
Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
Diffstat (limited to 'Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemsSerializerTest.cpp')
| -rw-r--r-- | Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemsSerializerTest.cpp | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemsSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemsSerializerTest.cpp index d557a89..fa99202 100644 --- a/Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemsSerializerTest.cpp +++ b/Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemsSerializerTest.cpp @@ -17,61 +17,61 @@ using namespace Swift; class PubSubItemsSerializerTest : public CppUnit::TestFixture { - CPPUNIT_TEST_SUITE(PubSubItemsSerializerTest); - CPPUNIT_TEST(testSerialize); - CPPUNIT_TEST(testSerializeEmptyItems); - CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE(PubSubItemsSerializerTest); + CPPUNIT_TEST(testSerialize); + CPPUNIT_TEST(testSerializeEmptyItems); + CPPUNIT_TEST_SUITE_END(); - public: - void testSerialize() { - PubSubItemsSerializer serializer(&serializers); + public: + void testSerialize() { + PubSubItemsSerializer serializer(&serializers); - boost::shared_ptr<RawXMLPayload> payload1(boost::make_shared<RawXMLPayload>()); - payload1->setRawXML("<payload xmlns=\"tmp\"/>"); + boost::shared_ptr<RawXMLPayload> payload1(boost::make_shared<RawXMLPayload>()); + payload1->setRawXML("<payload xmlns=\"tmp\"/>"); - boost::shared_ptr<PubSubItem> item1(boost::make_shared<PubSubItem>()); - item1->addData(payload1); - item1->setID("pubsub-item-1"); + boost::shared_ptr<PubSubItem> item1(boost::make_shared<PubSubItem>()); + item1->addData(payload1); + item1->setID("pubsub-item-1"); - boost::shared_ptr<RawXMLPayload> payload2(boost::make_shared<RawXMLPayload>()); - payload2->setRawXML("<payload xmlns=\"other-tmp\"/>"); + boost::shared_ptr<RawXMLPayload> payload2(boost::make_shared<RawXMLPayload>()); + payload2->setRawXML("<payload xmlns=\"other-tmp\"/>"); - boost::shared_ptr<PubSubItem> item2(boost::make_shared<PubSubItem>()); - item2->addData(payload2); - item2->setID("pubsub-item-2"); + boost::shared_ptr<PubSubItem> item2(boost::make_shared<PubSubItem>()); + item2->addData(payload2); + item2->setID("pubsub-item-2"); - boost::shared_ptr<PubSubItems> items(boost::make_shared<PubSubItems>()); - items->setNode("test-node"); - items->setSubscriptionID(std::string("sub-id")); - items->addItem(item1); - items->addItem(item2); + boost::shared_ptr<PubSubItems> items(boost::make_shared<PubSubItems>()); + items->setNode("test-node"); + items->setSubscriptionID(std::string("sub-id")); + items->addItem(item1); + items->addItem(item2); - std::string expectedResult = - "<items node=\"test-node\" subid=\"sub-id\" xmlns=\"http://jabber.org/protocol/pubsub\">" - "<item id=\"pubsub-item-1\" xmlns=\"http://jabber.org/protocol/pubsub\">" - "<payload xmlns=\"tmp\"/>" - "</item>" - "<item id=\"pubsub-item-2\" xmlns=\"http://jabber.org/protocol/pubsub\">" - "<payload xmlns=\"other-tmp\"/>" - "</item>" - "</items>"; + std::string expectedResult = + "<items node=\"test-node\" subid=\"sub-id\" xmlns=\"http://jabber.org/protocol/pubsub\">" + "<item id=\"pubsub-item-1\" xmlns=\"http://jabber.org/protocol/pubsub\">" + "<payload xmlns=\"tmp\"/>" + "</item>" + "<item id=\"pubsub-item-2\" xmlns=\"http://jabber.org/protocol/pubsub\">" + "<payload xmlns=\"other-tmp\"/>" + "</item>" + "</items>"; - CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(items)); - } + CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(items)); + } - void testSerializeEmptyItems() { - PubSubItemsSerializer serializer(&serializers); + void testSerializeEmptyItems() { + PubSubItemsSerializer serializer(&serializers); - boost::shared_ptr<PubSubItems> items(boost::make_shared<PubSubItems>()); + boost::shared_ptr<PubSubItems> items(boost::make_shared<PubSubItems>()); - std::string expectedResult = - "<items node=\"\" xmlns=\"http://jabber.org/protocol/pubsub\"/>"; + std::string expectedResult = + "<items node=\"\" xmlns=\"http://jabber.org/protocol/pubsub\"/>"; - CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(items)); - } + CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(items)); + } - private: - FullPayloadSerializerCollection serializers; + private: + FullPayloadSerializerCollection serializers; }; CPPUNIT_TEST_SUITE_REGISTRATION(PubSubItemsSerializerTest); |