From 6cd270bcfc2a490c6b2ff6ac6955ed2a21ca0149 Mon Sep 17 00:00:00 2001 From: Melvin Keskin Date: Sat, 4 Mar 2023 01:23:28 +0100 Subject: tests: OmemoManager: Use CarbonManagerV2 --- tests/qxmppomemomanager/tst_qxmppomemomanager.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp b/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp index e6d2c7ed..b1046391 100644 --- a/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp +++ b/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp @@ -6,7 +6,7 @@ #include "QXmppAtmTrustMemoryStorage.h" #include "QXmppBitsOfBinaryContentId.h" #include "QXmppBitsOfBinaryIq.h" -#include "QXmppCarbonManager.h" +#include "QXmppCarbonManagerV2.h" #include "QXmppClient.h" #include "QXmppDiscoveryManager.h" #include "QXmppE2eeMetadata.h" @@ -29,7 +29,7 @@ struct OmemoUser QXmppClient client; QXmppLogger logger; QXmppOmemoManager *manager; - QXmppCarbonManager *carbonManager; + QXmppCarbonManagerV2 *carbonManager; QXmppDiscoveryManager *discoveryManager; QXmppPubSubManager *pubSubManager; std::unique_ptr omemoStorage; @@ -149,12 +149,9 @@ void tst_QXmppOmemoManager::initOmemoUser(OmemoUser &omemoUser) omemoUser.manager = new QXmppOmemoManager(omemoUser.omemoStorage.get()); omemoUser.client.addExtension(omemoUser.manager); - omemoUser.carbonManager = new QXmppCarbonManager; + omemoUser.carbonManager = new QXmppCarbonManagerV2; omemoUser.client.addExtension(omemoUser.carbonManager); - connect(omemoUser.carbonManager, &QXmppCarbonManager::messageSent, omemoUser.manager, &QXmppOmemoManager::handleMessage); - connect(omemoUser.carbonManager, &QXmppCarbonManager::messageReceived, omemoUser.manager, &QXmppOmemoManager::handleMessage); - omemoUser.logger.setLoggingType(QXmppLogger::SignalLogging); omemoUser.client.setLogger(&omemoUser.logger); } @@ -266,8 +263,6 @@ void tst_QXmppOmemoManager::testSendMessage() auto future = m_alice1.manager->setUp(); future.then(this, [=](bool isSetUp) { if (isSetUp) { - m_alice1.carbonManager->setCarbonsEnabled(true); - auto future = m_alice1.manager->setSecurityPolicy(Toakafa); future.then(this, [=]() { auto future = m_alice2.manager->setSecurityPolicy(Toakafa); @@ -280,12 +275,7 @@ void tst_QXmppOmemoManager::testSendMessage() }); connect(&m_alice2.client, &QXmppClient::connected, &context, [=]() { - auto future = m_alice2.manager->setUp(); - future.then(this, [=](bool isSetUp) { - if (isSetUp) { - m_alice2.carbonManager->setCarbonsEnabled(true); - } - }); + m_alice2.manager->setUp(); }); connect(&m_alice2.logger, &QXmppLogger::message, &context, [=](QXmppLogger::MessageType type, const QString &text) { -- cgit v1.2.3