From 102493de1743d6b010d0274635da37ea3f434473 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Sat, 12 Mar 2022 21:01:23 +0100 Subject: tests: E2eeMetadata: Workaround compile error with clang 13 --- tests/qxmppstanza/tst_qxmppstanza.cpp | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/qxmppstanza/tst_qxmppstanza.cpp b/tests/qxmppstanza/tst_qxmppstanza.cpp index b4826e1b..ad757629 100644 --- a/tests/qxmppstanza/tst_qxmppstanza.cpp +++ b/tests/qxmppstanza/tst_qxmppstanza.cpp @@ -385,27 +385,23 @@ void tst_QXmppStanza::testErrorRetry() void tst_QXmppStanza::testSenderKey() { QXmppStanzaStub stanza; - auto e2eeMetadata = stanza.e2eeMetadata(); - QVERIFY(!e2eeMetadata.has_value()); - e2eeMetadata = QXmppE2eeMetadata(); - e2eeMetadata->setSenderKey(QByteArray::fromBase64(QByteArrayLiteral("aFABnX7Q/rbTgjBySYzrT2FsYCVYb49mbca5yB734KQ="))); + QVERIFY(!stanza.e2eeMetadata().has_value()); + QXmppE2eeMetadata e2eeMetadata; + e2eeMetadata.setSenderKey(QByteArray::fromBase64(QByteArrayLiteral("aFABnX7Q/rbTgjBySYzrT2FsYCVYb49mbca5yB734KQ="))); stanza.setE2eeMetadata(e2eeMetadata); - e2eeMetadata = stanza.e2eeMetadata(); - QCOMPARE(e2eeMetadata->senderKey(), QByteArray::fromBase64(QByteArrayLiteral("aFABnX7Q/rbTgjBySYzrT2FsYCVYb49mbca5yB734KQ="))); + QCOMPARE(stanza.e2eeMetadata()->senderKey(), QByteArray::fromBase64(QByteArrayLiteral("aFABnX7Q/rbTgjBySYzrT2FsYCVYb49mbca5yB734KQ="))); } void tst_QXmppStanza::testSceTimestamp() { QXmppStanzaStub stanza; - auto e2eeMetadata = stanza.e2eeMetadata(); - QVERIFY(!e2eeMetadata.has_value()); - e2eeMetadata = QXmppE2eeMetadata(); - QVERIFY(e2eeMetadata->senderKey().isEmpty()); - QVERIFY(e2eeMetadata->sceTimestamp().isNull()); - e2eeMetadata->setSceTimestamp(QDateTime(QDate(2022, 01, 01), QTime())); + QVERIFY(!stanza.e2eeMetadata().has_value()); + QXmppE2eeMetadata e2eeMetadata; + QVERIFY(e2eeMetadata.senderKey().isNull()); + QVERIFY(e2eeMetadata.sceTimestamp().isNull()); + e2eeMetadata.setSceTimestamp(QDateTime(QDate(2022, 01, 01), QTime())); stanza.setE2eeMetadata(e2eeMetadata); - e2eeMetadata = stanza.e2eeMetadata(); - QCOMPARE(e2eeMetadata->sceTimestamp(), QDateTime(QDate(2022, 01, 01), QTime())); + QCOMPARE(stanza.e2eeMetadata()->sceTimestamp(), QDateTime(QDate(2022, 01, 01), QTime())); } QTEST_MAIN(tst_QXmppStanza) -- cgit v1.2.3