Run clang-format also on all cpp files

author: Linus Jahn <lnj@kaidan.im> 2020-02-02 18:14:27 +0100
committer: LNJ <lnj@kaidan.im> 2020-02-03 00:11:55 +0100
commit: 57f1b775197aed1d32e98b0299c0999339a7d5f6 (patch)
tree: ce5702781e15f3a5c438ab153edf06f51a501b29 /tests
parent: 99b850a3008bbb03d3449d683adb87839f7d5c4b (diff)
download: qxmpp-57f1b775197aed1d32e98b0299c0999339a7d5f6.tar.gz
27 files changed, 1122 insertions, 1140 deletions
diff --git a/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp b/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp
index 8c60c879..836dae1e 100644
--- a/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp
+++ b/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp
@@ -45,23 +45,23 @@ void tst_QXmppArchiveIq::testArchiveList_data()
     QTest::addColumn<QByteArray>("xml");
     QTest::addColumn<int>("max");
 
-    QTest::newRow("no rsm") <<
-        QByteArray(
-        "<iq id=\"list_1\" type=\"get\">"
-        "<list xmlns=\"urn:xmpp:archive\" with=\"juliet@capulet.com\""
-        " start=\"1469-07-21T02:00:00Z\" end=\"1479-07-21T04:00:00Z\"/>"
-        "</iq>") << -1;
-
-    QTest::newRow("with rsm") <<
-        QByteArray(
-        "<iq id=\"list_1\" type=\"get\">"
-        "<list xmlns=\"urn:xmpp:archive\" with=\"juliet@capulet.com\""
-        " start=\"1469-07-21T02:00:00Z\" end=\"1479-07-21T04:00:00Z\">"
-            "<set xmlns=\"http://jabber.org/protocol/rsm\">"
-            "<max>30</max>"
-            "</set>"
-        "</list>"
-        "</iq>") << 30;
+    QTest::newRow("no rsm") << QByteArray(
+                                   "<iq id=\"list_1\" type=\"get\">"
+                                   "<list xmlns=\"urn:xmpp:archive\" with=\"juliet@capulet.com\""
+                                   " start=\"1469-07-21T02:00:00Z\" end=\"1479-07-21T04:00:00Z\"/>"
+                                   "</iq>")
+                            << -1;
+
+    QTest::newRow("with rsm") << QByteArray(
+                                     "<iq id=\"list_1\" type=\"get\">"
+                                     "<list xmlns=\"urn:xmpp:archive\" with=\"juliet@capulet.com\""
+                                     " start=\"1469-07-21T02:00:00Z\" end=\"1479-07-21T04:00:00Z\">"
+                                     "<set xmlns=\"http://jabber.org/protocol/rsm\">"
+                                     "<max>30</max>"
+                                     "</set>"
+                                     "</list>"
+                                     "</iq>")
+                              << 30;
 }
 
 void tst_QXmppArchiveIq::testArchiveList()
@@ -85,38 +85,38 @@ void tst_QXmppArchiveIq::testArchiveChat_data()
     QTest::addColumn<QByteArray>("xml");
     QTest::addColumn<int>("count");
 
-    QTest::newRow("no rsm") <<
-        QByteArray(
-        "<iq id=\"chat_1\" type=\"result\">"
-        "<chat xmlns=\"urn:xmpp:archive\""
-        " with=\"juliet@capulet.com\""
-        " start=\"1469-07-21T02:56:15Z\""
-        " subject=\"She speaks!\""
-        " version=\"4\""
-        ">"
-        "<from secs=\"0\"><body>Art thou not Romeo, and a Montague?</body></from>"
-        "<to secs=\"11\"><body>Neither, fair saint, if either thee dislike.</body></to>"
-        "<from secs=\"7\"><body>How cam'st thou hither, tell me, and wherefore?</body></from>"
-        "</chat>"
-        "</iq>") << -1;
-
-    QTest::newRow("with rsm") <<
-        QByteArray(
-        "<iq id=\"chat_1\" type=\"result\">"
-        "<chat xmlns=\"urn:xmpp:archive\""
-        " with=\"juliet@capulet.com\""
-        " start=\"1469-07-21T02:56:15Z\""
-        " subject=\"She speaks!\""
-        " version=\"4\""
-        ">"
-        "<from secs=\"0\"><body>Art thou not Romeo, and a Montague?</body></from>"
-        "<to secs=\"11\"><body>Neither, fair saint, if either thee dislike.</body></to>"
-        "<from secs=\"7\"><body>How cam'st thou hither, tell me, and wherefore?</body></from>"
-        "<set xmlns=\"http://jabber.org/protocol/rsm\">"
-        "<count>3</count>"
-        "</set>"
-        "</chat>"
-        "</iq>") << 3;
+    QTest::newRow("no rsm") << QByteArray(
+                                   "<iq id=\"chat_1\" type=\"result\">"
+                                   "<chat xmlns=\"urn:xmpp:archive\""
+                                   " with=\"juliet@capulet.com\""
+                                   " start=\"1469-07-21T02:56:15Z\""
+                                   " subject=\"She speaks!\""
+                                   " version=\"4\""
+                                   ">"
+                                   "<from secs=\"0\"><body>Art thou not Romeo, and a Montague?</body></from>"
+                                   "<to secs=\"11\"><body>Neither, fair saint, if either thee dislike.</body></to>"
+                                   "<from secs=\"7\"><body>How cam'st thou hither, tell me, and wherefore?</body></from>"
+                                   "</chat>"
+                                   "</iq>")
+                            << -1;
+
+    QTest::newRow("with rsm") << QByteArray(
+                                     "<iq id=\"chat_1\" type=\"result\">"
+                                     "<chat xmlns=\"urn:xmpp:archive\""
+                                     " with=\"juliet@capulet.com\""
+                                     " start=\"1469-07-21T02:56:15Z\""
+                                     " subject=\"She speaks!\""
+                                     " version=\"4\""
+                                     ">"
+                                     "<from secs=\"0\"><body>Art thou not Romeo, and a Montague?</body></from>"
+                                     "<to secs=\"11\"><body>Neither, fair saint, if either thee dislike.</body></to>"
+                                     "<from secs=\"7\"><body>How cam'st thou hither, tell me, and wherefore?</body></from>"
+                                     "<set xmlns=\"http://jabber.org/protocol/rsm\">"
+                                     "<count>3</count>"
+                                     "</set>"
+                                     "</chat>"
+                                     "</iq>")
+                              << 3;
 }
 
 void tst_QXmppArchiveIq::testArchiveChat()
@@ -166,23 +166,23 @@ void tst_QXmppArchiveIq::testArchiveRetrieve_data()
     QTest::addColumn<QByteArray>("xml");
     QTest::addColumn<int>("max");
 
-    QTest::newRow("no rsm") <<
-        QByteArray(
-        "<iq id=\"retrieve_1\" type=\"get\">"
-        "<retrieve xmlns=\"urn:xmpp:archive\" with=\"juliet@capulet.com\""
-        " start=\"1469-07-21T02:00:00Z\"/>"
-        "</iq>") << -1;
-
-    QTest::newRow("with rsm") <<
-        QByteArray(
-        "<iq id=\"retrieve_1\" type=\"get\">"
-        "<retrieve xmlns=\"urn:xmpp:archive\" with=\"juliet@capulet.com\""
-        " start=\"1469-07-21T02:00:00Z\">"
-            "<set xmlns=\"http://jabber.org/protocol/rsm\">"
-            "<max>30</max>"
-            "</set>"
-        "</retrieve>"
-        "</iq>") << 30;
+    QTest::newRow("no rsm") << QByteArray(
+                                   "<iq id=\"retrieve_1\" type=\"get\">"
+                                   "<retrieve xmlns=\"urn:xmpp:archive\" with=\"juliet@capulet.com\""
+                                   " start=\"1469-07-21T02:00:00Z\"/>"
+                                   "</iq>")
+                            << -1;
+
+    QTest::newRow("with rsm") << QByteArray(
+                                     "<iq id=\"retrieve_1\" type=\"get\">"
+                                     "<retrieve xmlns=\"urn:xmpp:archive\" with=\"juliet@capulet.com\""
+                                     " start=\"1469-07-21T02:00:00Z\">"
+                                     "<set xmlns=\"http://jabber.org/protocol/rsm\">"
+                                     "<max>30</max>"
+                                     "</set>"
+                                     "</retrieve>"
+                                     "</iq>")
+                              << 30;
 }
 
 void tst_QXmppArchiveIq::testArchiveRetrieve()
diff --git a/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp b/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp
index 2c23d145..93baebd8 100644
--- a/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp
+++ b/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp
@@ -54,8 +54,7 @@ void tst_QXmppBitsOfBinaryContentId::testBasic()
 {
     // test fromCidUrl()
     QXmppBitsOfBinaryContentId cid = QXmppBitsOfBinaryContentId::fromCidUrl(QStringLiteral(
-        "cid:sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org"
-    ));
+        "cid:sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org"));
 
     QCOMPARE(cid.algorithm(), QCryptographicHash::Sha1);
     QCOMPARE(cid.hash().toHex(), QByteArrayLiteral("8f35fef110ffc5df08d579a50083ff9308fb6242"));
@@ -64,8 +63,7 @@ void tst_QXmppBitsOfBinaryContentId::testBasic()
 
     // test fromContentId()
     cid = QXmppBitsOfBinaryContentId::fromContentId(QStringLiteral(
-        "sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org"
-    ));
+        "sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org"));
 
     QCOMPARE(cid.algorithm(), QCryptographicHash::Sha1);
     QCOMPARE(cid.hash().toHex(), QByteArrayLiteral("8f35fef110ffc5df08d579a50083ff9308fb6242"));
@@ -154,15 +152,13 @@ void tst_QXmppBitsOfBinaryContentId::testIsValid_data()
     ROW("valid",
         "8f35fef110ffc5df08d579a50083ff9308fb6242",
         QCryptographicHash::Sha1,
-        true
-    );
+        true);
 
 #ifndef QT_CRYPTOGRAPHICHASH_ONLY_SHA1
     ROW("valid-sha256",
         "01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b",
         QCryptographicHash::Sha256,
-        true
-    );
+        true);
 #endif
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
@@ -218,10 +214,8 @@ void tst_QXmppBitsOfBinaryContentId::testUnsupportedAlgorithm()
 {
     QCOMPARE(
         QXmppBitsOfBinaryContentId::fromContentId(
-            QStringLiteral("blake2s160+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org")
-        ),
-        QXmppBitsOfBinaryContentId()
-    );
+            QStringLiteral("blake2s160+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org")),
+        QXmppBitsOfBinaryContentId());
 }
 
 QTEST_MAIN(tst_QXmppBitsOfBinaryContentId)
diff --git a/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp b/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp
index 4e9cb954..3c883682 100644
--- a/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp
+++ b/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp
@@ -43,12 +43,11 @@ void tst_QXmppBitsOfBinaryIq::testBasic()
 {
     const QByteArray xml(
         "<iq id=\"get-data-1\" "
-                "to=\"ladymacbeth@shakespeare.lit/castle\" "
-                "from=\"doctor@shakespeare.lit/pda\" "
-                "type=\"get\">"
-            "<data xmlns=\"urn:xmpp:bob\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
-        "</iq>"
-    );
+        "to=\"ladymacbeth@shakespeare.lit/castle\" "
+        "from=\"doctor@shakespeare.lit/pda\" "
+        "type=\"get\">"
+        "<data xmlns=\"urn:xmpp:bob\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
+        "</iq>");
 
     QXmppBitsOfBinaryIq iq;
     parsePacket(iq, xml);
@@ -75,36 +74,35 @@ void tst_QXmppBitsOfBinaryIq::testResult()
 {
     const QByteArray xml = QByteArrayLiteral(
         "<iq id=\"data-result\" "
-                "to=\"doctor@shakespeare.lit/pda\" "
-                "from=\"ladymacbeth@shakespeare.lit/castle\" "
-                "type=\"result\">"
-            "<data xmlns=\"urn:xmpp:bob\" "
-                    "cid=\"sha1+5a4c38d44fc64805cbb2d92d8b208be13ff40c0f@bob.xmpp.org\" "
-                    "max-age=\"86400\" "
-                    "type=\"image/png\">"
-                "iVBORw0KGgoAAAANSUhEUgAAALQAAAA8BAMAAAA9AI20AAAAG1BMVEX///8AAADf39+"
-                "/v79/f39fX1+fn58/Pz8fHx/8ACGJAAAACXBIWXMAAA7EAAAOxAGVKw4bAAADS0lEQV"
-                "RYhe2WS3MSQRCAYTf7OKY1kT0CxsRjHmh5BENIjqEk6pHVhFzdikqO7CGyP9t59Ox2z"
-                "y6UeWBVqugLzM70Nz39mqnV1lIWgBWiYXV0BYfNZ0mvwypds1r62vH/gf76ZL/88Qlc"
-                "41zeAnQrpx5H3z1Npfr5ovmHusa9SpRiNNIOcdrto6PJ5LLfb5bp9zM+VDq/vptxDEa"
-                "a1sql9I3R5KhtfQsA5gNCWYyulV3TyTUDdfL56BvdDl4x7RiybDq9uBgxh1TTPUHDvA"
-                "qNQb+LpT5sWehxJZKKcU2MZ6sDE7PMgW2mdlBGdy6ODe6fJFdMI+us95dNqftDMdwU6"
-                "+MhpuTS9slcy5TFAcwq0Jt6qssJMTQGp4BGURlmSsNoo5oHL4kqc66NdkDO75mIfCxm"
-                "RAlvHxMLdcb7JONavMJbttXXKoMSneYu3OQTlwkUh4mNayi6js55/2VcsZOQfXIYelz"
-                "xLcntEGc3WVCsCORJVCc5r0ajAcq+EO1Q0oPm7n7+X/3jEReGdL6qT7Ml6FCjY+quJC"
-                "r+D01f6BG0SaHG56ZG32DnY2jcEV1+pU0kxTaEwaGcekN7jyu50U/TV4q6YeieyiNTu"
-                "klDKZLukyjKVNwotCUB3B0XO1WjHT3c0DHSO2zACwut8GOiljJIHaJsrlof/fpWNzGM"
-                "os6TgIY0hZNpJshzSi4igOhy3cl4qK+YgnqHkAYcZEgdW6/HyrEK7afoY7RCFzArLl2"
-                "LLDdrdmmHZfROajwIDfWj8yQG+rzwlA3WvdJiMHtjUekiNrp1oCbmyZDEyKROGjFVDr"
-                "PRzlkR9UAfG/OErnPxrop5BwpoEpXQorq2zcGxbnBJndx8Bh0yljGiGv0B4E8+YP3Xp"
-                "2rGydZNy4csW8W2pIvWhvijoujRJ0luXsoymV+8AXvE9HjII72+oReS6OfomHe3xWg/"
-                "f2coSbDa1XZ1CvGMjy1nH9KBl83oPnQKi+vAXKLjCrRvvT2WCMkPmSFbquiVuTH1qjv"
-                "p4j/u7CWyI5/Hn3KAaJJ90eP0Zp1Kjets4WPaElkxheF7cpBESzXuIdLwyFjSub07tB"
-                "6JjxH3DGiu+zwHHimdtFsMvKqG/nBxm2TwbvyU6LWs5RnJX4dSldg3QhDLAAAAAElFT"
-                "kSuQmCC"
-            "</data>"
-        "</iq>"
-    );
+        "to=\"doctor@shakespeare.lit/pda\" "
+        "from=\"ladymacbeth@shakespeare.lit/castle\" "
+        "type=\"result\">"
+        "<data xmlns=\"urn:xmpp:bob\" "
+        "cid=\"sha1+5a4c38d44fc64805cbb2d92d8b208be13ff40c0f@bob.xmpp.org\" "
+        "max-age=\"86400\" "
+        "type=\"image/png\">"
+        "iVBORw0KGgoAAAANSUhEUgAAALQAAAA8BAMAAAA9AI20AAAAG1BMVEX///8AAADf39+"
+        "/v79/f39fX1+fn58/Pz8fHx/8ACGJAAAACXBIWXMAAA7EAAAOxAGVKw4bAAADS0lEQV"
+        "RYhe2WS3MSQRCAYTf7OKY1kT0CxsRjHmh5BENIjqEk6pHVhFzdikqO7CGyP9t59Ox2z"
+        "y6UeWBVqugLzM70Nz39mqnV1lIWgBWiYXV0BYfNZ0mvwypds1r62vH/gf76ZL/88Qlc"
+        "41zeAnQrpx5H3z1Npfr5ovmHusa9SpRiNNIOcdrto6PJ5LLfb5bp9zM+VDq/vptxDEa"
+        "a1sql9I3R5KhtfQsA5gNCWYyulV3TyTUDdfL56BvdDl4x7RiybDq9uBgxh1TTPUHDvA"
+        "qNQb+LpT5sWehxJZKKcU2MZ6sDE7PMgW2mdlBGdy6ODe6fJFdMI+us95dNqftDMdwU6"
+        "+MhpuTS9slcy5TFAcwq0Jt6qssJMTQGp4BGURlmSsNoo5oHL4kqc66NdkDO75mIfCxm"
+        "RAlvHxMLdcb7JONavMJbttXXKoMSneYu3OQTlwkUh4mNayi6js55/2VcsZOQfXIYelz"
+        "xLcntEGc3WVCsCORJVCc5r0ajAcq+EO1Q0oPm7n7+X/3jEReGdL6qT7Ml6FCjY+quJC"
+        "r+D01f6BG0SaHG56ZG32DnY2jcEV1+pU0kxTaEwaGcekN7jyu50U/TV4q6YeieyiNTu"
+        "klDKZLukyjKVNwotCUB3B0XO1WjHT3c0DHSO2zACwut8GOiljJIHaJsrlof/fpWNzGM"
+        "os6TgIY0hZNpJshzSi4igOhy3cl4qK+YgnqHkAYcZEgdW6/HyrEK7afoY7RCFzArLl2"
+        "LLDdrdmmHZfROajwIDfWj8yQG+rzwlA3WvdJiMHtjUekiNrp1oCbmyZDEyKROGjFVDr"
+        "PRzlkR9UAfG/OErnPxrop5BwpoEpXQorq2zcGxbnBJndx8Bh0yljGiGv0B4E8+YP3Xp"
+        "2rGydZNy4csW8W2pIvWhvijoujRJ0luXsoymV+8AXvE9HjII72+oReS6OfomHe3xWg/"
+        "f2coSbDa1XZ1CvGMjy1nH9KBl83oPnQKi+vAXKLjCrRvvT2WCMkPmSFbquiVuTH1qjv"
+        "p4j/u7CWyI5/Hn3KAaJJ90eP0Zp1Kjets4WPaElkxheF7cpBESzXuIdLwyFjSub07tB"
+        "6JjxH3DGiu+zwHHimdtFsMvKqG/nBxm2TwbvyU6LWs5RnJX4dSldg3QhDLAAAAAElFT"
+        "kSuQmCC"
+        "</data>"
+        "</iq>");
 
     const auto data = QByteArray::fromBase64(QByteArrayLiteral(
         "iVBORw0KGgoAAAANSUhEUgAAALQAAAA8BAMAAAA9AI20AAAAG1BMVEX///8AAADf39+"
@@ -126,8 +124,7 @@ void tst_QXmppBitsOfBinaryIq::testResult()
         "f2coSbDa1XZ1CvGMjy1nH9KBl83oPnQKi+vAXKLjCrRvvT2WCMkPmSFbquiVuTH1qjv"
         "p4j/u7CWyI5/Hn3KAaJJ90eP0Zp1Kjets4WPaElkxheF7cpBESzXuIdLwyFjSub07tB"
         "6JjxH3DGiu+zwHHimdtFsMvKqG/nBxm2TwbvyU6LWs5RnJX4dSldg3QhDLAAAAAElFT"
-        "kSuQmCC"
-    ));
+        "kSuQmCC"));
 
     QXmppBitsOfBinaryIq iq;
     parsePacket(iq, xml);
@@ -146,8 +143,7 @@ void tst_QXmppBitsOfBinaryIq::testResult()
     iq.setTo(QStringLiteral("doctor@shakespeare.lit/pda"));
     iq.setType(QXmppIq::Result);
     iq.setCid(QXmppBitsOfBinaryContentId::fromContentId(
-        QStringLiteral("sha1+5a4c38d44fc64805cbb2d92d8b208be13ff40c0f@bob.xmpp.org")
-    ));
+        QStringLiteral("sha1+5a4c38d44fc64805cbb2d92d8b208be13ff40c0f@bob.xmpp.org")));
     iq.setContentType(QMimeDatabase().mimeTypeForName(QStringLiteral("image/png")));
     iq.setMaxAge(86400);
     iq.setData(data);
@@ -158,13 +154,12 @@ void tst_QXmppBitsOfBinaryIq::testOtherSubelement()
 {
     const QByteArray xml(
         "<iq id=\"get-data-1\" "
-                "to=\"ladymacbeth@shakespeare.lit/castle\" "
-                "from=\"doctor@shakespeare.lit/pda\" "
-                "type=\"get\">"
-            "<data xmlns=\"org.example.other.data\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
-            "<data xmlns=\"urn:xmpp:bob\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
-        "</iq>"
-    );
+        "to=\"ladymacbeth@shakespeare.lit/castle\" "
+        "from=\"doctor@shakespeare.lit/pda\" "
+        "type=\"get\">"
+        "<data xmlns=\"org.example.other.data\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
+        "<data xmlns=\"urn:xmpp:bob\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
+        "</iq>");
 
     QXmppBitsOfBinaryIq iq;
     parsePacket(iq, xml);
@@ -184,35 +179,32 @@ void tst_QXmppBitsOfBinaryIq::testIsBobIq()
 
     const QByteArray xmlSimple(
         "<iq id=\"get-data-1\" "
-                "to=\"ladymacbeth@shakespeare.lit/castle\" "
-                "from=\"doctor@shakespeare.lit/pda\" "
-                "type=\"get\">"
-            "<data xmlns=\"urn:xmpp:bob\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
-        "</iq>"
-    );
+        "to=\"ladymacbeth@shakespeare.lit/castle\" "
+        "from=\"doctor@shakespeare.lit/pda\" "
+        "type=\"get\">"
+        "<data xmlns=\"urn:xmpp:bob\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
+        "</iq>");
     QCOMPARE(doc.setContent(xmlSimple, true), true);
     QCOMPARE(QXmppBitsOfBinaryIq::isBitsOfBinaryIq(doc.documentElement()), true);
 
     const QByteArray xmlMultipleElements(
         "<iq id=\"get-data-1\" "
-                "to=\"ladymacbeth@shakespeare.lit/castle\" "
-                "from=\"doctor@shakespeare.lit/pda\" "
-                "type=\"get\">"
-            "<data xmlns=\"urn:xmpp:other-data-format:0\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
-            "<data xmlns=\"urn:xmpp:bob\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
-        "</iq>"
-    );
+        "to=\"ladymacbeth@shakespeare.lit/castle\" "
+        "from=\"doctor@shakespeare.lit/pda\" "
+        "type=\"get\">"
+        "<data xmlns=\"urn:xmpp:other-data-format:0\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
+        "<data xmlns=\"urn:xmpp:bob\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
+        "</iq>");
     QCOMPARE(doc.setContent(xmlMultipleElements, true), true);
     QCOMPARE(QXmppBitsOfBinaryIq::isBitsOfBinaryIq(doc.documentElement()), true);
 
     const QByteArray xmlWithoutBobData(
         "<iq id=\"get-data-1\" "
-                "to=\"ladymacbeth@shakespeare.lit/castle\" "
-                "from=\"doctor@shakespeare.lit/pda\" "
-                "type=\"get\">"
-            "<data xmlns=\"urn:xmpp:other-data-format:0\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
-        "</iq>"
-    );
+        "to=\"ladymacbeth@shakespeare.lit/castle\" "
+        "from=\"doctor@shakespeare.lit/pda\" "
+        "type=\"get\">"
+        "<data xmlns=\"urn:xmpp:other-data-format:0\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
+        "</iq>");
     QCOMPARE(doc.setContent(xmlWithoutBobData, true), true);
     QCOMPARE(QXmppBitsOfBinaryIq::isBitsOfBinaryIq(doc.documentElement()), false);
 }
diff --git a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
index bad351a4..6166c6f1 100644
--- a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
+++ b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
@@ -54,8 +54,6 @@ private slots:
     void testHandleStanza_data();
     void testHandleStanza();
 
-
-
 private:
     QXmppCarbonTestHelper m_helper;
     QXmppCarbonManager m_manager;
@@ -82,25 +80,25 @@ void tst_QXmppCarbonManager::testHandleStanza_data()
                       "from='romeo@montague.example'"
                       "to='romeo@montague.example/home'"
                       "type='chat'>"
-               "<received xmlns='urn:xmpp:carbons:2'>"
-                 "<forwarded xmlns='urn:xmpp:forward:0'>"
-                   "<message xmlns='jabber:client'"
-                            "from='juliet@capulet.example/balcony'"
-                            "to='romeo@montague.example/garden'"
-                            "type='chat'>"
-                     "<body>What man art thou that, thus bescreen'd in night, so stumblest on my counsel?</body>"
-                     "<thread>0e3141cd80894871a68e6fe6b1ec56fa</thread>"
-                   "</message>"
-                 "</forwarded>"
-               "</received>"
-             "</message>")
+                      "<received xmlns='urn:xmpp:carbons:2'>"
+                      "<forwarded xmlns='urn:xmpp:forward:0'>"
+                      "<message xmlns='jabber:client'"
+                      "from='juliet@capulet.example/balcony'"
+                      "to='romeo@montague.example/garden'"
+                      "type='chat'>"
+                      "<body>What man art thou that, thus bescreen'd in night, so stumblest on my counsel?</body>"
+                      "<thread>0e3141cd80894871a68e6fe6b1ec56fa</thread>"
+                      "</message>"
+                      "</forwarded>"
+                      "</received>"
+                      "</message>")
         << true << false
         << QByteArray("<message xmlns='jabber:client'"
-                            "from='juliet@capulet.example/balcony'"
-                            "to='romeo@montague.example/garden'"
-                            "type='chat'>"
-                        "<body>What man art thou that, thus bescreen'd in night, so stumblest on my counsel?</body>"
-                        "<thread>0e3141cd80894871a68e6fe6b1ec56fa</thread>"
+                      "from='juliet@capulet.example/balcony'"
+                      "to='romeo@montague.example/garden'"
+                      "type='chat'>"
+                      "<body>What man art thou that, thus bescreen'd in night, so stumblest on my counsel?</body>"
+                      "<thread>0e3141cd80894871a68e6fe6b1ec56fa</thread>"
                       "</message>");
 
     QTest::newRow("sent1")
@@ -108,48 +106,46 @@ void tst_QXmppCarbonManager::testHandleStanza_data()
                       "from='romeo@montague.example'"
                       "to='romeo@montague.example/garden'"
                       "type='chat'>"
-                "<sent xmlns='urn:xmpp:carbons:2'>"
-                  "<forwarded xmlns='urn:xmpp:forward:0'>"
-                    "<message xmlns='jabber:client'"
-                             "to='juliet@capulet.example/balcony'"
-                             "from='romeo@montague.example/home'"
-                             "type='chat'>"
+                      "<sent xmlns='urn:xmpp:carbons:2'>"
+                      "<forwarded xmlns='urn:xmpp:forward:0'>"
+                      "<message xmlns='jabber:client'"
+                      "to='juliet@capulet.example/balcony'"
+                      "from='romeo@montague.example/home'"
+                      "type='chat'>"
                       "<body>Neither, fair saint, if either thee dislike.</body>"
                       "<thread>0e3141cd80894871a68e6fe6b1ec56fa</thread>"
-                    "</message>"
-                  "</forwarded>"
-                "</sent>"
-              "</message>")
+                      "</message>"
+                      "</forwarded>"
+                      "</sent>"
+                      "</message>")
         << true << true
         << QByteArray("<message xmlns='jabber:client'"
-                          "to='juliet@capulet.example/balcony'"
-                          "from='romeo@montague.example/home'"
-                          "type='chat'>"
-                   "<body>Neither, fair saint, if either thee dislike.</body>"
-                   "<thread>0e3141cd80894871a68e6fe6b1ec56fa</thread>"
-                 "</message>");
-
+                      "to='juliet@capulet.example/balcony'"
+                      "from='romeo@montague.example/home'"
+                      "type='chat'>"
+                      "<body>Neither, fair saint, if either thee dislike.</body>"
+                      "<thread>0e3141cd80894871a68e6fe6b1ec56fa</thread>"
+                      "</message>");
 
     QTest::newRow("forwarded_normal")
         << QByteArray("<message to='mercutio@verona.lit' from='romeo@montague.lit/orchard' type='chat' id='28gs'>"
                       "<body>A most courteous exposition!</body>"
                       "<forwarded xmlns='urn:xmpp:forward:0'>"
-                        "<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>"
-                        "<message from='juliet@capulet.lit/orchard'"
-                                 "id='0202197'"
-                                 "to='romeo@montague.lit'"
-                                 "type='chat'"
-                                 "xmlns='jabber:client'>"
-                            "<body>Yet I should kill thee with much cherishing.</body>"
-                            "<mood xmlns='http://jabber.org/protocol/mood'>"
-                                "<amorous/>"
-                            "</mood>"
-                        "</message>"
+                      "<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>"
+                      "<message from='juliet@capulet.lit/orchard'"
+                      "id='0202197'"
+                      "to='romeo@montague.lit'"
+                      "type='chat'"
+                      "xmlns='jabber:client'>"
+                      "<body>Yet I should kill thee with much cherishing.</body>"
+                      "<mood xmlns='http://jabber.org/protocol/mood'>"
+                      "<amorous/>"
+                      "</mood>"
+                      "</message>"
                       "</forwarded>"
-                    "</message>")
+                      "</message>")
         << false << false
         << QByteArray();
-
 }
 
 void tst_QXmppCarbonManager::testHandleStanza()
@@ -161,7 +157,7 @@ void tst_QXmppCarbonManager::testHandleStanza()
 
     m_helper.m_expectedMessage = QXmppMessage();
 
-    if(!forwardedxml.isEmpty())
+    if (!forwardedxml.isEmpty())
         parsePacket(m_helper.m_expectedMessage, forwardedxml);
 
     m_helper.m_expectSent = sent;
@@ -177,7 +173,7 @@ void tst_QXmppCarbonManager::testHandleStanza()
     QCOMPARE(m_helper.m_signalTriggered, accept);
 }
 
-void QXmppCarbonTestHelper::messageSent(const QXmppMessage &msg)
+void QXmppCarbonTestHelper::messageSent(const QXmppMessage& msg)
 {
     m_signalTriggered = true;
     QCOMPARE(m_expectSent, true);
@@ -185,7 +181,7 @@ void QXmppCarbonTestHelper::messageSent(const QXmppMessage &msg)
     compareMessages(m_expectedMessage, msg);
 }
 
-void QXmppCarbonTestHelper::messageReceived(const QXmppMessage &msg)
+void QXmppCarbonTestHelper::messageReceived(const QXmppMessage& msg)
 {
     m_signalTriggered = true;
     QCOMPARE(m_expectSent, false);
@@ -193,7 +189,7 @@ void QXmppCarbonTestHelper::messageReceived(const QXmppMessage &msg)
     compareMessages(m_expectedMessage, msg);
 }
 
-void QXmppCarbonTestHelper::compareMessages(const QXmppMessage &lhs, const QXmppMessage &rhs)
+void QXmppCarbonTestHelper::compareMessages(const QXmppMessage& lhs, const QXmppMessage& rhs)
 {
     QCOMPARE(lhs.body(), rhs.body());
     QCOMPARE(lhs.from(), rhs.from());
diff --git a/tests/qxmppdataform/tst_qxmppdataform.cpp b/tests/qxmppdataform/tst_qxmppdataform.cpp
index 1efabaf5..52175e08 100644
--- a/tests/qxmppdataform/tst_qxmppdataform.cpp
+++ b/tests/qxmppdataform/tst_qxmppdataform.cpp
@@ -89,18 +89,17 @@ void tst_QXmppDataForm::testMedia()
 {
     const QByteArray xml = QByteArrayLiteral(
         "<x xmlns=\"jabber:x:data\" type=\"form\">"
-            "<field type=\"text-single\">"
-                "<media xmlns=\"urn:xmpp:media-element\" width=\"290\" height=\"80\">"
-                    "<uri type=\"image/jpeg\">"
-                        "http://www.victim.com/challenges/ocr.jpeg?F3A6292C"
-                    "</uri>"
-                    "<uri type=\"image/png\">"
-                        "cid:sha1+f24030b8d91d233bac14777be5ab531ca3b9f102@bob.xmpp.org"
-                    "</uri>"
-                "</media>"
-            "</field>"
-        "</x>"
-    );
+        "<field type=\"text-single\">"
+        "<media xmlns=\"urn:xmpp:media-element\" width=\"290\" height=\"80\">"
+        "<uri type=\"image/jpeg\">"
+        "http://www.victim.com/challenges/ocr.jpeg?F3A6292C"
+        "</uri>"
+        "<uri type=\"image/png\">"
+        "cid:sha1+f24030b8d91d233bac14777be5ab531ca3b9f102@bob.xmpp.org"
+        "</uri>"
+        "</media>"
+        "</field>"
+        "</x>");
 
     //
     // test parsing
@@ -117,20 +116,16 @@ void tst_QXmppDataForm::testMedia()
     QCOMPARE(form.fields().at(0).mediaSources().size(), 2);
     QCOMPARE(
         form.fields().at(0).mediaSources().at(0).uri().toString(),
-        QStringLiteral("http://www.victim.com/challenges/ocr.jpeg?F3A6292C")
-    );
+        QStringLiteral("http://www.victim.com/challenges/ocr.jpeg?F3A6292C"));
     QCOMPARE(
         form.fields().at(0).mediaSources().at(0).contentType(),
-        QMimeDatabase().mimeTypeForName(QStringLiteral("image/jpeg"))
-    );
+        QMimeDatabase().mimeTypeForName(QStringLiteral("image/jpeg")));
     QCOMPARE(
         form.fields().at(0).mediaSources().at(1).uri().toString(),
-        QStringLiteral("cid:sha1+f24030b8d91d233bac14777be5ab531ca3b9f102@bob.xmpp.org")
-    );
+        QStringLiteral("cid:sha1+f24030b8d91d233bac14777be5ab531ca3b9f102@bob.xmpp.org"));
     QCOMPARE(
         form.fields().at(0).mediaSources().at(1).contentType(),
-        QMimeDatabase().mimeTypeForName(QStringLiteral("image/png"))
-    );
+        QMimeDatabase().mimeTypeForName(QStringLiteral("image/png")));
 
     // deprecated
     QCOMPARE(form.fields().at(0).media().isNull(), false);
@@ -139,20 +134,16 @@ void tst_QXmppDataForm::testMedia()
     QCOMPARE(form.fields().at(0).media().uris().size(), 2);
     QCOMPARE(
         form.fields().at(0).media().uris().at(0).first,
-        QStringLiteral("image/jpeg")
-    );
+        QStringLiteral("image/jpeg"));
     QCOMPARE(
         form.fields().at(0).media().uris().at(0).second,
-        QStringLiteral("http://www.victim.com/challenges/ocr.jpeg?F3A6292C")
-    );
+        QStringLiteral("http://www.victim.com/challenges/ocr.jpeg?F3A6292C"));
     QCOMPARE(
         form.fields().at(0).media().uris().at(1).first,
-        QStringLiteral("image/png")
-    );
+        QStringLiteral("image/png"));
     QCOMPARE(
         form.fields().at(0).media().uris().at(1).second,
-        QStringLiteral("cid:sha1+f24030b8d91d233bac14777be5ab531ca3b9f102@bob.xmpp.org")
-    );
+        QStringLiteral("cid:sha1+f24030b8d91d233bac14777be5ab531ca3b9f102@bob.xmpp.org"));
 
     serializePacket(form, xml);
 
@@ -165,12 +156,10 @@ void tst_QXmppDataForm::testMedia()
     mediaField1.mediaSize().setHeight(80);
     mediaField1.mediaSources() << QXmppDataForm::MediaSource(
         QUrl(QStringLiteral("http://www.victim.com/challenges/ocr.jpeg?F3A6292C")),
-        QMimeDatabase().mimeTypeForName(QStringLiteral("image/jpeg"))
-    );
+        QMimeDatabase().mimeTypeForName(QStringLiteral("image/jpeg")));
     mediaField1.mediaSources() << QXmppDataForm::MediaSource(
         QUrl(QStringLiteral("cid:sha1+f24030b8d91d233bac14777be5ab531ca3b9f102@bob.xmpp.org")),
-        QMimeDatabase().mimeTypeForName(QStringLiteral("image/png"))
-    );
+        QMimeDatabase().mimeTypeForName(QStringLiteral("image/png")));
 
     QXmppDataForm form2;
     form2.setType(QXmppDataForm::Form);
@@ -186,12 +175,10 @@ void tst_QXmppDataForm::testMedia()
     QVector<QXmppDataForm::MediaSource> sources;
     sources << QXmppDataForm::MediaSource(
         QUrl(QStringLiteral("http://www.victim.com/challenges/ocr.jpeg?F3A6292C")),
-        QMimeDatabase().mimeTypeForName(QStringLiteral("image/jpeg"))
-    );
+        QMimeDatabase().mimeTypeForName(QStringLiteral("image/jpeg")));
     sources << QXmppDataForm::MediaSource(
         QUrl(QStringLiteral("cid:sha1+f24030b8d91d233bac14777be5ab531ca3b9f102@bob.xmpp.org")),
-        QMimeDatabase().mimeTypeForName(QStringLiteral("image/png"))
-    );
+        QMimeDatabase().mimeTypeForName(QStringLiteral("image/png")));
     mediaField2.setMediaSources(sources);
 
     QXmppDataForm form3;
diff --git a/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp b/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp
index 755ba085..70941ece 100644
--- a/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp
+++ b/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp
@@ -39,10 +39,10 @@ private slots:
 void tst_QXmppEntityTimeIq::testEntityTimeGet()
 {
     const QByteArray xml("<iq id=\"time_1\" "
-        "to=\"juliet@capulet.com/balcony\" "
-        "from=\"romeo@montague.net/orchard\" type=\"get\">"
-      "<time xmlns=\"urn:xmpp:time\"/>"
-    "</iq>");
+                         "to=\"juliet@capulet.com/balcony\" "
+                         "from=\"romeo@montague.net/orchard\" type=\"get\">"
+                         "<time xmlns=\"urn:xmpp:time\"/>"
+                         "</iq>");
 
     QXmppEntityTimeIq entityTime;
     parsePacket(entityTime, xml);
@@ -56,12 +56,12 @@ void tst_QXmppEntityTimeIq::testEntityTimeGet()
 void tst_QXmppEntityTimeIq::testEntityTimeResult()
 {
     const QByteArray xml(
-    "<iq id=\"time_1\" to=\"romeo@montague.net/orchard\" from=\"juliet@capulet.com/balcony\" type=\"result\">"
-      "<time xmlns=\"urn:xmpp:time\">"
+        "<iq id=\"time_1\" to=\"romeo@montague.net/orchard\" from=\"juliet@capulet.com/balcony\" type=\"result\">"
+        "<time xmlns=\"urn:xmpp:time\">"
         "<tzo>-06:00</tzo>"
         "<utc>2006-12-19T17:58:35Z</utc>"
-      "</time>"
-    "</iq>");
+        "</time>"
+        "</iq>");
 
     QXmppEntityTimeIq entityTime;
     parsePacket(entityTime, xml);
diff --git a/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp b/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp
index 4f22dcc3..1fbce92a 100644
--- a/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp
+++ b/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp
@@ -43,15 +43,14 @@ void tst_QXmppHttpUploadIq::testRequest()
 {
     const QByteArray xml(
         "<iq id=\"step_03\" "
-            "to=\"upload.montague.tld\" "
-            "from=\"romeo@montague.tld/garden\" "
-            "type=\"get\">"
-            "<request xmlns=\"urn:xmpp:http:upload:0\" "
-                     "filename=\"très cool.jpg\" "
-                     "size=\"23456\" "
-                     "content-type=\"image/jpeg\"/>"
-        "</iq>"
-    );
+        "to=\"upload.montague.tld\" "
+        "from=\"romeo@montague.tld/garden\" "
+        "type=\"get\">"
+        "<request xmlns=\"urn:xmpp:http:upload:0\" "
+        "filename=\"très cool.jpg\" "
+        "size=\"23456\" "
+        "content-type=\"image/jpeg\"/>"
+        "</iq>");
 
     QXmppHttpUploadRequestIq iq;
     parsePacket(iq, xml);
@@ -102,20 +101,19 @@ void tst_QXmppHttpUploadIq::testSlot()
 {
     const QByteArray xml(
         "<iq id=\"step_03\" "
-            "to=\"romeo@montague.tld/garden\" "
-            "from=\"upload.montague.tld\" "
-            "type=\"result\">"
-            "<slot xmlns=\"urn:xmpp:http:upload:0\">"
-                "<put url=\"https://upload.montague.tld/4a771ac1-f0b2-4a4a-970"
-                           "0-f2a26fa2bb67/tr%C3%A8s%20cool.jpg\">"
-                    "<header name=\"Authorization\">Basic Base64String==</header>"
-                    "<header name=\"Cookie\">foo=bar; user=romeo</header>"
-                "</put>"
-                "<get url=\"https://download.montague.tld/4a771ac1-f0b2-4a4a-9"
-                           "700-f2a26fa2bb67/tr%C3%A8s%20cool.jpg\"/>"
-            "</slot>"
-        "</iq>"
-    );
+        "to=\"romeo@montague.tld/garden\" "
+        "from=\"upload.montague.tld\" "
+        "type=\"result\">"
+        "<slot xmlns=\"urn:xmpp:http:upload:0\">"
+        "<put url=\"https://upload.montague.tld/4a771ac1-f0b2-4a4a-970"
+        "0-f2a26fa2bb67/tr%C3%A8s%20cool.jpg\">"
+        "<header name=\"Authorization\">Basic Base64String==</header>"
+        "<header name=\"Cookie\">foo=bar; user=romeo</header>"
+        "</put>"
+        "<get url=\"https://download.montague.tld/4a771ac1-f0b2-4a4a-9"
+        "700-f2a26fa2bb67/tr%C3%A8s%20cool.jpg\"/>"
+        "</slot>"
+        "</iq>");
 
     QXmppHttpUploadSlotIq iq;
     parsePacket(iq, xml);
@@ -137,7 +135,6 @@ void tst_QXmppHttpUploadIq::testSlot()
     QMap<QString, QString> emptyMap;
     iq.setPutHeaders(emptyMap);
     QCOMPARE(iq.putHeaders(), emptyMap);
-
 }
 
 void tst_QXmppHttpUploadIq::testIsSlot_data()
diff --git a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp
index 114e095b..3121d60d 100644
--- a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp
+++ b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp
@@ -76,40 +76,40 @@ void tst_QXmppJingleIq::testCandidate()
 void tst_QXmppJingleIq::testContent()
 {
     const QByteArray xml(
-    "<content creator=\"initiator\" name=\"voice\">"
-      "<description xmlns=\"urn:xmpp:jingle:apps:rtp:1\" media=\"audio\">"
+        "<content creator=\"initiator\" name=\"voice\">"
+        "<description xmlns=\"urn:xmpp:jingle:apps:rtp:1\" media=\"audio\">"
         "<payload-type id=\"96\" name=\"speex\" clockrate=\"16000\"/>"
         "<payload-type id=\"97\" name=\"speex\" clockrate=\"8000\"/>"
         "<payload-type id=\"18\" name=\"G729\"/>"
         "<payload-type id=\"0\" name=\"PCMU\"/>"
         "<payload-type id=\"103\" name=\"L16\" channels=\"2\" clockrate=\"16000\"/>"
         "<payload-type id=\"98\" name=\"x-ISAC\" clockrate=\"8000\"/>"
-      "</description>"
-      "<transport xmlns=\"urn:xmpp:jingle:transports:ice-udp:1\""
-                 " ufrag=\"8hhy\""
-                 " pwd=\"asd88fgpdd777uzjYhagZg\">"
+        "</description>"
+        "<transport xmlns=\"urn:xmpp:jingle:transports:ice-udp:1\""
+        " ufrag=\"8hhy\""
+        " pwd=\"asd88fgpdd777uzjYhagZg\">"
         "<candidate component=\"1\""
-                   " foundation=\"1\""
-                   " generation=\"0\""
-                   " id=\"el0747fg11\""
-                   " ip=\"10.0.1.1\""
-                   " network=\"1\""
-                   " port=\"8998\""
-                   " priority=\"2130706431\""
-                   " protocol=\"udp\""
-                   " type=\"host\"/>"
+        " foundation=\"1\""
+        " generation=\"0\""
+        " id=\"el0747fg11\""
+        " ip=\"10.0.1.1\""
+        " network=\"1\""
+        " port=\"8998\""
+        " priority=\"2130706431\""
+        " protocol=\"udp\""
+        " type=\"host\"/>"
         "<candidate component=\"1\""
-                   " foundation=\"2\""
-                   " generation=\"0\""
-                   " id=\"y3s2b30v3r\""
-                   " ip=\"192.0.2.3\""
-                   " network=\"1\""
-                   " port=\"45664\""
-                   " priority=\"1694498815\""
-                   " protocol=\"udp\""
-                   " type=\"srflx\"/>"
-      "</transport>"
-    "</content>");
+        " foundation=\"2\""
+        " generation=\"0\""
+        " id=\"y3s2b30v3r\""
+        " ip=\"192.0.2.3\""
+        " network=\"1\""
+        " port=\"45664\""
+        " priority=\"1694498815\""
+        " protocol=\"udp\""
+        " type=\"srflx\"/>"
+        "</transport>"
+        "</content>");
 
     QXmppJingleIq::Content content;
     parsePacket(content, xml);
@@ -149,28 +149,28 @@ void tst_QXmppJingleIq::testContent()
 void tst_QXmppJingleIq::testContentFingerprint()
 {
     const QByteArray xml(
-    "<content creator=\"initiator\" name=\"voice\">"
-      "<description xmlns=\"urn:xmpp:jingle:apps:rtp:1\" media=\"audio\">"
+        "<content creator=\"initiator\" name=\"voice\">"
+        "<description xmlns=\"urn:xmpp:jingle:apps:rtp:1\" media=\"audio\">"
         "<payload-type id=\"0\" name=\"PCMU\"/>"
-      "</description>"
-      "<transport xmlns=\"urn:xmpp:jingle:transports:ice-udp:1\""
-                 " ufrag=\"8hhy\""
-                 " pwd=\"asd88fgpdd777uzjYhagZg\">"
+        "</description>"
+        "<transport xmlns=\"urn:xmpp:jingle:transports:ice-udp:1\""
+        " ufrag=\"8hhy\""
+        " pwd=\"asd88fgpdd777uzjYhagZg\">"
         "<candidate component=\"1\""
-                   " foundation=\"1\""
-                   " generation=\"0\""
-                   " id=\"el0747fg11\""
-                   " ip=\"10.0.1.1\""
-                   " network=\"1\""
-                   " port=\"8998\""
-                   " priority=\"2130706431\""
-                   " protocol=\"udp\""
-                   " type=\"host\"/>"
+        " foundation=\"1\""
+        " generation=\"0\""
+        " id=\"el0747fg11\""
+        " ip=\"10.0.1.1\""
+        " network=\"1\""
+        " port=\"8998\""
+        " priority=\"2130706431\""
+        " protocol=\"udp\""
+        " type=\"host\"/>"
         "<fingerprint xmlns=\"urn:xmpp:jingle:apps:dtls:0\" hash=\"sha-256\" setup=\"actpass\">"
-            "02:1A:CC:54:27:AB:EB:9C:53:3F:3E:4B:65:2E:7D:46:3F:54:42:CD:54:F1:7A:03:A2:7D:F9:B0:7F:46:19:B2"
+        "02:1A:CC:54:27:AB:EB:9C:53:3F:3E:4B:65:2E:7D:46:3F:54:42:CD:54:F1:7A:03:A2:7D:F9:B0:7F:46:19:B2"
         "</fingerprint>"
-      "</transport>"
-    "</content>");
+        "</transport>"
+        "</content>");
 
     QXmppJingleIq::Content content;
     parsePacket(content, xml);
@@ -198,7 +198,6 @@ void tst_QXmppJingleIq::testContentFingerprint()
     serializePacket(content, xml);
 }
 
-
 void tst_QXmppJingleIq::testContentSdp()
 {
     const QString sdp(
@@ -334,7 +333,6 @@ void tst_QXmppJingleIq::testContentSdpFingerprint()
     QCOMPARE(content.transportFingerprintSetup(), QLatin1String("actpass"));
 
     QCOMPARE(content.toSdp(), sdp);
-
 }
 
 void tst_QXmppJingleIq::testContentSdpParameters()
@@ -446,8 +444,8 @@ void tst_QXmppJingleIq::testVideoPayloadType()
 {
     const QByteArray xml(
         "<payload-type id=\"98\" name=\"theora\" clockrate=\"90000\">"
-            "<parameter name=\"height\" value=\"768\"/>"
-            "<parameter name=\"width\" value=\"1024\"/>"
+        "<parameter name=\"height\" value=\"768\"/>"
+        "<parameter name=\"width\" value=\"1024\"/>"
         "</payload-type>");
     QXmppJinglePayloadType payload;
     parsePacket(payload, xml);
diff --git a/tests/qxmppmammanager/tst_qxmppmammanager.cpp b/tests/qxmppmammanager/tst_qxmppmammanager.cpp
index 38d86909..01ab575c 100644
--- a/tests/qxmppmammanager/tst_qxmppmammanager.cpp
+++ b/tests/qxmppmammanager/tst_qxmppmammanager.cpp
@@ -82,41 +82,41 @@ void tst_QXmppMamManager::testHandleStanza_data()
 
     QTest::newRow("stanza1")
         << QByteArray("<message id='aeb213' to='juliet@capulet.lit/chamber'>"
-                        "<result xmlns='urn:xmpp:mam:1' queryid='f27' id='28482-98726-73623'>"
-                          "<forwarded xmlns='urn:xmpp:forward:0'>"
-                            "<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>"
-                            "<message xmlns='jabber:client'"
-                              "to='juliet@capulet.lit/balcony'"
-                              "from='romeo@montague.lit/orchard'"
-                              "type='chat'>"
-                              "<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>"
-                            "</message>"
-                          "</forwarded>"
-                        "</result>"
+                      "<result xmlns='urn:xmpp:mam:1' queryid='f27' id='28482-98726-73623'>"
+                      "<forwarded xmlns='urn:xmpp:forward:0'>"
+                      "<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>"
+                      "<message xmlns='jabber:client'"
+                      "to='juliet@capulet.lit/balcony'"
+                      "from='romeo@montague.lit/orchard'"
+                      "type='chat'>"
+                      "<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>"
+                      "</message>"
+                      "</forwarded>"
+                      "</result>"
                       "</message>")
         << true
         << QByteArray("<message xmlns='jabber:client'"
-                        "to='juliet@capulet.lit/balcony'"
-                        "from='romeo@montague.lit/orchard'"
-                        "type='chat'>"
-                        "<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>"
-                        "<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>"
+                      "to='juliet@capulet.lit/balcony'"
+                      "from='romeo@montague.lit/orchard'"
+                      "type='chat'>"
+                      "<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>"
+                      "<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>"
                       "</message>")
         << QString("f27");
 
     QTest::newRow("stanza2")
         << QByteArray("<message id='aeb214' to='juliet@capulet.lit/chamber'>"
-                        "<result queryid='f27' id='5d398-28273-f7382'>"
-                          "<forwarded xmlns='urn:xmpp:forward:0'>"
-                            "<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:09:32Z'/>"
-                            "<message xmlns='jabber:client'"
-                               "to='romeo@montague.lit/orchard'"
-                               "from='juliet@capulet.lit/balcony'"
-                               "type='chat' id='8a54s'>"
-                              "<body>What man art thou that thus bescreen'd in night so stumblest on my counsel?</body>"
-                            "</message>"
-                          "</forwarded>"
-                        "</result>"
+                      "<result queryid='f27' id='5d398-28273-f7382'>"
+                      "<forwarded xmlns='urn:xmpp:forward:0'>"
+                      "<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:09:32Z'/>"
+                      "<message xmlns='jabber:client'"
+                      "to='romeo@montague.lit/orchard'"
+                      "from='juliet@capulet.lit/balcony'"
+                      "type='chat' id='8a54s'>"
+                      "<body>What man art thou that thus bescreen'd in night so stumblest on my counsel?</body>"
+                      "</message>"
+                      "</forwarded>"
+                      "</result>"
                       "</message>")
         << false
         << QByteArray()
@@ -124,17 +124,17 @@ void tst_QXmppMamManager::testHandleStanza_data()
 
     QTest::newRow("stanza3")
         << QByteArray(
-                      "<message id='aeb214' xmlns='urn:xmpp:mam:1' to='juliet@capulet.lit/chamber'>"
-                        "<forwarded xmlns='urn:xmpp:forward:0'>"
-                          "<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>"
-                          "<message xmlns='jabber:client'"
-                            "to='juliet@capulet.lit/balcony'"
-                            "from='romeo@montague.lit/orchard'"
-                            "type='chat'>"
-                            "<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>"
-                          "</message>"
-                        "</forwarded>"
-                      "</message>")
+               "<message id='aeb214' xmlns='urn:xmpp:mam:1' to='juliet@capulet.lit/chamber'>"
+               "<forwarded xmlns='urn:xmpp:forward:0'>"
+               "<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>"
+               "<message xmlns='jabber:client'"
+               "to='juliet@capulet.lit/balcony'"
+               "from='romeo@montague.lit/orchard'"
+               "type='chat'>"
+               "<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>"
+               "</message>"
+               "</forwarded>"
+               "</message>")
         << false
         << QByteArray()
         << QString();
@@ -153,7 +153,7 @@ void tst_QXmppMamManager::testHandleStanza()
 
     m_helper.m_signalTriggered = false;
     m_helper.m_expectedMessage = QXmppMessage();
-    if(!expectedMessage.isEmpty()) {
+    if (!expectedMessage.isEmpty()) {
         parsePacket(m_helper.m_expectedMessage, expectedMessage);
     }
     m_helper.m_expectedQueryId = expectedQueryId;
@@ -172,33 +172,33 @@ void tst_QXmppMamManager::testHandleResultIq_data()
 
     QTest::newRow("stanza1")
         << QByteArray("<iq type='result' id='juliet1'>"
-                        "<fin xmlns='urn:xmpp:mam:1'>"
-                          "<set xmlns='http://jabber.org/protocol/rsm'>"
-                            "<first index='0'>28482-98726-73623</first>"
-                            "<last>09af3-cc343-b409f</last>"
-                          "</set>"
-                        "</fin>"
+                      "<fin xmlns='urn:xmpp:mam:1'>"
+                      "<set xmlns='http://jabber.org/protocol/rsm'>"
+                      "<first index='0'>28482-98726-73623</first>"
+                      "<last>09af3-cc343-b409f</last>"
+                      "</set>"
+                      "</fin>"
                       "</iq>")
         << true
         << QByteArray("<set xmlns='http://jabber.org/protocol/rsm'>"
-                        "<first index='0'>28482-98726-73623</first>"
-                        "<last>09af3-cc343-b409f</last>"
+                      "<first index='0'>28482-98726-73623</first>"
+                      "<last>09af3-cc343-b409f</last>"
                       "</set>")
         << false;
 
     QTest::newRow("stanza2")
         << QByteArray("<iq type='result' id='juliet1'>"
-                        "<fin xmlns='urn:xmpp:mam:1' complete='true'>"
-                          "<set xmlns='http://jabber.org/protocol/rsm'>"
-                            "<first index='0'>28482-98726-73623</first>"
-                            "<last>09af3-cc343-b409f</last>"
-                          "</set>"
-                        "</fin>"
+                      "<fin xmlns='urn:xmpp:mam:1' complete='true'>"
+                      "<set xmlns='http://jabber.org/protocol/rsm'>"
+                      "<first index='0'>28482-98726-73623</first>"
+                      "<last>09af3-cc343-b409f</last>"
+                      "</set>"
+                      "</fin>"
                       "</iq>")
         << true
         << QByteArray("<set xmlns='http://jabber.org/protocol/rsm'>"
-                        "<first index='0'>28482-98726-73623</first>"
-                        "<last>09af3-cc343-b409f</last>"
+                      "<first index='0'>28482-98726-73623</first>"
+                      "<last>09af3-cc343-b409f</last>"
                       "</set>")
         << true;
 }
@@ -216,7 +216,7 @@ void tst_QXmppMamManager::testHandleResultIq()
 
     m_helper.m_signalTriggered = false;
     m_helper.m_expectedResultSetReply = QXmppResultSetReply();
-    if(!expectedResultSetReply.isEmpty()) {
+    if (!expectedResultSetReply.isEmpty()) {
         parsePacket(m_helper.m_expectedResultSetReply, expectedResultSetReply);
     }
     m_helper.m_expectedComplete = expectedComplete;
diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp
index a7c0a3b3..4c7f99fc 100644
--- a/tests/qxmppmessage/tst_qxmppmessage.cpp
+++ b/tests/qxmppmessage/tst_qxmppmessage.cpp
@@ -92,12 +92,14 @@ void tst_QXmppMessage::testBasic_data()
 
     QTest::newRow("full")
         << QByteArray("<message to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"normal\">"
-        "<subject>test subject</subject>"
-        "<body>test body &amp; stuff</body>"
-        "<thread>test thread</thread>"
-        "</message>")
+                      "<subject>test subject</subject>"
+                      "<body>test body &amp; stuff</body>"
+                      "<thread>test thread</thread>"
+                      "</message>")
         << int(QXmppMessage::Normal)
-        << "test body & stuff" << "test subject" << "test thread";
+        << "test body & stuff"
+        << "test subject"
+        << "test thread";
 }
 
 void tst_QXmppMessage::testBasic()
@@ -150,9 +152,8 @@ void tst_QXmppMessage::testUnknownXExtension()
 {
     const QByteArray xml(
         "<message to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"normal\">"
-          "<x xmlns=\"urn:xmpp:unknown:protocol\"/>"
-        "</message>"
-    );
+        "<x xmlns=\"urn:xmpp:unknown:protocol\"/>"
+        "</message>");
 
     QXmppMessage message;
     parsePacket(message, xml);
@@ -163,7 +164,7 @@ void tst_QXmppMessage::testMessageAttention()
 {
     const QByteArray xml(
         "<message to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"normal\">"
-          "<attention xmlns=\"urn:xmpp:attention:0\"/>"
+        "<attention xmlns=\"urn:xmpp:attention:0\"/>"
         "</message>");
 
     QXmppMessage message;
@@ -189,8 +190,8 @@ void tst_QXmppMessage::testMessageReceipt()
 {
     const QByteArray xml(
         "<message id=\"richard2-4.1.247\" to=\"kingrichard@royalty.england.lit/throne\" from=\"northumberland@shakespeare.lit/westminster\" type=\"normal\">"
-          "<body>My lord, dispatch; read o'er these articles.</body>"
-          "<request xmlns=\"urn:xmpp:receipts\"/>"
+        "<body>My lord, dispatch; read o'er these articles.</body>"
+        "<request xmlns=\"urn:xmpp:receipts\"/>"
         "</message>");
 
     QXmppMessage message;
@@ -218,7 +219,7 @@ void tst_QXmppMessage::testMessageReceipt()
 
     const QByteArray receiptXml(
         "<message id=\"bi29sg183b4v\" to=\"northumberland@shakespeare.lit/westminster\" from=\"kingrichard@royalty.england.lit/throne\" type=\"normal\">"
-          "<received xmlns=\"urn:xmpp:receipts\" id=\"richard2-4.1.247\"/>"
+        "<received xmlns=\"urn:xmpp:receipts\" id=\"richard2-4.1.247\"/>"
         "</message>");
 
     QXmppMessage receipt;
@@ -243,7 +244,7 @@ void tst_QXmppMessage::testMessageReceipt()
 
     const QByteArray oldXml(
         "<message id=\"richard2-4.1.247\" to=\"northumberland@shakespeare.lit/westminster\" from=\"kingrichard@royalty.england.lit/throne\" type=\"normal\">"
-          "<received xmlns=\"urn:xmpp:receipts\"/>"
+        "<received xmlns=\"urn:xmpp:receipts\"/>"
         "</message>");
 
     QXmppMessage old;
@@ -272,14 +273,14 @@ void tst_QXmppMessage::testDelay_data()
 
     QTest::newRow("delay")
         << QByteArray("<message type=\"normal\">"
-        "<delay xmlns=\"urn:xmpp:delay\" stamp=\"2010-06-29T08:23:06Z\"/>"
-        "</message>")
+                      "<delay xmlns=\"urn:xmpp:delay\" stamp=\"2010-06-29T08:23:06Z\"/>"
+                      "</message>")
         << QDateTime(QDate(2010, 06, 29), QTime(8, 23, 6), Qt::UTC);
 
     QTest::newRow("legacy")
         << QByteArray("<message type=\"normal\">"
-        "<x xmlns=\"jabber:x:delay\" stamp=\"20100629T08:23:06\"/>"
-        "</message>")
+                      "<x xmlns=\"jabber:x:delay\" stamp=\"20100629T08:23:06\"/>"
+                      "</message>")
         << QDateTime(QDate(2010, 06, 29), QTime(8, 23, 6), Qt::UTC);
 }
 
@@ -299,12 +300,12 @@ void tst_QXmppMessage::testDelayWithMultipleStamp()
     // the XEP-0203 should override XEP-0091's value since XEP-0091 was no more standard protocol
     QByteArray xml(
         "<message type=\"normal\">"
-            "<delay xmlns=\"urn:xmpp:delay\" stamp=\"2010-06-29T08:23:06.123Z\"/>"
-            "<x xmlns=\"jabber:x:delay\" stamp=\"20100629T08:23:06\"/>"
+        "<delay xmlns=\"urn:xmpp:delay\" stamp=\"2010-06-29T08:23:06.123Z\"/>"
+        "<x xmlns=\"jabber:x:delay\" stamp=\"20100629T08:23:06\"/>"
         "</message>");
     QByteArray resultXml(
         "<message type=\"normal\">"
-            "<delay xmlns=\"urn:xmpp:delay\" stamp=\"2010-06-29T08:23:06.123Z\"/>"
+        "<delay xmlns=\"urn:xmpp:delay\" stamp=\"2010-06-29T08:23:06.123Z\"/>"
         "</message>");
 
     QXmppMessage message;
@@ -318,10 +319,10 @@ void tst_QXmppMessage::testExtendedAddresses()
 {
     QByteArray xml(
         "<message to=\"multicast.jabber.org\" type=\"normal\">"
-            "<addresses xmlns=\"http://jabber.org/protocol/address\">"
-                "<address desc=\"Joe Hildebrand\" jid=\"hildjj@jabber.org/Work\" type=\"to\"/>"
-                "<address desc=\"Jeremie Miller\" jid=\"jer@jabber.org/Home\" type=\"cc\"/>"
-            "</addresses>"
+        "<addresses xmlns=\"http://jabber.org/protocol/address\">"
+        "<address desc=\"Joe Hildebrand\" jid=\"hildjj@jabber.org/Work\" type=\"to\"/>"
+        "<address desc=\"Jeremie Miller\" jid=\"jer@jabber.org/Home\" type=\"cc\"/>"
+        "</addresses>"
         "</message>");
 
     QXmppMessage message;
@@ -340,7 +341,7 @@ void tst_QXmppMessage::testMucInvitation()
 {
     QByteArray xml(
         "<message to=\"hecate@shakespeare.lit\" from=\"crone1@shakespeare.lit/desktop\" type=\"normal\">"
-            "<x xmlns=\"jabber:x:conference\" jid=\"darkcave@macbeth.shakespeare.lit\" password=\"cauldronburn\" reason=\"Hey Hecate, this is the place for all good witches!\"/>"
+        "<x xmlns=\"jabber:x:conference\" jid=\"darkcave@macbeth.shakespeare.lit\" password=\"cauldronburn\" reason=\"Hey Hecate, this is the place for all good witches!\"/>"
         "</message>");
 
     QXmppMessage message;
@@ -407,13 +408,13 @@ void tst_QXmppMessage::testState()
 void tst_QXmppMessage::testXhtml()
 {
     const QByteArray xml("<message type=\"normal\">"
-        "<body>hi!</body>"
-        "<html xmlns=\"http://jabber.org/protocol/xhtml-im\">"
-        "<body xmlns=\"http://www.w3.org/1999/xhtml\">"
-        "<p style=\"font-weight:bold\">hi!</p>"
-        "</body>"
-        "</html>"
-        "</message>");
+                         "<body>hi!</body>"
+                         "<html xmlns=\"http://jabber.org/protocol/xhtml-im\">"
+                         "<body xmlns=\"http://www.w3.org/1999/xhtml\">"
+                         "<p style=\"font-weight:bold\">hi!</p>"
+                         "</body>"
+                         "</html>"
+                         "</message>");
 
     QXmppMessage message;
     parsePacket(message, xml);
@@ -430,20 +431,19 @@ void tst_QXmppMessage::testSubextensions()
 {
     const QByteArray xml = QByteArrayLiteral(
         "<message id=\"aeb214\" to=\"juliet@capulet.lit/chamber\" type=\"normal\">"
-            "<result xmlns=\"urn:xmpp:mam:tmp\" id=\"5d398-28273-f7382\" queryid=\"f27\">"
-                "<forwarded xmlns=\"urn:xmpp:forward:0\">"
-                    "<delay xmlns=\"urn:xmpp:delay\" stamp=\"2010-07-10T23:09:32Z\"/>"
-                    "<message from=\"juliet@capulet.lit/balcony\" "
-                             "id=\"8a54s\" "
-                             "to=\"romeo@montague.lit/orchard\" "
-                             "type=\"chat\">"
-                        "<body>What man art thou that thus bescreen'd in night so stumblest on my counsel?</body>"
-                    "</message>"
-                "</forwarded>"
-            "</result>"
-            "<x xmlns=\"jabber:x:new-fancy-extension\"/>"
+        "<result xmlns=\"urn:xmpp:mam:tmp\" id=\"5d398-28273-f7382\" queryid=\"f27\">"
+        "<forwarded xmlns=\"urn:xmpp:forward:0\">"
+        "<delay xmlns=\"urn:xmpp:delay\" stamp=\"2010-07-10T23:09:32Z\"/>"
+        "<message from=\"juliet@capulet.lit/balcony\" "
+        "id=\"8a54s\" "
+        "to=\"romeo@montague.lit/orchard\" "
+        "type=\"chat\">"
+        "<body>What man art thou that thus bescreen'd in night so stumblest on my counsel?</body>"
         "</message>"
-    );
+        "</forwarded>"
+        "</result>"
+        "<x xmlns=\"jabber:x:new-fancy-extension\"/>"
+        "</message>");
 
     QXmppMessage message;
     parsePacket(message, xml);
@@ -455,14 +455,14 @@ void tst_QXmppMessage::testSubextensions()
 void tst_QXmppMessage::testChatMarkers()
 {
     const QByteArray markableXml(
-                "<message "
-                    "from='northumberland@shakespeare.lit/westminster' "
-                    "id='message-1' "
-                    "to='ingrichard@royalty.england.lit/throne'>"
-                 "<thread>sleeping</thread>"
-                 "<body>My lord, dispatch; read o'er these articles.</body>"
-                 "<markable xmlns='urn:xmpp:chat-markers:0'/>"
-                "</message>");
+        "<message "
+        "from='northumberland@shakespeare.lit/westminster' "
+        "id='message-1' "
+        "to='ingrichard@royalty.england.lit/throne'>"
+        "<thread>sleeping</thread>"
+        "<body>My lord, dispatch; read o'er these articles.</body>"
+        "<markable xmlns='urn:xmpp:chat-markers:0'/>"
+        "</message>");
 
     QXmppMessage markableMessage;
     parsePacket(markableMessage, markableXml);
@@ -474,14 +474,14 @@ void tst_QXmppMessage::testChatMarkers()
     QCOMPARE(markableMessage.markedThread(), QString());
 
     const QByteArray receivedXml(
-                "<message "
-                    "from='kingrichard@royalty.england.lit/throne' "
-                    "id='message-2' "
-                    "to='northumberland@shakespeare.lit/westminster'>"
-                  "<received xmlns='urn:xmpp:chat-markers:0' "
-                               "id='message-1' "
-                           "thread='sleeping'/>"
-                "</message>");
+        "<message "
+        "from='kingrichard@royalty.england.lit/throne' "
+        "id='message-2' "
+        "to='northumberland@shakespeare.lit/westminster'>"
+        "<received xmlns='urn:xmpp:chat-markers:0' "
+        "id='message-1' "
+        "thread='sleeping'/>"
+        "</message>");
 
     QXmppMessage receivedMessage;
     parsePacket(receivedMessage, receivedXml);
@@ -493,14 +493,14 @@ void tst_QXmppMessage::testChatMarkers()
     QCOMPARE(receivedMessage.markedThread(), QString("sleeping"));
 
     const QByteArray displayedXml(
-                "<message "
-                    "from='kingrichard@royalty.england.lit/throne' "
-                    "id='message-2' "
-                    "to='northumberland@shakespeare.lit/westminster'>"
-                  "<displayed xmlns='urn:xmpp:chat-markers:0' "
-                               "id='message-1' "
-                           "thread='sleeping'/>"
-                "</message>");
+        "<message "
+        "from='kingrichard@royalty.england.lit/throne' "
+        "id='message-2' "
+        "to='northumberland@shakespeare.lit/westminster'>"
+        "<displayed xmlns='urn:xmpp:chat-markers:0' "
+        "id='message-1' "
+        "thread='sleeping'/>"
+        "</message>");
 
     QXmppMessage displayedMessage;
     parsePacket(displayedMessage, displayedXml);
@@ -512,14 +512,14 @@ void tst_QXmppMessage::testChatMarkers()
     QCOMPARE(displayedMessage.markedThread(), QString("sleeping"));
 
     const QByteArray acknowledgedXml(
-                "<message "
-                    "from='kingrichard@royalty.england.lit/throne' "
-                    "id='message-2' "
-                    "to='northumberland@shakespeare.lit/westminster'>"
-                  "<acknowledged xmlns='urn:xmpp:chat-markers:0' "
-                               "id='message-1' "
-                           "thread='sleeping'/>"
-                "</message>");
+        "<message "
+        "from='kingrichard@royalty.england.lit/throne' "
+        "id='message-2' "
+        "to='northumberland@shakespeare.lit/westminster'>"
+        "<acknowledged xmlns='urn:xmpp:chat-markers:0' "
+        "id='message-1' "
+        "thread='sleeping'/>"
+        "</message>");
 
     QXmppMessage acknowledgedMessage;
     parsePacket(acknowledgedMessage, acknowledgedXml);
@@ -531,13 +531,13 @@ void tst_QXmppMessage::testChatMarkers()
     QCOMPARE(acknowledgedMessage.markedThread(), QString("sleeping"));
 
     const QByteArray emptyThreadXml(
-                "<message "
-                    "from='kingrichard@royalty.england.lit/throne' "
-                    "id='message-2' "
-                    "to='northumberland@shakespeare.lit/westminster'>"
-                  "<received xmlns='urn:xmpp:chat-markers:0' "
-                               "id='message-1'/>"
-                "</message>");
+        "<message "
+        "from='kingrichard@royalty.england.lit/throne' "
+        "id='message-2' "
+        "to='northumberland@shakespeare.lit/westminster'>"
+        "<received xmlns='urn:xmpp:chat-markers:0' "
+        "id='message-1'/>"
+        "</message>");
 
     QXmppMessage emptyThreadMessage;
     parsePacket(emptyThreadMessage, emptyThreadXml);
@@ -549,11 +549,11 @@ void tst_QXmppMessage::testChatMarkers()
     QCOMPARE(emptyThreadMessage.markedThread(), QString());
 
     const QByteArray notMarkableSerialisation(
-                "<message "
-                    "id=\"message-3\" "
-                    "to=\"northumberland@shakespeare.lit/westminster\" "
-                    "from=\"kingrichard@royalty.england.lit/throne\" "
-                    "type=\"chat\"/>");
+        "<message "
+        "id=\"message-3\" "
+        "to=\"northumberland@shakespeare.lit/westminster\" "
+        "from=\"kingrichard@royalty.england.lit/throne\" "
+        "type=\"chat\"/>");
 
     QXmppMessage serialisationMessage;
     serialisationMessage.setFrom("kingrichard@royalty.england.lit/throne");
@@ -563,26 +563,26 @@ void tst_QXmppMessage::testChatMarkers()
     serializePacket(serialisationMessage, notMarkableSerialisation);
 
     const QByteArray markableSerialisation(
-                "<message "
-                    "id=\"message-3\" "
-                    "to=\"northumberland@shakespeare.lit/westminster\" "
-                    "from=\"kingrichard@royalty.england.lit/throne\" "
-                    "type=\"chat\">"
-                    "<markable xmlns=\"urn:xmpp:chat-markers:0\"/>"
-                "</message>");
+        "<message "
+        "id=\"message-3\" "
+        "to=\"northumberland@shakespeare.lit/westminster\" "
+        "from=\"kingrichard@royalty.england.lit/throne\" "
+        "type=\"chat\">"
+        "<markable xmlns=\"urn:xmpp:chat-markers:0\"/>"
+        "</message>");
 
     serialisationMessage.setMarkable(true);
     serializePacket(serialisationMessage, markableSerialisation);
 
     const QByteArray receivedSerialisation(
-                "<message "
-                    "id=\"message-3\" "
-                    "to=\"northumberland@shakespeare.lit/westminster\" "
-                    "from=\"kingrichard@royalty.england.lit/throne\" "
-                    "type=\"chat\">"
-                    "<received xmlns=\"urn:xmpp:chat-markers:0\" "
-                               "id=\"message-2\"/>"
-                "</message>");
+        "<message "
+        "id=\"message-3\" "
+        "to=\"northumberland@shakespeare.lit/westminster\" "
+        "from=\"kingrichard@royalty.england.lit/throne\" "
+        "type=\"chat\">"
+        "<received xmlns=\"urn:xmpp:chat-markers:0\" "
+        "id=\"message-2\"/>"
+        "</message>");
 
     serialisationMessage.setMarkable(false);
     serialisationMessage.setMarker(QXmppMessage::Received);
@@ -590,15 +590,15 @@ void tst_QXmppMessage::testChatMarkers()
     serializePacket(serialisationMessage, receivedSerialisation);
 
     const QByteArray receivedThreadSerialisation(
-                "<message "
-                    "id=\"message-3\" "
-                    "to=\"northumberland@shakespeare.lit/westminster\" "
-                    "from=\"kingrichard@royalty.england.lit/throne\" "
-                    "type=\"chat\">"
-                    "<received xmlns=\"urn:xmpp:chat-markers:0\" "
-                               "id=\"message-2\" "
-                               "thread=\"sleeping\"/>"
-                "</message>");
+        "<message "
+        "id=\"message-3\" "
+        "to=\"northumberland@shakespeare.lit/westminster\" "
+        "from=\"kingrichard@royalty.england.lit/throne\" "
+        "type=\"chat\">"
+        "<received xmlns=\"urn:xmpp:chat-markers:0\" "
+        "id=\"message-2\" "
+        "thread=\"sleeping\"/>"
+        "</message>");
 
     serialisationMessage.setMarker(QXmppMessage::Received);
     serialisationMessage.setMarkerId("message-2");
@@ -606,15 +606,15 @@ void tst_QXmppMessage::testChatMarkers()
     serializePacket(serialisationMessage, receivedThreadSerialisation);
 
     const QByteArray displayedThreadSerialisation(
-                "<message "
-                    "id=\"message-3\" "
-                    "to=\"northumberland@shakespeare.lit/westminster\" "
-                    "from=\"kingrichard@royalty.england.lit/throne\" "
-                    "type=\"chat\">"
-                    "<displayed xmlns=\"urn:xmpp:chat-markers:0\" "
-                               "id=\"message-2\" "
-                               "thread=\"sleeping\"/>"
-                "</message>");
+        "<message "
+        "id=\"message-3\" "
+        "to=\"northumberland@shakespeare.lit/westminster\" "
+        "from=\"kingrichard@royalty.england.lit/throne\" "
+        "type=\"chat\">"
+        "<displayed xmlns=\"urn:xmpp:chat-markers:0\" "
+        "id=\"message-2\" "
+        "thread=\"sleeping\"/>"
+        "</message>");
 
     serialisationMessage.setMarker(QXmppMessage::Displayed);
     serialisationMessage.setMarkerId("message-2");
@@ -622,15 +622,15 @@ void tst_QXmppMessage::testChatMarkers()
     serializePacket(serialisationMessage, displayedThreadSerialisation);
 
     const QByteArray acknowledgedThreadSerialisation(
-                "<message "
-                    "id=\"message-3\" "
-                    "to=\"northumberland@shakespeare.lit/westminster\" "
-                    "from=\"kingrichard@royalty.england.lit/throne\" "
-                    "type=\"chat\">"
-                    "<acknowledged xmlns=\"urn:xmpp:chat-markers:0\" "
-                               "id=\"message-2\" "
-                               "thread=\"sleeping\"/>"
-                "</message>");
+        "<message "
+        "id=\"message-3\" "
+        "to=\"northumberland@shakespeare.lit/westminster\" "
+        "from=\"kingrichard@royalty.england.lit/throne\" "
+        "type=\"chat\">"
+        "<acknowledged xmlns=\"urn:xmpp:chat-markers:0\" "
+        "id=\"message-2\" "
+        "thread=\"sleeping\"/>"
+        "</message>");
 
     serialisationMessage.setMarker(QXmppMessage::Acknowledged);
     serialisationMessage.setMarkerId("message-2");
@@ -638,15 +638,13 @@ void tst_QXmppMessage::testChatMarkers()
     serializePacket(serialisationMessage, acknowledgedThreadSerialisation);
 }
 
-
 void tst_QXmppMessage::testPrivateMessage()
 {
     const QByteArray xml = QByteArrayLiteral(
         "<message type=\"chat\">"
-            "<body>My lord, dispatch; read o'er these articles.</body>"
-            "<private xmlns=\"urn:xmpp:carbons:2\"/>"
-        "</message>"
-    );
+        "<body>My lord, dispatch; read o'er these articles.</body>"
+        "<private xmlns=\"urn:xmpp:carbons:2\"/>"
+        "</message>");
 
     QXmppMessage message;
     parsePacket(message, xml);
@@ -667,14 +665,13 @@ void tst_QXmppMessage::testOutOfBandUrl()
 {
     const QByteArray oobXml(
         "<message to=\"MaineBoy@jabber.org/home\" "
-                 "from=\"stpeter@jabber.org/work\" "
-                 "type=\"chat\">"
-            "<body>Yeah, but do you have a license to Jabber?</body>"
-            "<x xmlns=\"jabber:x:oob\">"
-                "<url>http://www.jabber.org/images/psa-license.jpg</url>"
-            "</x>"
-        "</message>"
-    );
+        "from=\"stpeter@jabber.org/work\" "
+        "type=\"chat\">"
+        "<body>Yeah, but do you have a license to Jabber?</body>"
+        "<x xmlns=\"jabber:x:oob\">"
+        "<url>http://www.jabber.org/images/psa-license.jpg</url>"
+        "</x>"
+        "</message>");
     const QString firstUrl = "http://www.jabber.org/images/psa-license.jpg";
     const QString newUrl = "https://xmpp.org/theme/images/xmpp-logo.svg";
 
@@ -694,8 +691,8 @@ void tst_QXmppMessage::testMessageCorrect()
 {
     const QByteArray xml(
         "<message to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"normal\">"
-          "<body>This is the corrected version.</body>"
-          "<replace xmlns=\"urn:xmpp:message-correct:0\" id=\"badmessage\"/>"
+        "<body>This is the corrected version.</body>"
+        "<replace xmlns=\"urn:xmpp:message-correct:0\" id=\"badmessage\"/>"
         "</message>");
 
     QXmppMessage message;
@@ -711,8 +708,8 @@ void tst_QXmppMessage::testMessageAttaching()
 {
     const QByteArray xml(
         "<message to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"normal\">"
-          "<body>This is the corrected version.</body>"
-          "<attach-to xmlns=\"urn:xmpp:message-attaching:1\" id=\"SD24VCzSYQ\"/>"
+        "<body>This is the corrected version.</body>"
+        "<attach-to xmlns=\"urn:xmpp:message-attaching:1\" id=\"SD24VCzSYQ\"/>"
         "</message>");
 
     QXmppMessage message;
@@ -728,15 +725,14 @@ void tst_QXmppMessage::testMix()
 {
     const QByteArray xml(
         "<message to=\"hag66@shakespeare.example\" "
-                 "from=\"coven@mix.shakespeare.example/123456\" "
-                 "type=\"groupchat\">"
-            "<body>Harpier cries: 'tis time, 'tis time.</body>"
-            "<mix xmlns=\"urn:xmpp:mix:core:1\">"
-                "<jid>hag66@shakespeare.example</jid>"
-                "<nick>thirdwitch</nick>"
-            "</mix>"
-        "</message>"
-    );
+        "from=\"coven@mix.shakespeare.example/123456\" "
+        "type=\"groupchat\">"
+        "<body>Harpier cries: 'tis time, 'tis time.</body>"
+        "<mix xmlns=\"urn:xmpp:mix:core:1\">"
+        "<jid>hag66@shakespeare.example</jid>"
+        "<nick>thirdwitch</nick>"
+        "</mix>"
+        "</message>");
 
     QXmppMessage message;
     parsePacket(message, xml);
@@ -756,8 +752,8 @@ void tst_QXmppMessage::testEme()
     // test standard encryption: OMEMO
     const QByteArray xmlOmemo(
         "<message to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"normal\">"
-          "<body>This message is encrypted with OMEMO, but your client doesn't seem to support that.</body>"
-          "<encryption xmlns=\"urn:xmpp:eme:0\" namespace=\"eu.siacs.conversations.axolotl\"/>"
+        "<body>This message is encrypted with OMEMO, but your client doesn't seem to support that.</body>"
+        "<encryption xmlns=\"urn:xmpp:eme:0\" namespace=\"eu.siacs.conversations.axolotl\"/>"
         "</message>");
 
     QXmppMessage messageOmemo;
@@ -770,8 +766,8 @@ void tst_QXmppMessage::testEme()
     // test custom encryption
     const QByteArray xmlCustom(
         "<message to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"normal\">"
-          "<body>This message is encrypted with CustomCrypt, but your client doesn't seem to support that.</body>"
-          "<encryption xmlns=\"urn:xmpp:eme:0\" namespace=\"im:example:customcrypt:1\" name=\"CustomCrypt\"/>"
+        "<body>This message is encrypted with CustomCrypt, but your client doesn't seem to support that.</body>"
+        "<encryption xmlns=\"urn:xmpp:eme:0\" namespace=\"im:example:customcrypt:1\" name=\"CustomCrypt\"/>"
         "</message>");
 
     QXmppMessage messageCustom;
@@ -800,8 +796,8 @@ void tst_QXmppMessage::testSpoiler()
     // test parsing with hint
     const QByteArray xmlWithHint(
         "<message to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"normal\">"
-          "<body>And at the end of the story, both of them die! It is so tragic!</body>"
-          "<spoiler xmlns=\"urn:xmpp:spoiler:0\">Love story end</spoiler>"
+        "<body>And at the end of the story, both of them die! It is so tragic!</body>"
+        "<spoiler xmlns=\"urn:xmpp:spoiler:0\">Love story end</spoiler>"
         "</message>");
 
     QXmppMessage messageWithHint;
@@ -813,8 +809,8 @@ void tst_QXmppMessage::testSpoiler()
     // test parsing without hint
     const QByteArray xmlWithoutHint(
         "<message to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"normal\">"
-          "<body>And at the end of the story, both of them die! It is so tragic!</body>"
-          "<spoiler xmlns=\"urn:xmpp:spoiler:0\"></spoiler>"
+        "<body>And at the end of the story, both of them die! It is so tragic!</body>"
+        "<spoiler xmlns=\"urn:xmpp:spoiler:0\"></spoiler>"
         "</message>");
 
     QXmppMessage messageWithoutHint;
@@ -838,15 +834,14 @@ void tst_QXmppMessage::testProcessingHints()
 {
     const QByteArray xml(
         "<message to=\"juliet@capulet.lit/laptop\" "
-                 "from=\"romeo@montague.lit/laptop\" "
-                 "type=\"chat\">"
-            "<body>V unir avtug'f pybnx gb uvqr zr sebz gurve fvtug</body>"
-            "<no-permanent-store xmlns=\"urn:xmpp:hints\"/>"
-            "<no-store xmlns=\"urn:xmpp:hints\"/>"
-            "<no-copy xmlns=\"urn:xmpp:hints\"/>"
-            "<store xmlns=\"urn:xmpp:hints\"/>"
-        "</message>"
-    );
+        "from=\"romeo@montague.lit/laptop\" "
+        "type=\"chat\">"
+        "<body>V unir avtug'f pybnx gb uvqr zr sebz gurve fvtug</body>"
+        "<no-permanent-store xmlns=\"urn:xmpp:hints\"/>"
+        "<no-store xmlns=\"urn:xmpp:hints\"/>"
+        "<no-copy xmlns=\"urn:xmpp:hints\"/>"
+        "<store xmlns=\"urn:xmpp:hints\"/>"
+        "</message>");
 
     // test parsing
     QXmppMessage message;
@@ -884,38 +879,36 @@ void tst_QXmppMessage::testBobData()
 {
     const QByteArray xml = QByteArrayLiteral(
         "<message type=\"chat\">"
-            "<data xmlns=\"urn:xmpp:bob\" "
-                    "cid=\"sha1+5a4c38d44fc64805cbb2d92d8b208be13ff40c0f@bob.xmpp.org\" "
-                    "max-age=\"86400\" "
-                    "type=\"image/png\">"
-                "iVBORw0KGgoAAAANSUhEUgAAALQAAAA8BAMAAAA9AI20AAAAG1BMVEX///8AAADf39+"
-                "/v79/f39fX1+fn58/Pz8fHx/8ACGJAAAACXBIWXMAAA7EAAAOxAGVKw4bAAADS0lEQV"
-                "RYhe2WS3MSQRCAYTf7OKY1kT0CxsRjHmh5BENIjqEk6pHVhFzdikqO7CGyP9t59Ox2z"
-                "y6UeWBVqugLzM70Nz39mqnV1lIWgBWiYXV0BYfNZ0mvwypds1r62vH/gf76ZL/88Qlc"
-                "41zeAnQrpx5H3z1Npfr5ovmHusa9SpRiNNIOcdrto6PJ5LLfb5bp9zM+VDq/vptxDEa"
-                "a1sql9I3R5KhtfQsA5gNCWYyulV3TyTUDdfL56BvdDl4x7RiybDq9uBgxh1TTPUHDvA"
-                "qNQb+LpT5sWehxJZKKcU2MZ6sDE7PMgW2mdlBGdy6ODe6fJFdMI+us95dNqftDMdwU6"
-                "+MhpuTS9slcy5TFAcwq0Jt6qssJMTQGp4BGURlmSsNoo5oHL4kqc66NdkDO75mIfCxm"
-                "RAlvHxMLdcb7JONavMJbttXXKoMSneYu3OQTlwkUh4mNayi6js55/2VcsZOQfXIYelz"
-                "xLcntEGc3WVCsCORJVCc5r0ajAcq+EO1Q0oPm7n7+X/3jEReGdL6qT7Ml6FCjY+quJC"
-                "r+D01f6BG0SaHG56ZG32DnY2jcEV1+pU0kxTaEwaGcekN7jyu50U/TV4q6YeieyiNTu"
-                "klDKZLukyjKVNwotCUB3B0XO1WjHT3c0DHSO2zACwut8GOiljJIHaJsrlof/fpWNzGM"
-                "os6TgIY0hZNpJshzSi4igOhy3cl4qK+YgnqHkAYcZEgdW6/HyrEK7afoY7RCFzArLl2"
-                "LLDdrdmmHZfROajwIDfWj8yQG+rzwlA3WvdJiMHtjUekiNrp1oCbmyZDEyKROGjFVDr"
-                "PRzlkR9UAfG/OErnPxrop5BwpoEpXQorq2zcGxbnBJndx8Bh0yljGiGv0B4E8+YP3Xp"
-                "2rGydZNy4csW8W2pIvWhvijoujRJ0luXsoymV+8AXvE9HjII72+oReS6OfomHe3xWg/"
-                "f2coSbDa1XZ1CvGMjy1nH9KBl83oPnQKi+vAXKLjCrRvvT2WCMkPmSFbquiVuTH1qjv"
-                "p4j/u7CWyI5/Hn3KAaJJ90eP0Zp1Kjets4WPaElkxheF7cpBESzXuIdLwyFjSub07tB"
-                "6JjxH3DGiu+zwHHimdtFsMvKqG/nBxm2TwbvyU6LWs5RnJX4dSldg3QhDLAAAAAElFT"
-                "kSuQmCC"
-            "</data>"
-        "</message>"
-    );
+        "<data xmlns=\"urn:xmpp:bob\" "
+        "cid=\"sha1+5a4c38d44fc64805cbb2d92d8b208be13ff40c0f@bob.xmpp.org\" "
+        "max-age=\"86400\" "
+        "type=\"image/png\">"
+        "iVBORw0KGgoAAAANSUhEUgAAALQAAAA8BAMAAAA9AI20AAAAG1BMVEX///8AAADf39+"
+        "/v79/f39fX1+fn58/Pz8fHx/8ACGJAAAACXBIWXMAAA7EAAAOxAGVKw4bAAADS0lEQV"
+        "RYhe2WS3MSQRCAYTf7OKY1kT0CxsRjHmh5BENIjqEk6pHVhFzdikqO7CGyP9t59Ox2z"
+        "y6UeWBVqugLzM70Nz39mqnV1lIWgBWiYXV0BYfNZ0mvwypds1r62vH/gf76ZL/88Qlc"
+        "41zeAnQrpx5H3z1Npfr5ovmHusa9SpRiNNIOcdrto6PJ5LLfb5bp9zM+VDq/vptxDEa"
+        "a1sql9I3R5KhtfQsA5gNCWYyulV3TyTUDdfL56BvdDl4x7RiybDq9uBgxh1TTPUHDvA"
+        "qNQb+LpT5sWehxJZKKcU2MZ6sDE7PMgW2mdlBGdy6ODe6fJFdMI+us95dNqftDMdwU6"
+        "+MhpuTS9slcy5TFAcwq0Jt6qssJMTQGp4BGURlmSsNoo5oHL4kqc66NdkDO75mIfCxm"
+        "RAlvHxMLdcb7JONavMJbttXXKoMSneYu3OQTlwkUh4mNayi6js55/2VcsZOQfXIYelz"
+        "xLcntEGc3WVCsCORJVCc5r0ajAcq+EO1Q0oPm7n7+X/3jEReGdL6qT7Ml6FCjY+quJC"
+        "r+D01f6BG0SaHG56ZG32DnY2jcEV1+pU0kxTaEwaGcekN7jyu50U/TV4q6YeieyiNTu"
+        "klDKZLukyjKVNwotCUB3B0XO1WjHT3c0DHSO2zACwut8GOiljJIHaJsrlof/fpWNzGM"
+        "os6TgIY0hZNpJshzSi4igOhy3cl4qK+YgnqHkAYcZEgdW6/HyrEK7afoY7RCFzArLl2"
+        "LLDdrdmmHZfROajwIDfWj8yQG+rzwlA3WvdJiMHtjUekiNrp1oCbmyZDEyKROGjFVDr"
+        "PRzlkR9UAfG/OErnPxrop5BwpoEpXQorq2zcGxbnBJndx8Bh0yljGiGv0B4E8+YP3Xp"
+        "2rGydZNy4csW8W2pIvWhvijoujRJ0luXsoymV+8AXvE9HjII72+oReS6OfomHe3xWg/"
+        "f2coSbDa1XZ1CvGMjy1nH9KBl83oPnQKi+vAXKLjCrRvvT2WCMkPmSFbquiVuTH1qjv"
+        "p4j/u7CWyI5/Hn3KAaJJ90eP0Zp1Kjets4WPaElkxheF7cpBESzXuIdLwyFjSub07tB"
+        "6JjxH3DGiu+zwHHimdtFsMvKqG/nBxm2TwbvyU6LWs5RnJX4dSldg3QhDLAAAAAElFT"
+        "kSuQmCC"
+        "</data>"
+        "</message>");
 
     QXmppBitsOfBinaryData data;
     data.setCid(QXmppBitsOfBinaryContentId::fromContentId(
-        QStringLiteral("sha1+5a4c38d44fc64805cbb2d92d8b208be13ff40c0f@bob.xmpp.org")
-    ));
+        QStringLiteral("sha1+5a4c38d44fc64805cbb2d92d8b208be13ff40c0f@bob.xmpp.org")));
     data.setContentType(QMimeDatabase().mimeTypeForName(QStringLiteral("image/png")));
     data.setData(QByteArray::fromBase64(QByteArrayLiteral(
         "iVBORw0KGgoAAAANSUhEUgAAALQAAAA8BAMAAAA9AI20AAAAG1BMVEX///8AAADf39+"
@@ -937,8 +930,7 @@ void tst_QXmppMessage::testBobData()
         "f2coSbDa1XZ1CvGMjy1nH9KBl83oPnQKi+vAXKLjCrRvvT2WCMkPmSFbquiVuTH1qjv"
         "p4j/u7CWyI5/Hn3KAaJJ90eP0Zp1Kjets4WPaElkxheF7cpBESzXuIdLwyFjSub07tB"
         "6JjxH3DGiu+zwHHimdtFsMvKqG/nBxm2TwbvyU6LWs5RnJX4dSldg3QhDLAAAAAElFT"
-        "kSuQmCC"
-    )));
+        "kSuQmCC")));
     data.setMaxAge(86400);
 
     QXmppMessage message;
diff --git a/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp b/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp
index 6bf53cf2..750628dc 100644
--- a/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp
+++ b/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp
@@ -59,25 +59,23 @@ void tst_QXmppMessageReceiptManager::testReceipt_data()
     QTest::addColumn<bool>("accept");
 
     QTest::newRow("correct")
-            << QByteArray(
-                   "<message id=\"bi29sg183b4v\" "
-                        "to=\"northumberland@shakespeare.lit/westminster\" "
-                        "from=\"kingrichard@royalty.england.lit/throne\" "
-                        "type=\"normal\">"
-                     "<received xmlns=\"urn:xmpp:receipts\" id=\"richard2-4.1.247\"/>"
-                   "</message>"
-               )
-            << true;
+        << QByteArray(
+               "<message id=\"bi29sg183b4v\" "
+               "to=\"northumberland@shakespeare.lit/westminster\" "
+               "from=\"kingrichard@royalty.england.lit/throne\" "
+               "type=\"normal\">"
+               "<received xmlns=\"urn:xmpp:receipts\" id=\"richard2-4.1.247\"/>"
+               "</message>")
+        << true;
     QTest::newRow("from-to-equal")
-            << QByteArray(
-                   "<message id=\"bi29sg183b4v\" "
-                        "to=\"kingrichard@royalty.england.lit/westminster\" "
-                        "from=\"kingrichard@royalty.england.lit/throne\" "
-                        "type=\"normal\">"
-                     "<received xmlns=\"urn:xmpp:receipts\" id=\"richard2-4.1.247\"/>"
-                   "</message>"
-               )
-            << false;
+        << QByteArray(
+               "<message id=\"bi29sg183b4v\" "
+               "to=\"kingrichard@royalty.england.lit/westminster\" "
+               "from=\"kingrichard@royalty.england.lit/throne\" "
+               "type=\"normal\">"
+               "<received xmlns=\"urn:xmpp:receipts\" id=\"richard2-4.1.247\"/>"
+               "</message>")
+        << false;
 }
 
 void tst_QXmppMessageReceiptManager::testReceipt()
diff --git a/tests/qxmppmixiq/tst_qxmppmixiq.cpp b/tests/qxmppmixiq/tst_qxmppmixiq.cpp
index 7387c667..5242e099 100644
--- a/tests/qxmppmixiq/tst_qxmppmixiq.cpp
+++ b/tests/qxmppmixiq/tst_qxmppmixiq.cpp
@@ -45,175 +45,161 @@ void tst_QXmppMixIq::testBase_data()
 {
     QByteArray joinC2sSetXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example\" "
-            "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "type=\"set\">"
-            "<client-join xmlns=\"urn:xmpp:mix:pam:1\" channel=\"coven@mix.shakespeare.example\">"
-                "<join xmlns=\"urn:xmpp:mix:core:1\">"
-                    "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
-                    "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
-                    "<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>"
-                    "<subscribe node=\"urn:xmpp:mix:nodes:info\"/>"
-                    "<nick>third witch</nick>"
-                "</join>"
-            "</client-join>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example\" "
+        "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "type=\"set\">"
+        "<client-join xmlns=\"urn:xmpp:mix:pam:1\" channel=\"coven@mix.shakespeare.example\">"
+        "<join xmlns=\"urn:xmpp:mix:core:1\">"
+        "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
+        "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
+        "<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>"
+        "<subscribe node=\"urn:xmpp:mix:nodes:info\"/>"
+        "<nick>third witch</nick>"
+        "</join>"
+        "</client-join>"
+        "</iq>");
     QByteArray joinS2sSetXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"coven@mix.shakespeare.example\" "
-            "from=\"hag66@shakespeare.example\" "
-            "type=\"set\">"
-            "<join xmlns=\"urn:xmpp:mix:core:1\">"
-                "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
-                "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
-                "<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>"
-                "<subscribe node=\"urn:xmpp:mix:nodes:info\"/>"
-                "<nick>stpeter</nick>"
-            "</join>"
-        "</iq>"
-    );
+        "to=\"coven@mix.shakespeare.example\" "
+        "from=\"hag66@shakespeare.example\" "
+        "type=\"set\">"
+        "<join xmlns=\"urn:xmpp:mix:core:1\">"
+        "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
+        "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
+        "<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>"
+        "<subscribe node=\"urn:xmpp:mix:nodes:info\"/>"
+        "<nick>stpeter</nick>"
+        "</join>"
+        "</iq>");
     QByteArray joinS2sResultXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example\" "
-            "from=\"coven@mix.shakespeare.example\" "
-            "type=\"result\">"
-            "<join xmlns=\"urn:xmpp:mix:core:1\" jid=\"123456#coven@mix.shakespeare.example\">"
-                "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
-                "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
-                "<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>"
-                "<subscribe node=\"urn:xmpp:mix:nodes:info\"/>"
-                "<nick>third witch</nick>"
-            "</join>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example\" "
+        "from=\"coven@mix.shakespeare.example\" "
+        "type=\"result\">"
+        "<join xmlns=\"urn:xmpp:mix:core:1\" jid=\"123456#coven@mix.shakespeare.example\">"
+        "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
+        "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
+        "<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>"
+        "<subscribe node=\"urn:xmpp:mix:nodes:info\"/>"
+        "<nick>third witch</nick>"
+        "</join>"
+        "</iq>");
     QByteArray joinC2sResultXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "from=\"hag66@shakespeare.example\" "
-            "type=\"result\">"
-           "<client-join xmlns=\"urn:xmpp:mix:pam:1\">"
-               "<join xmlns=\"urn:xmpp:mix:core:1\" "
-                     "jid=\"123456#coven@mix.shakespeare.example\">"
-                   "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
-                   "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
-                   "<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>"
-                   "<subscribe node=\"urn:xmpp:mix:nodes:info\"/>"
-               "</join>"
-           "</client-join>"
-       "</iq>"
-    );
+        "to=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "from=\"hag66@shakespeare.example\" "
+        "type=\"result\">"
+        "<client-join xmlns=\"urn:xmpp:mix:pam:1\">"
+        "<join xmlns=\"urn:xmpp:mix:core:1\" "
+        "jid=\"123456#coven@mix.shakespeare.example\">"
+        "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
+        "<subscribe node=\"urn:xmpp:mix:nodes:presence\"/>"
+        "<subscribe node=\"urn:xmpp:mix:nodes:participants\"/>"
+        "<subscribe node=\"urn:xmpp:mix:nodes:info\"/>"
+        "</join>"
+        "</client-join>"
+        "</iq>");
     QByteArray leaveC2sSetXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example\" "
-            "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "type=\"set\">"
-            "<client-leave xmlns=\"urn:xmpp:mix:pam:1\" channel=\"coven@mix.shakespeare.example\">"
-                "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
-            "</client-leave>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example\" "
+        "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "type=\"set\">"
+        "<client-leave xmlns=\"urn:xmpp:mix:pam:1\" channel=\"coven@mix.shakespeare.example\">"
+        "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
+        "</client-leave>"
+        "</iq>");
     QByteArray leaveS2sSetXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"coven@mix.shakespeare.example\" "
-            "from=\"hag66@shakespeare.example\" "
-            "type=\"set\">"
-            "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
-        "</iq>"
-    );
+        "to=\"coven@mix.shakespeare.example\" "
+        "from=\"hag66@shakespeare.example\" "
+        "type=\"set\">"
+        "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
+        "</iq>");
     QByteArray leaveS2sResultXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example\" "
-            "from=\"coven@mix.shakespeare.example\" "
-            "type=\"result\">"
-            "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example\" "
+        "from=\"coven@mix.shakespeare.example\" "
+        "type=\"result\">"
+        "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
+        "</iq>");
     QByteArray leaveC2sResultXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "from=\"hag66@shakespeare.example\" "
-            "type=\"result\">"
-            "<client-leave xmlns=\"urn:xmpp:mix:pam:1\">"
-                "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
-            "</client-leave>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "from=\"hag66@shakespeare.example\" "
+        "type=\"result\">"
+        "<client-leave xmlns=\"urn:xmpp:mix:pam:1\">"
+        "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
+        "</client-leave>"
+        "</iq>");
     QByteArray updateSubscriptionSetXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example\" "
-            "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "type=\"set\">"
-            "<update-subscription xmlns=\"urn:xmpp:mix:core:1\">"
-                "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
-            "</update-subscription>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example\" "
+        "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "type=\"set\">"
+        "<update-subscription xmlns=\"urn:xmpp:mix:core:1\">"
+        "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
+        "</update-subscription>"
+        "</iq>");
     QByteArray updateSubscriptionResultXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "from=\"hag66@shakespeare.example\" "
-            "type=\"result\">"
-            "<update-subscription xmlns=\"urn:xmpp:mix:core:1\" jid=\"hag66@shakespeare.example\">"
-                "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
-            "</update-subscription>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "from=\"hag66@shakespeare.example\" "
+        "type=\"result\">"
+        "<update-subscription xmlns=\"urn:xmpp:mix:core:1\" jid=\"hag66@shakespeare.example\">"
+        "<subscribe node=\"urn:xmpp:mix:nodes:messages\"/>"
+        "</update-subscription>"
+        "</iq>");
     QByteArray setNickSetXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example\" "
-            "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "type=\"set\">"
-            "<setnick xmlns=\"urn:xmpp:mix:core:1\">"
-                "<nick>thirdwitch</nick>"
-            "</setnick>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example\" "
+        "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "type=\"set\">"
+        "<setnick xmlns=\"urn:xmpp:mix:core:1\">"
+        "<nick>thirdwitch</nick>"
+        "</setnick>"
+        "</iq>");
     QByteArray setNickResultXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "from=\"hag66@shakespeare.example\" "
-            "type=\"result\">"
-            "<setnick xmlns=\"urn:xmpp:mix:core:1\">"
-                "<nick>thirdwitch</nick>"
-            "</setnick>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "from=\"hag66@shakespeare.example\" "
+        "type=\"result\">"
+        "<setnick xmlns=\"urn:xmpp:mix:core:1\">"
+        "<nick>thirdwitch</nick>"
+        "</setnick>"
+        "</iq>");
     QByteArray createXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example\" "
-            "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "type=\"set\">"
-            "<create xmlns=\"urn:xmpp:mix:core:1\" channel=\"coven\"/>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example\" "
+        "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "type=\"set\">"
+        "<create xmlns=\"urn:xmpp:mix:core:1\" channel=\"coven\"/>"
+        "</iq>");
     QByteArray createWithoutNameXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example\" "
-            "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "type=\"set\">"
-            "<create xmlns=\"urn:xmpp:mix:core:1\"/>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example\" "
+        "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "type=\"set\">"
+        "<create xmlns=\"urn:xmpp:mix:core:1\"/>"
+        "</iq>");
     QByteArray destroyXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example\" "
-            "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "type=\"set\">"
-            "<destroy xmlns=\"urn:xmpp:mix:core:1\" channel=\"coven\"/>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example\" "
+        "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "type=\"set\">"
+        "<destroy xmlns=\"urn:xmpp:mix:core:1\" channel=\"coven\"/>"
+        "</iq>");
     QByteArray emptyXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example\" "
-            "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "type=\"set\"/>"
-    );
+        "to=\"hag66@shakespeare.example\" "
+        "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "type=\"set\"/>");
 
     QStringList emptyNodes;
     QStringList defaultNodes;
-    defaultNodes << "urn:xmpp:mix:nodes:messages" << "urn:xmpp:mix:nodes:presence"
-                 << "urn:xmpp:mix:nodes:participants" << "urn:xmpp:mix:nodes:info";
+    defaultNodes << "urn:xmpp:mix:nodes:messages"
+                 << "urn:xmpp:mix:nodes:presence"
+                 << "urn:xmpp:mix:nodes:participants"
+                 << "urn:xmpp:mix:nodes:info";
 
     QTest::addColumn<QByteArray>("xml");
     QTest::addColumn<QXmppIq::Type>("type");
@@ -265,17 +251,20 @@ void tst_QXmppMixIq::testBase_data()
         << leaveS2sSetXml
         << QXmppIq::Set
         << QXmppMixIq::Leave
-        << "" << "" << emptyNodes << "";
+        << ""
+        << "" << emptyNodes << "";
     QTest::newRow("leave-s2s-result")
         << leaveS2sResultXml
         << QXmppIq::Result
         << QXmppMixIq::Leave
-        << "" << "" << emptyNodes << "";
+        << ""
+        << "" << emptyNodes << "";
     QTest::newRow("leave-c2s-result")
         << leaveC2sResultXml
         << QXmppIq::Result
         << QXmppMixIq::ClientLeave
-        << "" << "" << emptyNodes << "";
+        << ""
+        << "" << emptyNodes << "";
     QTest::newRow("update-subscription-set")
         << updateSubscriptionSetXml
         << QXmppIq::Set
@@ -296,34 +285,40 @@ void tst_QXmppMixIq::testBase_data()
         << setNickSetXml
         << QXmppIq::Set
         << QXmppMixIq::SetNick
-        << "" << "" << emptyNodes
+        << ""
+        << "" << emptyNodes
         << "thirdwitch";
     QTest::newRow("setnick-result")
         << setNickResultXml
         << QXmppIq::Result
         << QXmppMixIq::SetNick
-        << "" << "" << emptyNodes
+        << ""
+        << "" << emptyNodes
         << "thirdwitch";
     QTest::newRow("create")
         << createXml
         << QXmppIq::Set
         << QXmppMixIq::Create
-        << "" << "coven" << emptyNodes << "";
+        << ""
+        << "coven" << emptyNodes << "";
     QTest::newRow("create-without-name")
         << createWithoutNameXml
         << QXmppIq::Set
         << QXmppMixIq::Create
-        << "" << "" << emptyNodes << "";
+        << ""
+        << "" << emptyNodes << "";
     QTest::newRow("destroy")
         << destroyXml
         << QXmppIq::Set
         << QXmppMixIq::Destroy
-        << "" << "coven" << emptyNodes << "";
+        << ""
+        << "coven" << emptyNodes << "";
     QTest::newRow("empty")
         << emptyXml
         << QXmppIq::Set
         << QXmppMixIq::None
-        << "" << "" << emptyNodes << "";
+        << ""
+        << "" << emptyNodes << "";
 }
 
 void tst_QXmppMixIq::testBase()
@@ -376,30 +371,27 @@ void tst_QXmppMixIq::testIsMixIq()
 {
     const QByteArray trueXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example\" "
-            "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "type=\"set\">"
-            "<destroy xmlns=\"urn:xmpp:mix:core:1\" channel=\"coven\"/>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example\" "
+        "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "type=\"set\">"
+        "<destroy xmlns=\"urn:xmpp:mix:core:1\" channel=\"coven\"/>"
+        "</iq>");
     const QByteArray truePamXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example\" "
-            "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "type=\"set\">"
-            "<client-leave xmlns=\"urn:xmpp:mix:pam:1\" channel=\"coven@mix.shakespeare.example\">"
-                "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
-            "</client-leave>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example\" "
+        "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "type=\"set\">"
+        "<client-leave xmlns=\"urn:xmpp:mix:pam:1\" channel=\"coven@mix.shakespeare.example\">"
+        "<leave xmlns=\"urn:xmpp:mix:core:1\"/>"
+        "</client-leave>"
+        "</iq>");
     const QByteArray falseXml(
         "<iq id=\"E6E10350-76CF-40C6-B91B-1EA08C332FC7\" "
-            "to=\"hag66@shakespeare.example\" "
-            "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
-            "type=\"set\">"
-            "<destroy xmlns=\"something:else\" channel=\"coven\"/>"
-        "</iq>"
-    );
+        "to=\"hag66@shakespeare.example\" "
+        "from=\"hag66@shakespeare.example/UUID-a1j/7533\" "
+        "type=\"set\">"
+        "<destroy xmlns=\"something:else\" channel=\"coven\"/>"
+        "</iq>");
 
     QDomDocument doc;
     doc.setContent(trueXml, true);
diff --git a/tests/qxmppmixitem/tst_qxmppmixitem.cpp b/tests/qxmppmixitem/tst_qxmppmixitem.cpp
index 2120aa74..bfb4004e 100644
--- a/tests/qxmppmixitem/tst_qxmppmixitem.cpp
+++ b/tests/qxmppmixitem/tst_qxmppmixitem.cpp
@@ -43,22 +43,21 @@ void tst_QXmppMixItem::testInfo()
 {
     const QByteArray xml(
         "<x xmlns=\"jabber:x:data\" type=\"result\">"
-            "<field type=\"hidden\" var=\"FORM_TYPE\">"
-                "<value>urn:xmpp:mix:core:1</value>"
-            "</field>"
-            "<field type=\"text-single\" var=\"Name\">"
-                "<value>Witches Coven</value>"
-            "</field>"
-            "<field type=\"text-single\" var=\"Description\">"
-                "<value>A location not far from the blasted heath where the "
-                       "three witches meet</value>"
-            "</field>"
-            "<field type=\"jid-multi\" var=\"Contact\">"
-                "<value>greymalkin@shakespeare.example</value>"
-                "<value>joan@shakespeare.example</value>"
-            "</field>"
-        "</x>"
-    );
+        "<field type=\"hidden\" var=\"FORM_TYPE\">"
+        "<value>urn:xmpp:mix:core:1</value>"
+        "</field>"
+        "<field type=\"text-single\" var=\"Name\">"
+        "<value>Witches Coven</value>"
+        "</field>"
+        "<field type=\"text-single\" var=\"Description\">"
+        "<value>A location not far from the blasted heath where the "
+        "three witches meet</value>"
+        "</field>"
+        "<field type=\"jid-multi\" var=\"Contact\">"
+        "<value>greymalkin@shakespeare.example</value>"
+        "<value>joan@shakespeare.example</value>"
+        "</field>"
+        "</x>");
 
     QXmppMixInfoItem item;
     parsePacket(item, xml);
@@ -88,22 +87,20 @@ void tst_QXmppMixItem::testIsInfoItem()
 
     const QByteArray xmlCorrect(
         "<x xmlns=\"jabber:x:data\" type=\"result\">"
-            "<field type=\"hidden\" var=\"FORM_TYPE\">"
-                "<value>urn:xmpp:mix:core:1</value>"
-            "</field>"
-        "</x>"
-    );
+        "<field type=\"hidden\" var=\"FORM_TYPE\">"
+        "<value>urn:xmpp:mix:core:1</value>"
+        "</field>"
+        "</x>");
     QCOMPARE(doc.setContent(xmlCorrect, true), true);
     element = doc.documentElement();
     QVERIFY(QXmppMixInfoItem::isMixChannelInfo(element));
 
     const QByteArray xmlWrong(
         "<x xmlns=\"jabber:x:data\" type=\"result\">"
-            "<field type=\"hidden\" var=\"FORM_TYPE\">"
-                "<value>other:namespace</value>"
-            "</field>"
-        "</x>"
-    );
+        "<field type=\"hidden\" var=\"FORM_TYPE\">"
+        "<value>other:namespace</value>"
+        "</field>"
+        "</x>");
     QCOMPARE(doc.setContent(xmlWrong, true), true);
     element = doc.documentElement();
     QVERIFY(!QXmppMixInfoItem::isMixChannelInfo(element));
@@ -113,10 +110,9 @@ void tst_QXmppMixItem::testParticipant()
 {
     const QByteArray xml(
         "<participant xmlns=\"urn:xmpp:mix:core:1\">"
-            "<jid>hag66@shakespeare.example</jid>"
-            "<nick>thirdwitch</nick>"
-        "</participant>"
-    );
+        "<jid>hag66@shakespeare.example</jid>"
+        "<nick>thirdwitch</nick>"
+        "</participant>");
 
     QXmppMixParticipantItem item;
     parsePacket(item, xml);
@@ -141,16 +137,14 @@ void tst_QXmppMixItem::testIsParticipantItem()
 
     const QByteArray xmlCorrect(
         "<participant xmlns=\"urn:xmpp:mix:core:1\">"
-        "</participant>"
-    );
+        "</participant>");
     QCOMPARE(doc.setContent(xmlCorrect, true), true);
     element = doc.documentElement();
     QVERIFY(QXmppMixParticipantItem::isMixParticipantItem(element));
 
     const QByteArray xmlWrong(
         "<participant xmlns=\"other:namespace:1\">"
-        "</participant>"
-    );
+        "</participant>");
     QCOMPARE(doc.setContent(xmlWrong, true), true);
     element = doc.documentElement();
     QVERIFY(!QXmppMixParticipantItem::isMixParticipantItem(element));
diff --git a/tests/qxmpppresence/tst_qxmpppresence.cpp b/tests/qxmpppresence/tst_qxmpppresence.cpp
index 701b9192..247858b2 100644
--- a/tests/qxmpppresence/tst_qxmpppresence.cpp
+++ b/tests/qxmpppresence/tst_qxmpppresence.cpp
@@ -79,16 +79,18 @@ void tst_QXmppPresence::testPresence_data()
 
     // photo
     QTest::newRow("vcard-photo") << QByteArray(
-        "<presence>"
-        "<x xmlns=\"vcard-temp:x:update\">"
-        "<photo>73b908bc</photo>"
-        "</x>"
-        "</presence>") << int(QXmppPresence::Available) << 0 << int(QXmppPresence::Online) << "" << int(QXmppPresence::VCardUpdateValidPhoto) << QByteArray::fromHex("73b908bc");
+                                        "<presence>"
+                                        "<x xmlns=\"vcard-temp:x:update\">"
+                                        "<photo>73b908bc</photo>"
+                                        "</x>"
+                                        "</presence>")
+                                 << int(QXmppPresence::Available) << 0 << int(QXmppPresence::Online) << "" << int(QXmppPresence::VCardUpdateValidPhoto) << QByteArray::fromHex("73b908bc");
 
     QTest::newRow("vard-not-ready") << QByteArray(
-        "<presence>"
-        "<x xmlns=\"vcard-temp:x:update\"/>"
-        "</presence>") << int(QXmppPresence::Available) << 0 << int(QXmppPresence::Online) << "" << int(QXmppPresence::VCardUpdateNotReady) << QByteArray();
+                                           "<presence>"
+                                           "<x xmlns=\"vcard-temp:x:update\"/>"
+                                           "</presence>")
+                                    << int(QXmppPresence::Available) << 0 << int(QXmppPresence::Online) << "" << int(QXmppPresence::VCardUpdateNotReady) << QByteArray();
 }
 
 void tst_QXmppPresence::testPresence()
@@ -129,16 +131,15 @@ void tst_QXmppPresence::testPresenceWithCapability()
 {
     const QByteArray xml(
         "<presence to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\">"
-            "<show>away</show>"
-            "<status>In a meeting</status>"
-            "<priority>5</priority>"
-            "<c xmlns=\"http://jabber.org/protocol/caps\" hash=\"sha-1\" node=\"https://github.com/qxmpp-project/qxmpp\" ver=\"QgayPKawpkPSDYmwT/WM94uAlu0=\"/>"
-            "<x xmlns=\"vcard-temp:x:update\">"
-                "<photo>73b908bc</photo>"
-            "</x>"
-            "<x xmlns=\"urn:other:namespace\"/>"
-        "</presence>"
-    );
+        "<show>away</show>"
+        "<status>In a meeting</status>"
+        "<priority>5</priority>"
+        "<c xmlns=\"http://jabber.org/protocol/caps\" hash=\"sha-1\" node=\"https://github.com/qxmpp-project/qxmpp\" ver=\"QgayPKawpkPSDYmwT/WM94uAlu0=\"/>"
+        "<x xmlns=\"vcard-temp:x:update\">"
+        "<photo>73b908bc</photo>"
+        "</x>"
+        "<x xmlns=\"urn:other:namespace\"/>"
+        "</presence>");
 
     // test parsing and serialization after parsing
     QXmppPresence presence;
@@ -183,10 +184,10 @@ void tst_QXmppPresence::testPresenceWithExtendedAddresses()
 {
     const QByteArray xml(
         "<presence to=\"multicast.jabber.org\" from=\"hildjj@jabber.com\" type=\"unavailable\">"
-            "<addresses xmlns=\"http://jabber.org/protocol/address\">"
-                "<address jid=\"temas@jabber.org\" type=\"bcc\"/>"
-                "<address jid=\"jer@jabber.org\" type=\"bcc\"/>"
-            "</addresses>"
+        "<addresses xmlns=\"http://jabber.org/protocol/address\">"
+        "<address jid=\"temas@jabber.org\" type=\"bcc\"/>"
+        "<address jid=\"jer@jabber.org\" type=\"bcc\"/>"
+        "</addresses>"
         "</presence>");
 
     QXmppPresence presence;
@@ -205,15 +206,15 @@ void tst_QXmppPresence::testPresenceWithMucItem()
 {
     const QByteArray xml(
         "<presence to=\"pistol@shakespeare.lit/harfleur\" "
-                  "from=\"harfleur@henryv.shakespeare.lit/pistol\" "
-                  "type=\"unavailable\">"
-            "<x xmlns=\"http://jabber.org/protocol/muc#user\">"
-                "<item affiliation=\"none\" role=\"none\">"
-                    "<actor jid=\"fluellen@shakespeare.lit\"/>"
-                    "<reason>Avaunt, you cullion!</reason>"
-                "</item>"
-                "<status code=\"307\"/>"
-            "</x>"
+        "from=\"harfleur@henryv.shakespeare.lit/pistol\" "
+        "type=\"unavailable\">"
+        "<x xmlns=\"http://jabber.org/protocol/muc#user\">"
+        "<item affiliation=\"none\" role=\"none\">"
+        "<actor jid=\"fluellen@shakespeare.lit\"/>"
+        "<reason>Avaunt, you cullion!</reason>"
+        "</item>"
+        "<status code=\"307\"/>"
+        "</x>"
         "</presence>");
 
     QXmppPresence presence;
@@ -234,10 +235,10 @@ void tst_QXmppPresence::testPresenceWithMucPassword()
 {
     const QByteArray xml(
         "<presence to=\"coven@chat.shakespeare.lit/thirdwitch\" "
-                  "from=\"hag66@shakespeare.lit/pda\">"
-            "<x xmlns=\"http://jabber.org/protocol/muc\">"
-                "<password>pass</password>"
-            "</x>"
+        "from=\"hag66@shakespeare.lit/pda\">"
+        "<x xmlns=\"http://jabber.org/protocol/muc\">"
+        "<password>pass</password>"
+        "</x>"
         "</presence>");
 
     QXmppPresence presence;
@@ -254,8 +255,8 @@ void tst_QXmppPresence::testPresenceWithMucSupport()
 {
     const QByteArray xml(
         "<presence to=\"coven@chat.shakespeare.lit/thirdwitch\" "
-                  "from=\"hag66@shakespeare.lit/pda\">"
-            "<x xmlns=\"http://jabber.org/protocol/muc\"/>"
+        "from=\"hag66@shakespeare.lit/pda\">"
+        "<x xmlns=\"http://jabber.org/protocol/muc\"/>"
         "</presence>");
 
     QXmppPresence presence;
@@ -272,16 +273,15 @@ void tst_QXmppPresence::testPresenceWithLastUserInteraction()
 {
     const QByteArray xml(
         "<presence to=\"coven@chat.shakespeare.lit/thirdwitch\" "
-                  "from=\"hag66@shakespeare.lit/pda\">"
-            "<idle xmlns=\"urn:xmpp:idle:1\" since=\"1969-07-21T02:56:15Z\"/>"
+        "from=\"hag66@shakespeare.lit/pda\">"
+        "<idle xmlns=\"urn:xmpp:idle:1\" since=\"1969-07-21T02:56:15Z\"/>"
         "</presence>");
 
     QXmppPresence presence;
     parsePacket(presence, xml);
     QVERIFY(!presence.lastUserInteraction().isNull());
     QVERIFY(presence.lastUserInteraction().isValid());
-    QCOMPARE(presence.lastUserInteraction(), QDateTime(QDate(1969, 7, 21),
-             QTime(2, 56, 15), Qt::UTC));
+    QCOMPARE(presence.lastUserInteraction(), QDateTime(QDate(1969, 7, 21), QTime(2, 56, 15), Qt::UTC));
     serializePacket(presence, xml);
 
     QDateTime another(QDate(2025, 2, 5), QTime(15, 32, 8), Qt::UTC);
@@ -293,15 +293,14 @@ void tst_QXmppPresence::testPresenceWithMix()
 {
     const QByteArray xml(
         "<presence to=\"hag99@shakespeare.example\" "
-                  "from=\"123435#coven@mix.shakespeare.example/UUID-a1j/7533\">"
-            "<show>dnd</show>"
-            "<status>Making a Brew</status>"
-            "<mix xmlns=\"urn:xmpp:presence:0\">"
-                "<jid>hecate@shakespeare.example/UUID-x4r/2491</jid>"
-                "<nick>thirdwitch</nick>"
-            "</mix>"
-        "</presence>"
-    );
+        "from=\"123435#coven@mix.shakespeare.example/UUID-a1j/7533\">"
+        "<show>dnd</show>"
+        "<status>Making a Brew</status>"
+        "<mix xmlns=\"urn:xmpp:presence:0\">"
+        "<jid>hecate@shakespeare.example/UUID-x4r/2491</jid>"
+        "<nick>thirdwitch</nick>"
+        "</mix>"
+        "</presence>");
 
     QXmppPresence presence;
     parsePacket(presence, xml);
diff --git a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
index 1f85a8c7..9062359e 100644
--- a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
+++ b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
@@ -87,16 +87,16 @@ void tst_QXmppPubSubIq::testItemsResponse()
         " type=\"result\">"
         "<pubsub xmlns=\"http://jabber.org/protocol/pubsub\">"
         "<items node=\"storage:bookmarks\">"
-          "<item id=\"current\">"
-            "<storage xmlns=\"storage:bookmarks\">"
-              "<conference"
-                         " autojoin=\"true\""
-                         " jid=\"theplay@conference.shakespeare.lit\""
-                         " name=\"The Play's the Thing\">"
-                "<nick>JC</nick>"
-              "</conference>"
-            "</storage>"
-          "</item>"
+        "<item id=\"current\">"
+        "<storage xmlns=\"storage:bookmarks\">"
+        "<conference"
+        " autojoin=\"true\""
+        " jid=\"theplay@conference.shakespeare.lit\""
+        " name=\"The Play's the Thing\">"
+        "<nick>JC</nick>"
+        "</conference>"
+        "</storage>"
+        "</item>"
         "</items>"
         "</pubsub>"
         "</iq>");
@@ -123,16 +123,16 @@ void tst_QXmppPubSubIq::testPublish()
         " type=\"result\">"
         "<pubsub xmlns=\"http://jabber.org/protocol/pubsub\">"
         "<publish node=\"storage:bookmarks\">"
-          "<item id=\"current\">"
-            "<storage xmlns=\"storage:bookmarks\">"
-              "<conference"
-                         " autojoin=\"true\""
-                         " jid=\"theplay@conference.shakespeare.lit\""
-                         " name=\"The Play's the Thing\">"
-                "<nick>JC</nick>"
-              "</conference>"
-            "</storage>"
-          "</item>"
+        "<item id=\"current\">"
+        "<storage xmlns=\"storage:bookmarks\">"
+        "<conference"
+        " autojoin=\"true\""
+        " jid=\"theplay@conference.shakespeare.lit\""
+        " name=\"The Play's the Thing\">"
+        "<nick>JC</nick>"
+        "</conference>"
+        "</storage>"
+        "</item>"
         "</publish>"
         "</pubsub>"
         "</iq>");
@@ -192,11 +192,11 @@ void tst_QXmppPubSubIq::testRetractItem()
         " to=\"pubsub.shakespeare.lit\""
         " from=\"hamlet@denmark.lit/elsinore\""
         " type=\"set\">"
-            "<pubsub xmlns=\"http://jabber.org/protocol/pubsub\">"
-                "<retract node=\"princely_musings\">"
-                    "<item id=\"ae890ac52d0df67ed7cfdf51b644e901\"/>"
-                "</retract>"
-            "</pubsub>"
+        "<pubsub xmlns=\"http://jabber.org/protocol/pubsub\">"
+        "<retract node=\"princely_musings\">"
+        "<item id=\"ae890ac52d0df67ed7cfdf51b644e901\"/>"
+        "</retract>"
+        "</pubsub>"
         "</iq>");
 
     QXmppPubSubIq iq;
@@ -263,8 +263,8 @@ void tst_QXmppPubSubIq::testSubscription()
         " type=\"result\">"
         "<pubsub xmlns=\"http://jabber.org/protocol/pubsub\">"
         "<subscription jid=\"francisco@denmark.lit\""
-                     " node=\"princely_musings\""
-                     " subid=\"ba49252aaa4f5d320c24d3766f0bdcade78c78d3\"/>"
+        " node=\"princely_musings\""
+        " subid=\"ba49252aaa4f5d320c24d3766f0bdcade78c78d3\"/>"
         "</pubsub>"
         "</iq>");
 
diff --git a/tests/qxmppresultset/tst_qxmppresultset.cpp b/tests/qxmppresultset/tst_qxmppresultset.cpp
index b27d81af..9c4c3571 100644
--- a/tests/qxmppresultset/tst_qxmppresultset.cpp
+++ b/tests/qxmppresultset/tst_qxmppresultset.cpp
@@ -46,46 +46,39 @@ void tst_QXmppResultSet::testQuery_data()
     QTest::addColumn<QString>("before");
     QTest::addColumn<QString>("after");
 
-    QTest::newRow("Example 3") <<
-        QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
-                        "<max>10</max>"
-                   "</set>")
-        << 10 << -1 << QString() << QString();
-
-    QTest::newRow("Example 5") <<
-        QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
-                        "<max>10</max>"
-                        "<after>peterpan@neverland.lit</after>"
-                   "</set>")
-        << 10 << -1 << QString() << QString("peterpan@neverland.lit");
-
-    QTest::newRow("Example 5") <<
-        QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
-                        "<max>10</max>"
-                        "<before>peter@pixyland.org</before>"
-                   "</set>")
-        << 10 << -1 << QString("peter@pixyland.org") << QString();
-
-    QTest::newRow("Example 11") <<
-        QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
-                        "<max>10</max>"
-                        "<before/>"
-                   "</set>")
-        << 10 << -1 << QString("") << QString();
-
-    QTest::newRow("Example 12") <<
-        QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
-                        "<max>10</max>"
-                        "<index>371</index>"
-                   "</set>")
-        << 10 << 371 << QString() << QString();
-
-
-    QTest::newRow("Example 15") <<
-        QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
-                        "<max>0</max>"
-                   "</set>")
-        << 0 << -1 << QString() << QString();
+    QTest::newRow("Example 3") << QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
+                                             "<max>10</max>"
+                                             "</set>")
+                               << 10 << -1 << QString() << QString();
+
+    QTest::newRow("Example 5") << QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
+                                             "<max>10</max>"
+                                             "<after>peterpan@neverland.lit</after>"
+                                             "</set>")
+                               << 10 << -1 << QString() << QString("peterpan@neverland.lit");
+
+    QTest::newRow("Example 5") << QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
+                                             "<max>10</max>"
+                                             "<before>peter@pixyland.org</before>"
+                                             "</set>")
+                               << 10 << -1 << QString("peter@pixyland.org") << QString();
+
+    QTest::newRow("Example 11") << QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
+                                              "<max>10</max>"
+                                              "<before/>"
+                                              "</set>")
+                                << 10 << -1 << QString("") << QString();
+
+    QTest::newRow("Example 12") << QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
+                                              "<max>10</max>"
+                                              "<index>371</index>"
+                                              "</set>")
+                                << 10 << 371 << QString() << QString();
+
+    QTest::newRow("Example 15") << QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
+                                              "<max>0</max>"
+                                              "</set>")
+                                << 0 << -1 << QString() << QString();
 }
 
 void tst_QXmppResultSet::testQuery()
@@ -115,34 +108,30 @@ void tst_QXmppResultSet::testReply_data()
     QTest::addColumn<QString>("first");
     QTest::addColumn<QString>("last");
 
-    QTest::newRow("Example 4") <<
-        QByteArray( "<set xmlns=\"http://jabber.org/protocol/rsm\">"
-                        "<first index=\"0\">stpeter@jabber.org</first>"
-                        "<last>peterpan@neverland.lit</last>"
-                        "<count>800</count>"
-                    "</set>")
-        << 800 << 0 << QString("stpeter@jabber.org") << QString("peterpan@neverland.lit");
-
-    QTest::newRow("Example 6") <<
-        QByteArray( "<set xmlns=\"http://jabber.org/protocol/rsm\">"
-                        "<first index=\"0\">stpeter@jabber.org</first>"
-                        "<last>peterpan@neverland.lit</last>"
-                        "<count>800</count>"
-                    "</set>")
-        << 800 << 0 << QString("stpeter@jabber.org") << QString("peterpan@neverland.lit");
-    QTest::newRow("Example 4") <<
-        QByteArray( "<set xmlns=\"http://jabber.org/protocol/rsm\">"
-                        "<first index=\"10\">peter@pixyland.org</first>"
-                        "<last>peter@rabbit.lit</last>"
-                        "<count>800</count>"
-                    "</set>")
-        << 800 << 10 << QString("peter@pixyland.org") << QString("peter@rabbit.lit");
-
-    QTest::newRow("Example 7") <<
-        QByteArray( "<set xmlns=\"http://jabber.org/protocol/rsm\">"
-                        "<count>790</count>"
-                    "</set>")
-        << 790 << -1 << QString() << QString();
+    QTest::newRow("Example 4") << QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
+                                             "<first index=\"0\">stpeter@jabber.org</first>"
+                                             "<last>peterpan@neverland.lit</last>"
+                                             "<count>800</count>"
+                                             "</set>")
+                               << 800 << 0 << QString("stpeter@jabber.org") << QString("peterpan@neverland.lit");
+
+    QTest::newRow("Example 6") << QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
+                                             "<first index=\"0\">stpeter@jabber.org</first>"
+                                             "<last>peterpan@neverland.lit</last>"
+                                             "<count>800</count>"
+                                             "</set>")
+                               << 800 << 0 << QString("stpeter@jabber.org") << QString("peterpan@neverland.lit");
+    QTest::newRow("Example 4") << QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
+                                             "<first index=\"10\">peter@pixyland.org</first>"
+                                             "<last>peter@rabbit.lit</last>"
+                                             "<count>800</count>"
+                                             "</set>")
+                               << 800 << 10 << QString("peter@pixyland.org") << QString("peter@rabbit.lit");
+
+    QTest::newRow("Example 7") << QByteArray("<set xmlns=\"http://jabber.org/protocol/rsm\">"
+                                             "<count>790</count>"
+                                             "</set>")
+                               << 790 << -1 << QString() << QString();
 }
 
 void tst_QXmppResultSet::testReply()
diff --git a/tests/qxmpprpciq/tst_qxmpprpciq.cpp b/tests/qxmpprpciq/tst_qxmpprpciq.cpp
index 28034dd2..31d162ab 100644
--- a/tests/qxmpprpciq/tst_qxmpprpciq.cpp
+++ b/tests/qxmpprpciq/tst_qxmpprpciq.cpp
@@ -130,12 +130,12 @@ void tst_QXmppRpcIq::testStruct()
     checkVariant(map,
                  QByteArray("<value><struct>"
                             "<member>"
-                                "<name>bar</name>"
-                                "<value><string>hello world</string></value>"
+                            "<name>bar</name>"
+                            "<value><string>hello world</string></value>"
                             "</member>"
                             "<member>"
-                                "<name>foo</name>"
-                                "<value><double>-12.214</double></value>"
+                            "<name>foo</name>"
+                            "<value><double>-12.214</double></value>"
                             "</member>"
                             "</struct></value>"));
 }
@@ -206,16 +206,16 @@ void tst_QXmppRpcIq::testResponseFault()
         "<methodResponse>"
         "<fault>"
         "<value>"
-            "<struct>"
-                "<member>"
-                    "<name>faultCode</name>"
-                    "<value><i4>404</i4></value>"
-                "</member>"
-                "<member>"
-                    "<name>faultString</name>"
-                    "<value><string>Not found</string></value>"
-                "</member>"
-            "</struct>"
+        "<struct>"
+        "<member>"
+        "<name>faultCode</name>"
+        "<value><i4>404</i4></value>"
+        "</member>"
+        "<member>"
+        "<name>faultString</name>"
+        "<value><string>Not found</string></value>"
+        "</member>"
+        "</struct>"
         "</value>"
         "</fault>"
         "</methodResponse>"
diff --git a/tests/qxmppsasl/tst_qxmppsasl.cpp b/tests/qxmppsasl/tst_qxmppsasl.cpp
index 1c806cf0..5121ea5a 100644
--- a/tests/qxmppsasl/tst_qxmppsasl.cpp
+++ b/tests/qxmppsasl/tst_qxmppsasl.cpp
@@ -21,9 +21,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppSasl_p.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppSasl : public QObject
 {
@@ -189,7 +190,14 @@ void tst_QXmppSasl::testSuccess()
 
 void tst_QXmppSasl::testClientAvailableMechanisms()
 {
-    QCOMPARE(QXmppSaslClient::availableMechanisms(), QStringList() << "SCRAM-SHA-256" << "SCRAM-SHA-1" << "DIGEST-MD5" << "PLAIN" << "ANONYMOUS" << "X-FACEBOOK-PLATFORM" << "X-MESSENGER-OAUTH2" << "X-OAUTH2");
+    QCOMPARE(QXmppSaslClient::availableMechanisms(), QStringList() << "SCRAM-SHA-256"
+                                                                   << "SCRAM-SHA-1"
+                                                                   << "DIGEST-MD5"
+                                                                   << "PLAIN"
+                                                                   << "ANONYMOUS"
+                                                                   << "X-FACEBOOK-PLATFORM"
+                                                                   << "X-MESSENGER-OAUTH2"
+                                                                   << "X-OAUTH2");
 }
 
 void tst_QXmppSasl::testClientBadMechanism()
diff --git a/tests/qxmppserver/tst_qxmppserver.cpp b/tests/qxmppserver/tst_qxmppserver.cpp
index cefa8ee0..054dfbc7 100644
--- a/tests/qxmppserver/tst_qxmppserver.cpp
+++ b/tests/qxmppserver/tst_qxmppserver.cpp
@@ -42,13 +42,25 @@ void tst_QXmppServer::testConnect_data()
     QTest::addColumn<QString>("mechanism");
     QTest::addColumn<bool>("connected");
 
-    QTest::newRow("plain-good") << "testuser" << "testpwd" << "PLAIN" << true;
-    QTest::newRow("plain-bad-username") << "baduser" << "testpwd" << "PLAIN" << false;
-    QTest::newRow("plain-bad-password") << "testuser" << "badpwd" << "PLAIN" << false;
-
-    QTest::newRow("digest-good") << "testuser" << "testpwd" << "DIGEST-MD5" << true;
-    QTest::newRow("digest-bad-username") << "baduser" << "testpwd" << "DIGEST-MD5" << false;
-    QTest::newRow("digest-bad-password") << "testuser" << "badpwd" << "DIGEST-MD5" << false;
+    QTest::newRow("plain-good") << "testuser"
+                                << "testpwd"
+                                << "PLAIN" << true;
+    QTest::newRow("plain-bad-username") << "baduser"
+                                        << "testpwd"
+                                        << "PLAIN" << false;
+    QTest::newRow("plain-bad-password") << "testuser"
+                                        << "badpwd"
+                                        << "PLAIN" << false;
+
+    QTest::newRow("digest-good") << "testuser"
+                                 << "testpwd"
+                                 << "DIGEST-MD5" << true;
+    QTest::newRow("digest-bad-username") << "baduser"
+                                         << "testpwd"
+                                         << "DIGEST-MD5" << false;
+    QTest::newRow("digest-bad-password") << "testuser"
+                                         << "badpwd"
+                                         << "DIGEST-MD5" << false;
 }
 
 void tst_QXmppServer::testConnect()
diff --git a/tests/qxmppsocks/tst_qxmppsocks.cpp b/tests/qxmppsocks/tst_qxmppsocks.cpp
index 694fc277..bb2d352c 100644
--- a/tests/qxmppsocks/tst_qxmppsocks.cpp
+++ b/tests/qxmppsocks/tst_qxmppsocks.cpp
@@ -136,7 +136,7 @@ void tst_QXmppSocks::testClient()
     connect(&client, &QXmppSocksClient::ready, &loop, &QEventLoop::quit);
     m_connectionSocket->write(serverConnect);
     loop.exec();
-    if  (!serverConnectWorks) {
+    if (!serverConnectWorks) {
         QCOMPARE(client.state(), QAbstractSocket::UnconnectedState);
         QCOMPARE(m_connectionSocket->state(), QAbstractSocket::UnconnectedState);
         return;
@@ -163,7 +163,7 @@ void tst_QXmppSocks::testClientAndServer()
 
     QEventLoop loop;
     connect(&client, &QXmppSocksClient::ready, &loop, &QEventLoop::quit);
-  
+
     client.connectToHost("www.google.com", 80);
     loop.exec();
 
diff --git a/tests/qxmppstanza/tst_qxmppstanza.cpp b/tests/qxmppstanza/tst_qxmppstanza.cpp
index 38ffd932..e536042b 100644
--- a/tests/qxmppstanza/tst_qxmppstanza.cpp
+++ b/tests/qxmppstanza/tst_qxmppstanza.cpp
@@ -82,16 +82,15 @@ void tst_QXmppStanza::testErrorFileTooLarge()
 {
     const QByteArray xml(
         "<error type=\"modify\">"
-          "<not-acceptable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
-          "<text xml:lang=\"en\" "
-                "xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\">"
-            "File too large. The maximum file size is 20000 bytes"
-          "</text>"
-          "<file-too-large xmlns=\"urn:xmpp:http:upload:0\">"
-            "<max-file-size>20000</max-file-size>"
-          "</file-too-large>"
-        "</error>"
-    );
+        "<not-acceptable xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
+        "<text xml:lang=\"en\" "
+        "xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\">"
+        "File too large. The maximum file size is 20000 bytes"
+        "</text>"
+        "<file-too-large xmlns=\"urn:xmpp:http:upload:0\">"
+        "<max-file-size>20000</max-file-size>"
+        "</file-too-large>"
+        "</error>");
 
     QXmppStanza::Error error;
     parsePacket(error, xml);
@@ -118,16 +117,15 @@ void tst_QXmppStanza::testErrorRetry()
 {
     const QByteArray xml(
         "<error type=\"wait\">"
-          "<resource-constraint "
-            "xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
-          "<text xml:lang=\"en\" "
-                "xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\">"
-            "Quota reached. You can only upload 5 files in 5 minutes"
-          "</text>"
-          "<retry xmlns=\"urn:xmpp:http:upload:0\" "
-                 "stamp=\"2017-12-03T23:42:05Z\"/>"
-        "</error>"
-    );
+        "<resource-constraint "
+        "xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
+        "<text xml:lang=\"en\" "
+        "xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\">"
+        "Quota reached. You can only upload 5 files in 5 minutes"
+        "</text>"
+        "<retry xmlns=\"urn:xmpp:http:upload:0\" "
+        "stamp=\"2017-12-03T23:42:05Z\"/>"
+        "</error>");
 
     QXmppStanza::Error error;
     parsePacket(error, xml);
@@ -135,8 +133,7 @@ void tst_QXmppStanza::testErrorRetry()
     QCOMPARE(error.text(), QString("Quota reached. You can only upload 5 "
                                    "files in 5 minutes"));
     QCOMPARE(error.condition(), QXmppStanza::Error::ResourceConstraint);
-    QCOMPARE(error.retryDate(), QDateTime(QDate(2017, 12, 03),
-                                          QTime(23, 42, 05), Qt::UTC));
+    QCOMPARE(error.retryDate(), QDateTime(QDate(2017, 12, 03), QTime(23, 42, 05), Qt::UTC));
     serializePacket(error, xml);
 
     // test setter
diff --git a/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp b/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp
index 7f1e0d3e..335d7e72 100644
--- a/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp
+++ b/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp
@@ -42,9 +42,9 @@ void tst_QXmppStartTlsPacket::testBasic_data()
     QTest::addColumn<QXmppStartTlsPacket::Type>("type");
 
 #define ROW(name, xml, valid, type) \
-    QTest::newRow(name) \
-        << QByteArrayLiteral(xml) \
-        << valid \
+    QTest::newRow(name)             \
+        << QByteArrayLiteral(xml)   \
+        << valid                    \
         << type
 
     ROW("starttls", R"(<starttls xmlns="urn:ietf:params:xml:ns:xmpp-tls"/>)", true, QXmppStartTlsPacket::StartTls);
@@ -68,9 +68,9 @@ void tst_QXmppStartTlsPacket::testBasic()
     QCOMPARE(QXmppStartTlsPacket::isStartTlsPacket(doc.documentElement(), type), valid);
 
     // test other types return false
-    for (auto testValue : {QXmppStartTlsPacket::StartTls,
+    for (auto testValue : { QXmppStartTlsPacket::StartTls,
                             QXmppStartTlsPacket::Proceed,
-                            QXmppStartTlsPacket::Failure}) {
+                            QXmppStartTlsPacket::Failure }) {
         QCOMPARE(QXmppStartTlsPacket::isStartTlsPacket(doc.documentElement(), testValue), testValue == type && valid);
     }
 
diff --git a/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp b/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp
index eb5a174b..028a20ef 100644
--- a/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp
+++ b/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp
@@ -57,9 +57,9 @@ void tst_QXmppStreamFeatures::testRequired()
 {
     const QByteArray xml(
         "<stream:features>"
-            "<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\">"
-                "<required/>"
-            "</starttls>"
+        "<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\">"
+        "<required/>"
+        "</starttls>"
         "</stream:features>");
 
     QXmppStreamFeatures features;
@@ -71,15 +71,15 @@ void tst_QXmppStreamFeatures::testRequired()
 void tst_QXmppStreamFeatures::testFull()
 {
     const QByteArray xml("<stream:features>"
-        "<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\"/>"
-        "<session xmlns=\"urn:ietf:params:xml:ns:xmpp-session\"/>"
-        "<auth xmlns=\"http://jabber.org/features/iq-auth\"/>"
-        "<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\"/>"
-        "<csi xmlns=\"urn:xmpp:csi:0\"/>"
-        "<register xmlns=\"http://jabber.org/features/iq-register\"/>"
-        "<compression xmlns=\"http://jabber.org/features/compress\"><method>zlib</method></compression>"
-        "<mechanisms xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\"><mechanism>PLAIN</mechanism></mechanisms>"
-        "</stream:features>");
+                         "<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\"/>"
+                         "<session xmlns=\"urn:ietf:params:xml:ns:xmpp-session\"/>"
+                         "<auth xmlns=\"http://jabber.org/features/iq-auth\"/>"
+                         "<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\"/>"
+                         "<csi xmlns=\"urn:xmpp:csi:0\"/>"
+                         "<register xmlns=\"http://jabber.org/features/iq-register\"/>"
+                         "<compression xmlns=\"http://jabber.org/features/compress\"><method>zlib</method></compression>"
+                         "<mechanisms xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\"><mechanism>PLAIN</mechanism></mechanisms>"
+                         "</stream:features>");
 
     QXmppStreamFeatures features;
     parsePacket(features, xml);
diff --git a/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp b/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp
index 1bf55b77..30d8545b 100644
--- a/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp
+++ b/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp
@@ -57,12 +57,12 @@ void tst_QXmppStreamInitiationIq::testFileInfo_data()
 
     QTest::newRow("full")
         << QByteArray("<file xmlns=\"http://jabber.org/protocol/si/profile/file-transfer\" "
-            "date=\"1969-07-21T02:56:15Z\" "
-            "hash=\"552da749930852c69ae5d2141d3766b1\" "
-            "name=\"test.txt\" "
-            "size=\"1022\">"
-                "<desc>This is a test. If this were a real file...</desc>"
-            "</file>")
+                      "date=\"1969-07-21T02:56:15Z\" "
+                      "hash=\"552da749930852c69ae5d2141d3766b1\" "
+                      "name=\"test.txt\" "
+                      "size=\"1022\">"
+                      "<desc>This is a test. If this were a real file...</desc>"
+                      "</file>")
         << QDateTime(QDate(1969, 7, 21), QTime(2, 56, 15), Qt::UTC)
         << QString("This is a test. If this were a real file...")
         << QByteArray::fromHex("552da749930852c69ae5d2141d3766b1")
@@ -93,17 +93,17 @@ void tst_QXmppStreamInitiationIq::testOffer()
 {
     QByteArray xml(
         "<iq id=\"offer1\" to=\"receiver@jabber.org/resource\" type=\"set\">"
-          "<si xmlns=\"http://jabber.org/protocol/si\" id=\"a0\" mime-type=\"text/plain\" profile=\"http://jabber.org/protocol/si/profile/file-transfer\">"
-            "<file xmlns=\"http://jabber.org/protocol/si/profile/file-transfer\" name=\"test.txt\" size=\"1022\"/>"
-            "<feature xmlns=\"http://jabber.org/protocol/feature-neg\">"
-              "<x xmlns=\"jabber:x:data\" type=\"form\">"
-                "<field type=\"list-single\" var=\"stream-method\">"
-                  "<option><value>http://jabber.org/protocol/bytestreams</value></option>"
-                  "<option><value>http://jabber.org/protocol/ibb</value></option>"
-                "</field>"
-              "</x>"
-            "</feature>"
-          "</si>"
+        "<si xmlns=\"http://jabber.org/protocol/si\" id=\"a0\" mime-type=\"text/plain\" profile=\"http://jabber.org/protocol/si/profile/file-transfer\">"
+        "<file xmlns=\"http://jabber.org/protocol/si/profile/file-transfer\" name=\"test.txt\" size=\"1022\"/>"
+        "<feature xmlns=\"http://jabber.org/protocol/feature-neg\">"
+        "<x xmlns=\"jabber:x:data\" type=\"form\">"
+        "<field type=\"list-single\" var=\"stream-method\">"
+        "<option><value>http://jabber.org/protocol/bytestreams</value></option>"
+        "<option><value>http://jabber.org/protocol/ibb</value></option>"
+        "</field>"
+        "</x>"
+        "</feature>"
+        "</si>"
         "</iq>");
 
     QXmppStreamInitiationIq iq;
@@ -118,15 +118,15 @@ void tst_QXmppStreamInitiationIq::testResult()
 {
     QByteArray xml(
         "<iq id=\"offer1\" to=\"sender@jabber.org/resource\" type=\"result\">"
-          "<si xmlns=\"http://jabber.org/protocol/si\">"
-            "<feature xmlns=\"http://jabber.org/protocol/feature-neg\">"
-              "<x xmlns=\"jabber:x:data\" type=\"submit\">"
-                "<field type=\"list-single\" var=\"stream-method\">"
-                  "<value>http://jabber.org/protocol/bytestreams</value>"
-                "</field>"
-              "</x>"
-            "</feature>"
-          "</si>"
+        "<si xmlns=\"http://jabber.org/protocol/si\">"
+        "<feature xmlns=\"http://jabber.org/protocol/feature-neg\">"
+        "<x xmlns=\"jabber:x:data\" type=\"submit\">"
+        "<field type=\"list-single\" var=\"stream-method\">"
+        "<value>http://jabber.org/protocol/bytestreams</value>"
+        "</field>"
+        "</x>"
+        "</feature>"
+        "</si>"
         "</iq>");
 
     QXmppStreamInitiationIq iq;
diff --git a/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp b/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp
index 0486f519..6b603e05 100644
--- a/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp
+++ b/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp
@@ -42,8 +42,8 @@ public:
     ~TestHelper();
 
 public slots:
-    void onSlotReceived(const QXmppHttpUploadSlotIq &slot);
-    void onRequestFailed(const QXmppHttpUploadRequestIq &request);
+    void onSlotReceived(const QXmppHttpUploadSlotIq& slot);
+    void onRequestFailed(const QXmppHttpUploadRequestIq& request);
 
 private:
     bool expectedEvent;
@@ -52,12 +52,11 @@ private:
     bool error;
 };
 
-TestHelper::TestHelper(bool p_expectedEvent, bool p_expectedError):
-    QObject(),
-    expectedEvent(p_expectedEvent),
-    expectedError(p_expectedError),
-    event(false),
-    error(false)
+TestHelper::TestHelper(bool p_expectedEvent, bool p_expectedError) : QObject(),
+                                                                     expectedEvent(p_expectedEvent),
+                                                                     expectedError(p_expectedError),
+                                                                     event(false),
+                                                                     error(false)
 {
 }
 
@@ -84,7 +83,7 @@ class tst_QXmppUploadRequestManager : public QObject
     Q_OBJECT
 
 protected slots:
-    void onLoggerMessage(QXmppLogger::MessageType type, const QString &text) const;
+    void onLoggerMessage(QXmppLogger::MessageType type, const QString& text) const;
 
 private slots:
     void initTestCase();
@@ -151,58 +150,58 @@ void tst_QXmppUploadRequestManager::testHandleStanza_data()
                       "from='romeo@montague.example' "
                       "to='romeo@montague.example/home' "
                       "type='chat'>"
-               "<received xmlns='urn:xmpp:carbons:2'>"
-                 "<forwarded xmlns='urn:xmpp:forward:0'>"
-                   "<message xmlns='jabber:client' "
-                            "from='juliet@capulet.example/balcony' "
-                            "to='romeo@montague.example/garden' "
-                            "type='chat'>"
-                     "<body>What man art thou that, thus bescreen'd in night, so stumblest on my counsel?</body>"
-                     "<thread>0e3141cd80894871a68e6fe6b1ec56fa</thread>"
-                   "</message>"
-                 "</forwarded>"
-               "</received>"
-             "</message>")
+                      "<received xmlns='urn:xmpp:carbons:2'>"
+                      "<forwarded xmlns='urn:xmpp:forward:0'>"
+                      "<message xmlns='jabber:client' "
+                      "from='juliet@capulet.example/balcony' "
+                      "to='romeo@montague.example/garden' "
+                      "type='chat'>"
+                      "<body>What man art thou that, thus bescreen'd in night, so stumblest on my counsel?</body>"
+                      "<thread>0e3141cd80894871a68e6fe6b1ec56fa</thread>"
+                      "</message>"
+                      "</forwarded>"
+                      "</received>"
+                      "</message>")
         << false << false << false;
-        
+
     QTest::newRow("slotReceived")
         << QByteArray("<iq from='upload.montague.tld' id='step_03' to='romeo@montague.tld/garden' type='result'>"
-                        "<slot xmlns='urn:xmpp:http:upload:0'>"
-                            "<put url='https://upload.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/tr%C3%A8s%20cool.jpg'>"
-                                "<header name='Authorization'>Basic Base64String==</header>"
-                                "<header name='Cookie'>foo=bar; user=romeo</header>"
-                            "</put>"
-                            "<get url='https://download.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/tr%C3%A8s%20cool.jpg' />"
-                        "</slot>"
-                    "</iq>")
+                      "<slot xmlns='urn:xmpp:http:upload:0'>"
+                      "<put url='https://upload.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/tr%C3%A8s%20cool.jpg'>"
+                      "<header name='Authorization'>Basic Base64String==</header>"
+                      "<header name='Cookie'>foo=bar; user=romeo</header>"
+                      "</put>"
+                      "<get url='https://download.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/tr%C3%A8s%20cool.jpg' />"
+                      "</slot>"
+                      "</iq>")
         << true << true << false;
-        
+
     QTest::newRow("tooLargeError")
         << QByteArray("<iq from='upload.montague.tld' id='step_03' to='romeo@montague.tld/garden' type='error'>"
-                        "<request xmlns='urn:xmpp:http:upload:0' filename='très cool.jpg' size='23456' content-type='image/jpeg' />"
-                        "<error type='modify'>"
-                            "<not-acceptable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas' />"
-                            "<text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>File too large. The maximum file size is 20000 bytes</text>"
-                            "<file-too-large xmlns='urn:xmpp:http:upload:0'>"
-                            "<max-file-size>20000</max-file-size>"
-                            "</file-too-large>"
-                        "</error>"
-                    "</iq>")
+                      "<request xmlns='urn:xmpp:http:upload:0' filename='très cool.jpg' size='23456' content-type='image/jpeg' />"
+                      "<error type='modify'>"
+                      "<not-acceptable xmlns='urn:ietf:params:xml:ns:xmpp-stanzas' />"
+                      "<text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>File too large. The maximum file size is 20000 bytes</text>"
+                      "<file-too-large xmlns='urn:xmpp:http:upload:0'>"
+                      "<max-file-size>20000</max-file-size>"
+                      "</file-too-large>"
+                      "</error>"
+                      "</iq>")
         << true << true << true;
-        
+
     QTest::newRow("quotaReachedError")
         << QByteArray("<iq from='upload.montague.tld' id='step_03' to='romeo@montague.tld/garden' type='error'>"
-                        "<request xmlns='urn:xmpp:http:upload:0' filename='très cool.jpg' size='23456' content-type='image/jpeg' />"
-                        "<error type='wait'>"
-                            "<resource-constraint xmlns='urn:ietf:params:xml:ns:xmpp-stanzas' />"
-                            "<text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>Quota reached. You can only upload 5 files in 5 minutes</text>"
-                            "<retry xmlns='urn:xmpp:http:upload:0' stamp='2017-12-03T23:42:05Z' />"
-                        "</error>"
-                    "</iq>")
+                      "<request xmlns='urn:xmpp:http:upload:0' filename='très cool.jpg' size='23456' content-type='image/jpeg' />"
+                      "<error type='wait'>"
+                      "<resource-constraint xmlns='urn:ietf:params:xml:ns:xmpp-stanzas' />"
+                      "<text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>Quota reached. You can only upload 5 files in 5 minutes</text>"
+                      "<retry xmlns='urn:xmpp:http:upload:0' stamp='2017-12-03T23:42:05Z' />"
+                      "</error>"
+                      "</iq>")
         << true << true << true;
 }
 
-void tst_QXmppUploadRequestManager::testHandleStanza() 
+void tst_QXmppUploadRequestManager::testHandleStanza()
 {
     QFETCH(QByteArray, xml);
     QFETCH(bool, accepted);
@@ -229,29 +228,30 @@ void tst_QXmppUploadRequestManager::testDiscoveryService_data()
 
     QTest::newRow("mixDiscoveryStanzaIq")
         << QByteArray("<iq from='mix.shakespeare.example' id='lx09df27' to='hag66@shakespeare.example/UUID-c8y/1573' type='result'>"
-                            "<query xmlns='http://jabber.org/protocol/disco#info'>"
-                                "<identity category='conference' name='Shakespearean Chat Service' type='mix '/>"
-                                "<feature var='urn:xmpp:mix:core:1' />"
-                                "<feature var='urn:xmpp:mix:core:1#searchable' />"
-                            "</query>"
-                        "</iq>")
+                      "<query xmlns='http://jabber.org/protocol/disco#info'>"
+                      "<identity category='conference' name='Shakespearean Chat Service' type='mix '/>"
+                      "<feature var='urn:xmpp:mix:core:1' />"
+                      "<feature var='urn:xmpp:mix:core:1#searchable' />"
+                      "</query>"
+                      "</iq>")
         << false;
 
     QTest::newRow("HTTPUploadDiscoveryStanzaIq")
         << QByteArray("<iq from='" + uploadServiceName.toUtf8() + "' id='step_02' to='romeo@montague.tld/garden' type='result'>"
-                            "<query xmlns='http://jabber.org/protocol/disco#info'>"
-                                "<identity category='store' type='file' name='HTTP File Upload' />"
-                                "<feature var='urn:xmpp:http:upload:0' />"
-                                "<x type='result' xmlns='jabber:x:data'>"
-                                    "<field var='FORM_TYPE' type='hidden'>"
-                                        "<value>urn:xmpp:http:upload:0</value>"
-                                    "</field>"
-                                    "<field var='max-file-size'>"
-                                        "<value>" + QByteArray::number(maxFileSize) + "</value>"
-                                    "</field>"
-                                "</x>"
-                            "</query>"
-                        "</iq>")
+                                                                  "<query xmlns='http://jabber.org/protocol/disco#info'>"
+                                                                  "<identity category='store' type='file' name='HTTP File Upload' />"
+                                                                  "<feature var='urn:xmpp:http:upload:0' />"
+                                                                  "<x type='result' xmlns='jabber:x:data'>"
+                                                                  "<field var='FORM_TYPE' type='hidden'>"
+                                                                  "<value>urn:xmpp:http:upload:0</value>"
+                                                                  "</field>"
+                                                                  "<field var='max-file-size'>"
+                                                                  "<value>" +
+                      QByteArray::number(maxFileSize) + "</value>"
+                                                        "</field>"
+                                                        "</x>"
+                                                        "</query>"
+                                                        "</iq>")
         << true;
 }
 
@@ -259,11 +259,11 @@ void tst_QXmppUploadRequestManager::testDiscoveryService()
 {
     QFETCH(QByteArray, xml);
     QFETCH(bool, discovered);
-    
+
     QDomDocument doc;
     QCOMPARE(doc.setContent(xml, true), true);
     QDomElement element = doc.documentElement();
-    
+
     bool accepted = discovery->handleStanza(element);
     QCOMPARE(accepted, true);
     QCOMPARE(manager->serviceFound(), discovered);
@@ -282,22 +282,22 @@ void tst_QXmppUploadRequestManager::testSending_data()
     QTest::addColumn<QString>("fileType");
 
     QTest::newRow("fileInfo")
-            << QFileInfo(":/test.svg")
-            << "test.svg"
-            << 2280LL
-            << "image/svg+xml";
+        << QFileInfo(":/test.svg")
+        << "test.svg"
+        << 2280LL
+        << "image/svg+xml";
 
     QTest::newRow("fileWithSizeBelowLimit")
-            << QFileInfo()
-            << "whatever.jpeg"
-            << 698547LL
-            << "image/jpeg";
+        << QFileInfo()
+        << "whatever.jpeg"
+        << 698547LL
+        << "image/jpeg";
 
     QTest::newRow("fileWithSizeAboveLimit")
-            << QFileInfo()
-            << "some.pdf"
-            << 65896498547LL
-            << "application/pdf";
+        << QFileInfo()
+        << "some.pdf"
+        << 65896498547LL
+        << "application/pdf";
 
     // there is no size above limit handling in request manager
     // there is also no code that selects an upload service with proper
@@ -312,7 +312,7 @@ void tst_QXmppUploadRequestManager::testSending()
     QFETCH(qint64, fileSize);
     QFETCH(QString, fileType);
 
-    QXmppLogger *logger = new QXmppLogger();
+    QXmppLogger* logger = new QXmppLogger();
     logger->setLoggingType(QXmppLogger::SignalLogging);
     client.setLogger(logger);
 
diff --git a/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp b/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp
index 932ee9b9..b89476aa 100644
--- a/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp
+++ b/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp
@@ -51,17 +51,56 @@ void tst_QXmppVCardIq::testAddress_data()
     QTest::addColumn<QString>("street");
     QTest::addColumn<bool>("equalsEmpty");
 
-    QTest::newRow("none") << QByteArray("<ADR/>") << int(QXmppVCardAddress::None) << "" << "" << "" << "" << "" << true;
-    QTest::newRow("HOME") << QByteArray("<ADR><HOME/></ADR>") << int(QXmppVCardAddress::Home) << "" << "" << "" << "" << "" << false;
-    QTest::newRow("WORK") << QByteArray("<ADR><WORK/></ADR>") << int(QXmppVCardAddress::Work) << "" << "" << "" << "" << "" << false;
-    QTest::newRow("POSTAL") << QByteArray("<ADR><POSTAL/></ADR>") << int(QXmppVCardAddress::Postal) << "" << "" << "" << "" << "" << false;
-    QTest::newRow("PREF") << QByteArray("<ADR><PREF/></ADR>") << int(QXmppVCardAddress::Preferred) << "" << "" << "" << "" << "" << false;
-
-    QTest::newRow("country") << QByteArray("<ADR><CTRY>France</CTRY></ADR>") << int(QXmppVCardAddress::None) << "France" << "" << "" << "" << "" << false;
-    QTest::newRow("locality") << QByteArray("<ADR><LOCALITY>Paris</LOCALITY></ADR>") << int(QXmppVCardAddress::None) << "" << "Paris" << "" << "" << "" << false;
-    QTest::newRow("postcode") << QByteArray("<ADR><PCODE>75008</PCODE></ADR>") << int(QXmppVCardAddress::None) << "" << "" << "75008" << "" << "" << false;
-    QTest::newRow("region") << QByteArray("<ADR><REGION>Ile de France</REGION></ADR>") << int(QXmppVCardAddress::None) << "" << "" << "" << "Ile de France" << "" << false;
-    QTest::newRow("street") << QByteArray("<ADR><STREET>55 rue du faubourg Saint-Honoré</STREET></ADR>") << int(QXmppVCardAddress::None) << "" << "" << "" << "" << QString::fromUtf8("55 rue du faubourg Saint-Honoré") << false;
+    QTest::newRow("none") << QByteArray("<ADR/>") << int(QXmppVCardAddress::None) << ""
+                          << ""
+                          << ""
+                          << ""
+                          << "" << true;
+    QTest::newRow("HOME") << QByteArray("<ADR><HOME/></ADR>") << int(QXmppVCardAddress::Home) << ""
+                          << ""
+                          << ""
+                          << ""
+                          << "" << false;
+    QTest::newRow("WORK") << QByteArray("<ADR><WORK/></ADR>") << int(QXmppVCardAddress::Work) << ""
+                          << ""
+                          << ""
+                          << ""
+                          << "" << false;
+    QTest::newRow("POSTAL") << QByteArray("<ADR><POSTAL/></ADR>") << int(QXmppVCardAddress::Postal) << ""
+                            << ""
+                            << ""
+                            << ""
+                            << "" << false;
+    QTest::newRow("PREF") << QByteArray("<ADR><PREF/></ADR>") << int(QXmppVCardAddress::Preferred) << ""
+                          << ""
+                          << ""
+                          << ""
+                          << "" << false;
+
+    QTest::newRow("country") << QByteArray("<ADR><CTRY>France</CTRY></ADR>") << int(QXmppVCardAddress::None) << "France"
+                             << ""
+                             << ""
+                             << ""
+                             << "" << false;
+    QTest::newRow("locality") << QByteArray("<ADR><LOCALITY>Paris</LOCALITY></ADR>") << int(QXmppVCardAddress::None) << ""
+                              << "Paris"
+                              << ""
+                              << ""
+                              << "" << false;
+    QTest::newRow("postcode") << QByteArray("<ADR><PCODE>75008</PCODE></ADR>") << int(QXmppVCardAddress::None) << ""
+                              << ""
+                              << "75008"
+                              << ""
+                              << "" << false;
+    QTest::newRow("region") << QByteArray("<ADR><REGION>Ile de France</REGION></ADR>") << int(QXmppVCardAddress::None) << ""
+                            << ""
+                            << ""
+                            << "Ile de France"
+                            << "" << false;
+    QTest::newRow("street") << QByteArray("<ADR><STREET>55 rue du faubourg Saint-Honoré</STREET></ADR>") << int(QXmppVCardAddress::None) << ""
+                            << ""
+                            << ""
+                            << "" << QString::fromUtf8("55 rue du faubourg Saint-Honoré") << false;
 }
 
 void tst_QXmppVCardIq::testAddress()
@@ -153,7 +192,6 @@ void tst_QXmppVCardIq::testPhone()
     serializePacket(phone, xml);
 }
 
-
 void tst_QXmppVCardIq::testVCard()
 {
     const QByteArray xml(
@@ -169,17 +207,17 @@ void tst_QXmppVCardIq::testVCard()
         "<TEL><HOME/><NUMBER>12345</NUMBER></TEL>"
         "<TEL><WORK/><NUMBER>67890</NUMBER></TEL>"
         "<PHOTO>"
-            "<TYPE>image/png</TYPE>"
-            "<BINVAL>"
-            "iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAAXNSR0IArs4c6QAAAAlwSFlzAAA"
-            "UIgAAFCIBjw1HyAAAAAd0SU1FB9oIHQInNvuJovgAAAAiSURBVAjXY2TQ+s/AwMDAwPD/GiMDlP"
-            "WfgYGBiQEHGJwSAK2BBQ1f3uvpAAAAAElFTkSuQmCC"
-            "</BINVAL>"
+        "<TYPE>image/png</TYPE>"
+        "<BINVAL>"
+        "iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAAXNSR0IArs4c6QAAAAlwSFlzAAA"
+        "UIgAAFCIBjw1HyAAAAAd0SU1FB9oIHQInNvuJovgAAAAiSURBVAjXY2TQ+s/AwMDAwPD/GiMDlP"
+        "WfgYGBiQEHGJwSAK2BBQ1f3uvpAAAAAElFTkSuQmCC"
+        "</BINVAL>"
         "</PHOTO>"
         "<URL>https://github.com/qxmpp-project/qxmpp/</URL>"
         "<ORG>"
-            "<ORGNAME>QXmpp foundation</ORGNAME>"
-            "<ORGUNIT>Main QXmpp dev unit</ORGUNIT>"
+        "<ORGNAME>QXmpp foundation</ORGNAME>"
+        "<ORGUNIT>Main QXmpp dev unit</ORGUNIT>"
         "</ORG>"
         "<TITLE>Executive Director</TITLE>"
         "<ROLE>Patron Saint</ROLE>"
@@ -207,10 +245,9 @@ void tst_QXmppVCardIq::testVCard()
     QCOMPARE(int(vcard.phones()[0].type()), int(QXmppVCardEmail::Home));
     QCOMPARE(vcard.phones()[1].number(), QLatin1String("67890"));
     QCOMPARE(int(vcard.phones()[1].type()), int(QXmppVCardEmail::Work));
-    QCOMPARE(vcard.photo(), QByteArray::fromBase64(
-        "iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAAXNSR0IArs4c6QAAAAlwSFlzAAA"
-        "UIgAAFCIBjw1HyAAAAAd0SU1FB9oIHQInNvuJovgAAAAiSURBVAjXY2TQ+s/AwMDAwPD/GiMDlP"
-        "WfgYGBiQEHGJwSAK2BBQ1f3uvpAAAAAElFTkSuQmCC"));
+    QCOMPARE(vcard.photo(), QByteArray::fromBase64("iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAAXNSR0IArs4c6QAAAAlwSFlzAAA"
+                                                   "UIgAAFCIBjw1HyAAAAAd0SU1FB9oIHQInNvuJovgAAAAiSURBVAjXY2TQ+s/AwMDAwPD/GiMDlP"
+                                                   "WfgYGBiQEHGJwSAK2BBQ1f3uvpAAAAAElFTkSuQmCC"));
     QCOMPARE(vcard.photoType(), QLatin1String("image/png"));
     QCOMPARE(vcard.url(), QLatin1String("https://github.com/qxmpp-project/qxmpp/"));
 
diff --git a/tests/qxmppversioniq/tst_qxmppversioniq.cpp b/tests/qxmppversioniq/tst_qxmppversioniq.cpp
index 00c17da0..2fd026db 100644
--- a/tests/qxmppversioniq/tst_qxmppversioniq.cpp
+++ b/tests/qxmppversioniq/tst_qxmppversioniq.cpp
@@ -39,9 +39,9 @@ private slots:
 void tst_QXmppVersionIq::testVersionGet()
 {
     const QByteArray xmlGet(
-    "<iq id=\"version_1\" to=\"juliet@capulet.com/balcony\" "
-    "from=\"romeo@montague.net/orchard\" type=\"get\">"
-    "<query xmlns=\"jabber:iq:version\"/></iq>");
+        "<iq id=\"version_1\" to=\"juliet@capulet.com/balcony\" "
+        "from=\"romeo@montague.net/orchard\" type=\"get\">"
+        "<query xmlns=\"jabber:iq:version\"/></iq>");
 
     QXmppVersionIq verIqGet;
     parsePacket(verIqGet, xmlGet);
@@ -55,13 +55,13 @@ void tst_QXmppVersionIq::testVersionGet()
 void tst_QXmppVersionIq::testVersionResult()
 {
     const QByteArray xmlResult(
-    "<iq id=\"version_1\" to=\"romeo@montague.net/orchard\" "
-    "from=\"juliet@capulet.com/balcony\" type=\"result\">"
-    "<query xmlns=\"jabber:iq:version\">"
+        "<iq id=\"version_1\" to=\"romeo@montague.net/orchard\" "
+        "from=\"juliet@capulet.com/balcony\" type=\"result\">"
+        "<query xmlns=\"jabber:iq:version\">"
         "<name>qxmpp</name>"
         "<os>Windows-XP</os>"
         "<version>0.2.0</version>"
-    "</query></iq>");
+        "</query></iq>");
 
     QXmppVersionIq verIqResult;
     parsePacket(verIqResult, xmlResult);
author	Linus Jahn <lnj@kaidan.im>	2020-02-02 18:14:27 +0100
committer	LNJ <lnj@kaidan.im>	2020-02-03 00:11:55 +0100
commit	57f1b775197aed1d32e98b0299c0999339a7d5f6 (patch)
tree	ce5702781e15f3a5c438ab153edf06f51a501b29 /tests
parent	99b850a3008bbb03d3449d683adb87839f7d5c4b (diff)
download	qxmpp-57f1b775197aed1d32e98b0299c0999339a7d5f6.tar.gz