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/MAMQuerySerializerTest.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/MAMQuerySerializerTest.cpp')
-rw-r--r-- | Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp index d9f7f12..faf788d 100644 --- a/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp +++ b/Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp @@ -19,55 +19,55 @@ using namespace Swift; class MAMQuerySerializerTest : public CppUnit::TestFixture { - CPPUNIT_TEST_SUITE(MAMQuerySerializerTest); - CPPUNIT_TEST(testSerialize); - CPPUNIT_TEST_SUITE_END(); + CPPUNIT_TEST_SUITE(MAMQuerySerializerTest); + CPPUNIT_TEST(testSerialize); + CPPUNIT_TEST_SUITE_END(); - public: - void testSerialize() { - MAMQuerySerializer serializer; + public: + void testSerialize() { + MAMQuerySerializer serializer; - boost::shared_ptr<Form> parameters(boost::make_shared<Form>()); + boost::shared_ptr<Form> parameters(boost::make_shared<Form>()); - boost::shared_ptr<FormField> fieldType = boost::make_shared<FormField>(FormField::TextSingleType); - fieldType->setName("FORM_TYPE"); - fieldType->addValue("urn:xmpp:mam:0"); - parameters->addField(fieldType); + boost::shared_ptr<FormField> fieldType = boost::make_shared<FormField>(FormField::TextSingleType); + fieldType->setName("FORM_TYPE"); + fieldType->addValue("urn:xmpp:mam:0"); + parameters->addField(fieldType); - boost::shared_ptr<FormField> fieldStart = boost::make_shared<FormField>(FormField::TextSingleType); - fieldStart->setName("start"); - fieldStart->addValue("2010-08-07T00:00:00Z"); - parameters->addField(fieldStart); + boost::shared_ptr<FormField> fieldStart = boost::make_shared<FormField>(FormField::TextSingleType); + fieldStart->setName("start"); + fieldStart->addValue("2010-08-07T00:00:00Z"); + parameters->addField(fieldStart); - boost::shared_ptr<ResultSet> set = boost::make_shared<ResultSet>(); - set->setMaxItems(10); + boost::shared_ptr<ResultSet> set = boost::make_shared<ResultSet>(); + set->setMaxItems(10); - 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); + 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 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>" - "</field>" - "<field type=\"text-single\" var=\"start\">" - "<value>2010-08-07T00:00:00Z</value>" - "</field>" - "</x>" - "<set xmlns=\"http://jabber.org/protocol/rsm\">" - "<max>10</max>" - "</set>" - "</query>"; + std::string expectedResult = + "<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>" + "</field>" + "<field type=\"text-single\" var=\"start\">" + "<value>2010-08-07T00:00:00Z</value>" + "</field>" + "</x>" + "<set xmlns=\"http://jabber.org/protocol/rsm\">" + "<max>10</max>" + "</set>" + "</query>"; - CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(query)); - } + CPPUNIT_ASSERT_EQUAL(expectedResult, serializer.serialize(query)); + } - private: - FullPayloadSerializerCollection serializers; + private: + FullPayloadSerializerCollection serializers; }; CPPUNIT_TEST_SUITE_REGISTRATION(MAMQuerySerializerTest); |