aboutsummaryrefslogtreecommitdiff
path: root/tests/qxmppclient/tst_qxmppclient.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/qxmppclient/tst_qxmppclient.cpp')
-rw-r--r--tests/qxmppclient/tst_qxmppclient.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/tests/qxmppclient/tst_qxmppclient.cpp b/tests/qxmppclient/tst_qxmppclient.cpp
index d25fdda4..8005a580 100644
--- a/tests/qxmppclient/tst_qxmppclient.cpp
+++ b/tests/qxmppclient/tst_qxmppclient.cpp
@@ -96,23 +96,25 @@ public:
bool messageCalled = false;
bool iqCalled = false;
- QFuture<MessageEncryptResult> encryptMessage(QXmppMessage &&, const std::optional<QXmppSendStanzaParams> &) override
+ QXmppTask<MessageEncryptResult> encryptMessage(QXmppMessage &&, const std::optional<QXmppSendStanzaParams> &) override
{
messageCalled = true;
- return makeReadyFuture<MessageEncryptResult>(QXmppError { "it's only a test", QXmpp::SendError::EncryptionError });
+ return makeReadyTask<MessageEncryptResult>(QXmppError { "it's only a test", QXmpp::SendError::EncryptionError });
+ }
+ QXmppTask<MessageDecryptResult> decryptMessage(QXmppMessage &&) override
+ {
+ return makeReadyTask<MessageDecryptResult>(QXmppError { "it's only a test", QXmpp::SendError::EncryptionError });
}
- QFuture<MessageDecryptResult> decryptMessage(QXmppMessage &&) override { return {}; };
-
- QFuture<IqEncryptResult> encryptIq(QXmppIq &&, const std::optional<QXmppSendStanzaParams> &) override
+ QXmppTask<IqEncryptResult> encryptIq(QXmppIq &&, const std::optional<QXmppSendStanzaParams> &) override
{
iqCalled = true;
- return makeReadyFuture<IqEncryptResult>(QXmppError { "it's only a test", QXmpp::SendError::EncryptionError });
+ return makeReadyTask<IqEncryptResult>(QXmppError { "it's only a test", QXmpp::SendError::EncryptionError });
}
- QFuture<IqDecryptResult> decryptIq(const QDomElement &) override
+ QXmppTask<IqDecryptResult> decryptIq(const QDomElement &) override
{
- return makeReadyFuture<IqDecryptResult>(QXmppError { "it's only a test", QXmpp::SendError::EncryptionError });
+ return makeReadyTask<IqDecryptResult>(QXmppError { "it's only a test", QXmpp::SendError::EncryptionError });
}
bool isEncrypted(const QDomElement &) override { return false; };
@@ -129,7 +131,7 @@ void tst_QXmppClient::testE2eeExtension()
QVERIFY(encrypter.messageCalled);
QVERIFY(!encrypter.iqCalled);
QCoreApplication::processEvents();
- expectFutureVariant<QXmppError>(result);
+ expectFutureVariant<QXmppError>(result.toFuture(this));
encrypter.messageCalled = false;
result = client.send(QXmppPresence(QXmppPresence::Available));