diff 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/UserTuneSerializerTest.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/UserTuneSerializerTest.cpp')
-rw-r--r-- | Swiften/Serializer/PayloadSerializers/UnitTest/UserTuneSerializerTest.cpp | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/UserTuneSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/UserTuneSerializerTest.cpp index 6e2fc8b..50f2a54 100644 --- a/Swiften/Serializer/PayloadSerializers/UnitTest/UserTuneSerializerTest.cpp +++ b/Swiften/Serializer/PayloadSerializers/UnitTest/UserTuneSerializerTest.cpp @@ -17,53 +17,53 @@ #include <Swiften/Base/DateTime.h> #include <Swiften/Elements/UserTune.h> -#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h> +#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h> #include <Swiften/Serializer/PayloadSerializers/UserTuneSerializer.h> using namespace Swift; class UserTuneSerializerTest : public CppUnit::TestFixture { - CPPUNIT_TEST_SUITE(UserTuneSerializerTest); - CPPUNIT_TEST(testSerialize_withAllVariablesSet); - CPPUNIT_TEST(testSerialize_withSomeVariablesSet); - CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE(UserTuneSerializerTest); + CPPUNIT_TEST(testSerialize_withAllVariablesSet); + CPPUNIT_TEST(testSerialize_withSomeVariablesSet); + CPPUNIT_TEST_SUITE_END(); - public: - void testSerialize_withAllVariablesSet() { - UserTuneSerializer testling(&serializers); - boost::shared_ptr<UserTune> userTune(new UserTune()); - userTune->setRating(5); - userTune->setTitle(boost::optional<std::string>("Minion")); - userTune->setTrack(boost::optional<std::string>("Yellow")); - userTune->setArtist(boost::optional<std::string>("Ice")); - userTune->setURI(boost::optional<std::string>("Fire")); - userTune->setSource(boost::optional<std::string>("Origin")); - userTune->setLength(226); + public: + void testSerialize_withAllVariablesSet() { + UserTuneSerializer testling(&serializers); + boost::shared_ptr<UserTune> userTune(new UserTune()); + userTune->setRating(5); + userTune->setTitle(boost::optional<std::string>("Minion")); + userTune->setTrack(boost::optional<std::string>("Yellow")); + userTune->setArtist(boost::optional<std::string>("Ice")); + userTune->setURI(boost::optional<std::string>("Fire")); + userTune->setSource(boost::optional<std::string>("Origin")); + userTune->setLength(226); - std::string expectedResult = - "<tune xmlns=\"http://jabber.org/protocol/tune\">" - "<rating>5</rating><title>Minion</title><track>Yellow</track><artist>Ice</artist><uri>Fire</uri><source>Origin</source><length>226</length></tune>"; + std::string expectedResult = + "<tune xmlns=\"http://jabber.org/protocol/tune\">" + "<rating>5</rating><title>Minion</title><track>Yellow</track><artist>Ice</artist><uri>Fire</uri><source>Origin</source><length>226</length></tune>"; - CPPUNIT_ASSERT_EQUAL(expectedResult, testling.serialize(userTune)); - } + CPPUNIT_ASSERT_EQUAL(expectedResult, testling.serialize(userTune)); + } - void testSerialize_withSomeVariablesSet() { - UserTuneSerializer testling(&serializers); - boost::shared_ptr<UserTune> userTune(new UserTune()); - userTune->setTitle(boost::optional<std::string>("Minion")); - userTune->setTrack(boost::optional<std::string>("Yellow")); - userTune->setArtist(boost::optional<std::string>("Ice")); - userTune->setSource(boost::optional<std::string>("Origin")); - userTune->setLength(226); + void testSerialize_withSomeVariablesSet() { + UserTuneSerializer testling(&serializers); + boost::shared_ptr<UserTune> userTune(new UserTune()); + userTune->setTitle(boost::optional<std::string>("Minion")); + userTune->setTrack(boost::optional<std::string>("Yellow")); + userTune->setArtist(boost::optional<std::string>("Ice")); + userTune->setSource(boost::optional<std::string>("Origin")); + userTune->setLength(226); - std::string expectedResult = - "<tune xmlns=\"http://jabber.org/protocol/tune\">" - "<title>Minion</title><track>Yellow</track><artist>Ice</artist><source>Origin</source><length>226</length></tune>"; + std::string expectedResult = + "<tune xmlns=\"http://jabber.org/protocol/tune\">" + "<title>Minion</title><track>Yellow</track><artist>Ice</artist><source>Origin</source><length>226</length></tune>"; - CPPUNIT_ASSERT_EQUAL(expectedResult, testling.serialize(userTune)); - } - private: - FullPayloadSerializerCollection serializers; + CPPUNIT_ASSERT_EQUAL(expectedResult, testling.serialize(userTune)); + } + private: + FullPayloadSerializerCollection serializers; }; CPPUNIT_TEST_SUITE_REGISTRATION(UserTuneSerializerTest); |