From 57f1b775197aed1d32e98b0299c0999339a7d5f6 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Sun, 2 Feb 2020 18:14:27 +0100 Subject: Run clang-format also on all cpp files --- tests/qxmppdataform/tst_qxmppdataform.cpp | 59 ++++++++++++------------------- 1 file changed, 23 insertions(+), 36 deletions(-) (limited to 'tests/qxmppdataform/tst_qxmppdataform.cpp') 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( "" - "" - "" - "" - "http://www.victim.com/challenges/ocr.jpeg?F3A6292C" - "" - "" - "cid:sha1+f24030b8d91d233bac14777be5ab531ca3b9f102@bob.xmpp.org" - "" - "" - "" - "" - ); + "" + "" + "" + "http://www.victim.com/challenges/ocr.jpeg?F3A6292C" + "" + "" + "cid:sha1+f24030b8d91d233bac14777be5ab531ca3b9f102@bob.xmpp.org" + "" + "" + "" + ""); // // 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 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; -- cgit v1.2.3