diff options
| author | Linus Jahn <lnj@kaidan.im> | 2021-03-17 19:22:01 +0100 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2021-03-17 19:22:01 +0100 |
| commit | 5ee30fe3d369a4959d01ef07dc48c852eefc2427 (patch) | |
| tree | 87f10d59777944df5ff39947e3d819decea298f2 /tests | |
| parent | 89f1c188b0cf0064187b8b36286c49febe982db0 (diff) | |
| parent | 6d778d84fd2faac6a899a1c70f2dcb9bd4e0b164 (diff) | |
| download | qxmpp-5ee30fe3d369a4959d01ef07dc48c852eefc2427.tar.gz | |
Merge branch '1.4'
Diffstat (limited to 'tests')
3 files changed, 4 insertions, 2 deletions
diff --git a/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp b/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp index 37223ba8..5205d7ea 100644 --- a/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp +++ b/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp @@ -26,6 +26,8 @@ #include "util.h" #include <QObject> +Q_DECLARE_METATYPE(QCryptographicHash::Algorithm) + class tst_QXmppBitsOfBinaryContentId : public QObject { Q_OBJECT diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp index 5e75a116..42255c57 100644 --- a/tests/qxmppmessage/tst_qxmppmessage.cpp +++ b/tests/qxmppmessage/tst_qxmppmessage.cpp @@ -1096,7 +1096,7 @@ void tst_QXmppMessage::testMixInvitation() QXmppMessage message; parsePacket(message, xml); - QVERIFY(message.mixInvitation()); + QVERIFY(message.mixInvitation().has_value()); serializePacket(message, xml); } diff --git a/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp b/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp index 79b4292c..c755e3b3 100644 --- a/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp +++ b/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp @@ -49,7 +49,7 @@ void tst_QXmppStreamInitiationIq::testFileInfo_data() QTest::newRow("normal") << QByteArray("<file xmlns=\"http://jabber.org/protocol/si/profile/file-transfer\" name=\"test.txt\" size=\"1022\"/>") - << QDateTime() + << QDateTime().toUTC() << QString() << QByteArray() << QString("test.txt") |