mirror of
https://git.jami.net/savoirfairelinux/jami-daemon.git
synced 2025-08-12 22:09:25 +08:00
conversation: re-design sending/sent status
The goal of this patch is to allow the clients to get a better sent/read status from the daemon. API doesn't change much, but internal logic got some changes. For the client: + SwarmMessage now contains a map<string,int> status where string is the uri of a member, int is the status (0 = sending, 1 = sent, 2 = read) + cancelMessage is removed as not used anymore (sendMessage with flag=1 will edit a message) + getMessageStatus is removed as the status is sent in the SwarmMessage + accountMessageStatusChanged is now emitted for swarm messages when a fetch or setDisplay occurs. Client must handle this signal correctly. + Previous code to manage last displayed, fetched status is now merged with message status + Sync info is done when the sync is opened, else status are not updated correctly GitLab: #948 Change-Id: I60763d4de8a995c6fc9f6df6434e266211f8dc2f
This commit is contained in:
Sébastien Blin
@ -125,6 +125,19 @@ test('conversation_call', ut_conversation_call,
|
||||
)
|
||||
|
||||
|
||||
ut_conversation_fetch_sent = executable('ut_conversation_fetch_sent',
|
||||
sources: files(
|
||||
'unitTest/conversation/conversationcommon.cpp',
|
||||
'unitTest/conversation/conversationFetchSent.cpp'),
|
||||
include_directories: ut_includedirs,
|
||||
dependencies: ut_dependencies,
|
||||
link_with: ut_library
|
||||
)
|
||||
test('conversation_fetch_sent', ut_conversation_fetch_sent,
|
||||
workdir: ut_workdir, is_parallel: false, timeout: 1800
|
||||
)
|
||||
|
||||
|
||||
ut_conversation_members_event = executable('ut_conversation_members_event',
|
||||
sources: files(
|
||||
'unitTest/conversation/conversationMembersEvent.cpp',
|
||||
|
||||
@ -168,6 +168,12 @@ ut_conversation_SOURCES = conversation/conversationcommon.cpp conversation/conve
|
||||
check_PROGRAMS += ut_conversation_call
|
||||
ut_conversation_call_SOURCES = conversation/conversationcommon.cpp conversation/call.cpp common.cpp
|
||||
|
||||
#
|
||||
# conversation_fetch_sent
|
||||
#
|
||||
check_PROGRAMS += ut_conversation_fetch_sent
|
||||
ut_conversation_fetch_sent_SOURCES = conversation/conversationcommon.cpp conversation/conversationFetchSent.cpp common.cpp
|
||||
|
||||
#
|
||||
# media_negotiation
|
||||
#
|
||||
|
||||
@ -121,8 +121,6 @@ private:
|
||||
void testSendMessageToMultipleParticipants();
|
||||
void testPingPongMessages();
|
||||
void testIsComposing();
|
||||
void testMessageStatus();
|
||||
void testSetMessageDisplayed();
|
||||
void testSetMessageDisplayedTwice();
|
||||
void testSetMessageDisplayedPreference();
|
||||
void testSetMessageDisplayedAfterClone();
|
||||
@ -177,8 +175,6 @@ private:
|
||||
CPPUNIT_TEST(testSendMessageToMultipleParticipants);
|
||||
CPPUNIT_TEST(testPingPongMessages);
|
||||
CPPUNIT_TEST(testIsComposing);
|
||||
CPPUNIT_TEST(testMessageStatus);
|
||||
CPPUNIT_TEST(testSetMessageDisplayed);
|
||||
CPPUNIT_TEST(testSetMessageDisplayedTwice);
|
||||
CPPUNIT_TEST(testSetMessageDisplayedPreference);
|
||||
CPPUNIT_TEST(testSetMessageDisplayedAfterClone);
|
||||
@ -992,100 +988,6 @@ ConversationTest::testIsComposing()
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return !bobData.composing; }));
|
||||
}
|
||||
|
||||
void
|
||||
ConversationTest::testMessageStatus()
|
||||
{
|
||||
std::cout << "\nRunning test: " << __func__ << std::endl;
|
||||
connectSignals();
|
||||
|
||||
auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
|
||||
auto bobUri = bobAccount->getUsername();
|
||||
auto convId = libjami::startConversation(aliceId);
|
||||
auto aliceMsgSize = aliceData.messages.size();
|
||||
libjami::addConversationMember(aliceId, convId, bobUri);
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceMsgSize + 1 == aliceData.messages.size(); }));
|
||||
// Assert that repository exists
|
||||
auto repoPath = fileutils::get_data_dir() / aliceId
|
||||
/ "conversations" / convId;
|
||||
CPPUNIT_ASSERT(std::filesystem::is_directory(repoPath));
|
||||
// Check created files
|
||||
auto bobInvited = repoPath / "invited" / bobUri;
|
||||
CPPUNIT_ASSERT(std::filesystem::is_regular_file(bobInvited));
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bobData.requestReceived; }));
|
||||
libjami::acceptConversationRequest(bobId, convId);
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceMsgSize + 2 == aliceData.messages.size(); }));
|
||||
|
||||
aliceData.sending = false;
|
||||
aliceData.sent = false;
|
||||
libjami::sendMessage(aliceId, convId, "hi"s, "");
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceData.sending && aliceData.sent; }));
|
||||
}
|
||||
|
||||
void
|
||||
ConversationTest::testSetMessageDisplayed()
|
||||
{
|
||||
std::cout << "\nRunning test: " << __func__ << std::endl;
|
||||
connectSignals();
|
||||
|
||||
auto aliceAccount = Manager::instance().getAccount<JamiAccount>(aliceId);
|
||||
auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
|
||||
auto aliceUri = aliceAccount->getUsername();
|
||||
auto bobUri = bobAccount->getUsername();
|
||||
auto convId = libjami::startConversation(aliceId);
|
||||
auto aliceMsgSize = aliceData.messages.size();
|
||||
libjami::addConversationMember(aliceId, convId, bobUri);
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceMsgSize + 1 == aliceData.messages.size(); }));
|
||||
// Assert that repository exists
|
||||
auto repoPath = fileutils::get_data_dir() / aliceId
|
||||
/ "conversations" / convId;
|
||||
CPPUNIT_ASSERT(std::filesystem::is_directory(repoPath));
|
||||
// Check created files
|
||||
auto bobInvited = repoPath / "invited" / bobUri;
|
||||
CPPUNIT_ASSERT(std::filesystem::is_regular_file(bobInvited));
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bobData.requestReceived; }));
|
||||
libjami::acceptConversationRequest(bobId, convId);
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceMsgSize + 2 == aliceData.messages.size(); }));
|
||||
|
||||
// Last displayed messages should not be set yet
|
||||
auto membersInfos = libjami::getConversationMembers(bobId, convId);
|
||||
CPPUNIT_ASSERT(std::find_if(membersInfos.begin(),
|
||||
membersInfos.end(),
|
||||
[&](auto infos) {
|
||||
return infos["uri"] == aliceUri && infos["lastDisplayed"] == "";
|
||||
})
|
||||
!= membersInfos.end());
|
||||
membersInfos = libjami::getConversationMembers(aliceId, convId);
|
||||
CPPUNIT_ASSERT(std::find_if(membersInfos.begin(),
|
||||
membersInfos.end(),
|
||||
[&](auto infos) {
|
||||
// Last read for alice is when bob is added to the members
|
||||
return infos["uri"] == aliceUri
|
||||
&& infos["lastDisplayed"] == aliceData.messages[0].id;
|
||||
})
|
||||
!= membersInfos.end());
|
||||
bobData.sent = false;
|
||||
aliceAccount->setMessageDisplayed("swarm:" + convId, convId, 3);
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bobData.sent; }));
|
||||
|
||||
// Now, the last displayed message should be updated in member's infos (both sides)
|
||||
membersInfos = libjami::getConversationMembers(bobId, convId);
|
||||
CPPUNIT_ASSERT(std::find_if(membersInfos.begin(),
|
||||
membersInfos.end(),
|
||||
[&](auto infos) {
|
||||
return infos["uri"] == aliceUri
|
||||
&& infos["lastDisplayed"] == convId;
|
||||
})
|
||||
!= membersInfos.end());
|
||||
membersInfos = libjami::getConversationMembers(aliceId, convId);
|
||||
CPPUNIT_ASSERT(std::find_if(membersInfos.begin(),
|
||||
membersInfos.end(),
|
||||
[&](auto infos) {
|
||||
return infos["uri"] == aliceUri
|
||||
&& infos["lastDisplayed"] == convId;
|
||||
})
|
||||
!= membersInfos.end());
|
||||
}
|
||||
|
||||
void
|
||||
ConversationTest::testSetMessageDisplayedTwice()
|
||||
{
|
||||
@ -1144,30 +1046,9 @@ ConversationTest::testSetMessageDisplayedPreference()
|
||||
libjami::acceptConversationRequest(bobId, convId);
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceMsgSize + 2 == aliceData.messages.size(); }));
|
||||
|
||||
// Last displayed messages should not be set yet
|
||||
auto membersInfos = libjami::getConversationMembers(aliceId, convId);
|
||||
CPPUNIT_ASSERT(std::find_if(membersInfos.begin(),
|
||||
membersInfos.end(),
|
||||
[&](auto infos) {
|
||||
// Last read for alice is when bob is added to the members
|
||||
return infos["uri"] == aliceUri
|
||||
&& infos["lastDisplayed"] == aliceData.messages[0].id;
|
||||
})
|
||||
!= membersInfos.end());
|
||||
|
||||
aliceAccount->setMessageDisplayed("swarm:" + convId, convId, 3);
|
||||
// Bob should not receive anything here, as sendMessageDisplayed is disabled for Alice
|
||||
CPPUNIT_ASSERT(!cv.wait_for(lk, 10s, [&]() { return bobData.sent; }));
|
||||
|
||||
// Assert that message is set as displayed for self (for the read status)
|
||||
membersInfos = libjami::getConversationMembers(aliceId, convId);
|
||||
CPPUNIT_ASSERT(std::find_if(membersInfos.begin(),
|
||||
membersInfos.end(),
|
||||
[&](auto infos) {
|
||||
return infos["uri"] == aliceUri
|
||||
&& infos["lastDisplayed"] == convId;
|
||||
})
|
||||
!= membersInfos.end());
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
472
test/unitTest/conversation/conversationFetchSent.cpp
Normal file
472
test/unitTest/conversation/conversationFetchSent.cpp
Normal file
@ -0,0 +1,472 @@
|
||||
/*
|
||||
* Copyright (C) 2024 Savoir-faire Linux Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <cppunit/TestAssert.h>
|
||||
#include <cppunit/TestFixture.h>
|
||||
#include <cppunit/extensions/HelperMacros.h>
|
||||
|
||||
#include <condition_variable>
|
||||
#include <string>
|
||||
#include <fstream>
|
||||
#include <streambuf>
|
||||
#include <git2.h>
|
||||
#include <filesystem>
|
||||
#include <msgpack.hpp>
|
||||
|
||||
#include "../../test_runner.h"
|
||||
#include "account_const.h"
|
||||
#include "archiver.h"
|
||||
#include "base64.h"
|
||||
#include "common.h"
|
||||
#include "conversation/conversationcommon.h"
|
||||
#include "fileutils.h"
|
||||
#include "jami.h"
|
||||
#include "manager.h"
|
||||
#include <dhtnet/certstore.h>
|
||||
|
||||
using namespace std::string_literals;
|
||||
using namespace std::literals::chrono_literals;
|
||||
using namespace libjami::Account;
|
||||
|
||||
namespace jami {
|
||||
namespace test {
|
||||
|
||||
struct UserData {
|
||||
std::string conversationId;
|
||||
bool requestReceived {false};
|
||||
bool registered {false};
|
||||
bool stopped {false};
|
||||
bool deviceAnnounced {false};
|
||||
std::vector<libjami::SwarmMessage> messages;
|
||||
};
|
||||
|
||||
class ConversationFetchSentTest : public CppUnit::TestFixture
|
||||
{
|
||||
public:
|
||||
~ConversationFetchSentTest() { libjami::fini(); }
|
||||
static std::string name() { return "Conversation"; }
|
||||
void setUp();
|
||||
void tearDown();
|
||||
std::string createFakeConversation(std::shared_ptr<JamiAccount> account,
|
||||
const std::string& fakeCert = "");
|
||||
|
||||
std::string aliceId;
|
||||
UserData aliceData;
|
||||
std::string alice2Id;
|
||||
UserData alice2Data;
|
||||
std::string bobId;
|
||||
UserData bobData;
|
||||
std::string bob2Id;
|
||||
UserData bob2Data;
|
||||
std::string carlaId;
|
||||
UserData carlaData;
|
||||
|
||||
std::mutex mtx;
|
||||
std::unique_lock<std::mutex> lk {mtx};
|
||||
std::condition_variable cv;
|
||||
|
||||
void connectSignals();
|
||||
|
||||
private:
|
||||
void testSyncFetch();
|
||||
void testSyncAfterDisconnection();
|
||||
|
||||
CPPUNIT_TEST_SUITE(ConversationFetchSentTest);
|
||||
CPPUNIT_TEST(testSyncFetch);
|
||||
CPPUNIT_TEST(testSyncAfterDisconnection);
|
||||
CPPUNIT_TEST_SUITE_END();
|
||||
};
|
||||
|
||||
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(ConversationFetchSentTest, ConversationFetchSentTest::name());
|
||||
|
||||
void
|
||||
ConversationFetchSentTest::setUp()
|
||||
{
|
||||
// Init daemon
|
||||
libjami::init(
|
||||
libjami::InitFlag(libjami::LIBJAMI_FLAG_DEBUG | libjami::LIBJAMI_FLAG_CONSOLE_LOG));
|
||||
if (not Manager::instance().initialized)
|
||||
CPPUNIT_ASSERT(libjami::start("jami-sample.yml"));
|
||||
|
||||
auto actors = load_actors("actors/alice-bob-carla.yml");
|
||||
aliceId = actors["alice"];
|
||||
bobId = actors["bob"];
|
||||
carlaId = actors["carla"];
|
||||
|
||||
aliceData = {};
|
||||
alice2Data = {};
|
||||
bobData = {};
|
||||
bob2Data = {};
|
||||
carlaData = {};
|
||||
|
||||
Manager::instance().sendRegister(carlaId, false);
|
||||
wait_for_announcement_of({aliceId, bobId});
|
||||
}
|
||||
|
||||
void
|
||||
ConversationFetchSentTest::connectSignals()
|
||||
{
|
||||
std::map<std::string, std::shared_ptr<libjami::CallbackWrapperBase>> confHandlers;
|
||||
confHandlers.insert(
|
||||
libjami::exportable_callback<libjami::ConfigurationSignal::VolatileDetailsChanged>(
|
||||
[&](const std::string& accountId, const std::map<std::string, std::string>&) {
|
||||
if (accountId == aliceId) {
|
||||
auto aliceAccount = Manager::instance().getAccount<JamiAccount>(aliceId);
|
||||
auto details = aliceAccount->getVolatileAccountDetails();
|
||||
auto daemonStatus = details[libjami::Account::ConfProperties::Registration::STATUS];
|
||||
if (daemonStatus == "REGISTERED") {
|
||||
aliceData.registered = true;
|
||||
} else if (daemonStatus == "UNREGISTERED") {
|
||||
aliceData.stopped = true;
|
||||
}
|
||||
auto deviceAnnounced = details[libjami::Account::VolatileProperties::DEVICE_ANNOUNCED];
|
||||
aliceData.deviceAnnounced = deviceAnnounced == "true";
|
||||
} else if (accountId == bobId) {
|
||||
auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
|
||||
auto details = bobAccount->getVolatileAccountDetails();
|
||||
auto daemonStatus = details[libjami::Account::ConfProperties::Registration::STATUS];
|
||||
if (daemonStatus == "REGISTERED") {
|
||||
bobData.registered = true;
|
||||
} else if (daemonStatus == "UNREGISTERED") {
|
||||
bobData.stopped = true;
|
||||
}
|
||||
auto deviceAnnounced = details[libjami::Account::VolatileProperties::DEVICE_ANNOUNCED];
|
||||
bobData.deviceAnnounced = deviceAnnounced == "true";
|
||||
} else if (accountId == bob2Id) {
|
||||
auto bob2Account = Manager::instance().getAccount<JamiAccount>(bob2Id);
|
||||
auto details = bob2Account->getVolatileAccountDetails();
|
||||
auto daemonStatus = details[libjami::Account::ConfProperties::Registration::STATUS];
|
||||
if (daemonStatus == "REGISTERED") {
|
||||
bob2Data.registered = true;
|
||||
} else if (daemonStatus == "UNREGISTERED") {
|
||||
bob2Data.stopped = true;
|
||||
}
|
||||
auto deviceAnnounced = details[libjami::Account::VolatileProperties::DEVICE_ANNOUNCED];
|
||||
bob2Data.deviceAnnounced = deviceAnnounced == "true";
|
||||
} else if (accountId == carlaId) {
|
||||
auto carlaAccount = Manager::instance().getAccount<JamiAccount>(carlaId);
|
||||
auto details = carlaAccount->getVolatileAccountDetails();
|
||||
auto daemonStatus = details[libjami::Account::ConfProperties::Registration::STATUS];
|
||||
if (daemonStatus == "REGISTERED") {
|
||||
carlaData.registered = true;
|
||||
} else if (daemonStatus == "UNREGISTERED") {
|
||||
carlaData.stopped = true;
|
||||
}
|
||||
auto deviceAnnounced = details[libjami::Account::VolatileProperties::DEVICE_ANNOUNCED];
|
||||
carlaData.deviceAnnounced = deviceAnnounced == "true";
|
||||
}
|
||||
cv.notify_one();
|
||||
}));
|
||||
confHandlers.insert(libjami::exportable_callback<libjami::ConversationSignal::ConversationReady>(
|
||||
[&](const std::string& accountId, const std::string& conversationId) {
|
||||
if (accountId == aliceId) {
|
||||
aliceData.conversationId = conversationId;
|
||||
} else if (accountId == alice2Id) {
|
||||
alice2Data.conversationId = conversationId;
|
||||
} else if (accountId == bobId) {
|
||||
bobData.conversationId = conversationId;
|
||||
} else if (accountId == bob2Id) {
|
||||
bob2Data.conversationId = conversationId;
|
||||
} else if (accountId == carlaId) {
|
||||
carlaData.conversationId = conversationId;
|
||||
}
|
||||
cv.notify_one();
|
||||
}));
|
||||
confHandlers.insert(
|
||||
libjami::exportable_callback<libjami::ConversationSignal::ConversationRequestReceived>(
|
||||
[&](const std::string& accountId,
|
||||
const std::string& /* conversationId */,
|
||||
std::map<std::string, std::string> /*metadatas*/) {
|
||||
if (accountId == aliceId) {
|
||||
aliceData.requestReceived = true;
|
||||
} else if (accountId == bobId) {
|
||||
bobData.requestReceived = true;
|
||||
} else if (accountId == bob2Id) {
|
||||
bob2Data.requestReceived = true;
|
||||
} else if (accountId == carlaId) {
|
||||
carlaData.requestReceived = true;
|
||||
}
|
||||
cv.notify_one();
|
||||
}));
|
||||
confHandlers.insert(libjami::exportable_callback<libjami::ConversationSignal::SwarmMessageReceived>(
|
||||
[&](const std::string& accountId,
|
||||
const std::string& /* conversationId */,
|
||||
libjami::SwarmMessage message) {
|
||||
if (accountId == aliceId) {
|
||||
aliceData.messages.emplace_back(message);
|
||||
} else if (accountId == bobId) {
|
||||
bobData.messages.emplace_back(message);
|
||||
} else if (accountId == bob2Id) {
|
||||
bob2Data.messages.emplace_back(message);
|
||||
} else if (accountId == carlaId) {
|
||||
carlaData.messages.emplace_back(message);
|
||||
}
|
||||
cv.notify_one();
|
||||
}));
|
||||
confHandlers.insert(
|
||||
libjami::exportable_callback<libjami::ConfigurationSignal::AccountMessageStatusChanged>(
|
||||
[&](const std::string& accountId,
|
||||
const std::string& /*conversationId*/,
|
||||
const std::string& peer,
|
||||
const std::string& msgId,
|
||||
int status) {
|
||||
auto placeMessage = [&](auto& data) {
|
||||
for (auto& dataMsg : data.messages) {
|
||||
if (dataMsg.id == msgId) {
|
||||
dataMsg.status[peer] = status;
|
||||
return;
|
||||
}
|
||||
}
|
||||
};
|
||||
if (accountId == aliceId) {
|
||||
placeMessage(aliceData);
|
||||
} else if (accountId == bobId) {
|
||||
placeMessage(bobData);
|
||||
} else if (accountId == bob2Id) {
|
||||
placeMessage(bob2Data);
|
||||
}
|
||||
cv.notify_one();
|
||||
}));
|
||||
libjami::registerSignalHandlers(confHandlers);
|
||||
}
|
||||
|
||||
void
|
||||
ConversationFetchSentTest::tearDown()
|
||||
{
|
||||
auto bobArchive = std::filesystem::current_path().string() + "/bob.gz";
|
||||
std::remove(bobArchive.c_str());
|
||||
auto aliceArchive = std::filesystem::current_path().string() + "/alice.gz";
|
||||
std::remove(aliceArchive.c_str());
|
||||
if (!alice2Id.empty()) {
|
||||
wait_for_removal_of(alice2Id);
|
||||
}
|
||||
|
||||
if (bob2Id.empty()) {
|
||||
wait_for_removal_of({aliceId, bobId, carlaId});
|
||||
} else {
|
||||
wait_for_removal_of({aliceId, bobId, carlaId, bob2Id});
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
ConversationFetchSentTest::testSyncAfterDisconnection()
|
||||
{
|
||||
std::cout << "\nRunning test: " << __func__ << std::endl;
|
||||
connectSignals();
|
||||
|
||||
auto aliceAccount = Manager::instance().getAccount<JamiAccount>(aliceId);
|
||||
auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
|
||||
auto bobUri = bobAccount->getUsername();
|
||||
auto aliceUri = aliceAccount->getUsername();
|
||||
|
||||
// Bob creates a second device
|
||||
auto bobArchive = std::filesystem::current_path().string() + "/bob.gz";
|
||||
std::remove(bobArchive.c_str());
|
||||
bobAccount->exportArchive(bobArchive);
|
||||
std::map<std::string, std::string> details = libjami::getAccountTemplate("RING");
|
||||
details[ConfProperties::TYPE] = "RING";
|
||||
details[ConfProperties::DISPLAYNAME] = "BOB2";
|
||||
details[ConfProperties::ALIAS] = "BOB2";
|
||||
details[ConfProperties::UPNP_ENABLED] = "true";
|
||||
details[ConfProperties::ARCHIVE_PASSWORD] = "";
|
||||
details[ConfProperties::ARCHIVE_PIN] = "";
|
||||
details[ConfProperties::ARCHIVE_PATH] = bobArchive;
|
||||
bob2Id = Manager::instance().addAccount(details);
|
||||
|
||||
// Disconnect bob2, to create a valid conv betwen Alice and Bob1
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bob2Data.deviceAnnounced; }));
|
||||
|
||||
// Create conversation between alice and bob
|
||||
aliceAccount->addContact(bobUri);
|
||||
aliceAccount->sendTrustRequest(bobUri, {});
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bobData.requestReceived; }));
|
||||
CPPUNIT_ASSERT(bobAccount->acceptTrustRequest(aliceUri));
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return !bobData.conversationId.empty() && !bob2Data.conversationId.empty(); }));
|
||||
|
||||
std::this_thread::sleep_for(5s); // Wait for all join messages to be received
|
||||
|
||||
// bob send 4 messages
|
||||
auto aliceMsgSize = aliceData.messages.size(), bob2MsgSize = bob2Data.messages.size(), bobMsgSize = bobData.messages.size();
|
||||
libjami::sendMessage(bobId, bobData.conversationId, "1"s, "");
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() {
|
||||
return aliceData.messages.size() == aliceMsgSize + 1
|
||||
&& bobData.messages.size() == bobMsgSize + 1
|
||||
&& bob2Data.messages.size() == bob2MsgSize + 1; }));
|
||||
auto msgId1 = aliceData.messages.rbegin()->id;
|
||||
auto getMsgStatus = [&](const auto& data, const auto& id, const auto& peer) {
|
||||
for (const auto& msg : data.messages) {
|
||||
if (msg.id == id && msg.status.find(peer) != msg.status.end()) {
|
||||
return static_cast<libjami::Account::MessageStates>(msg.status.at(peer));
|
||||
}
|
||||
}
|
||||
return libjami::Account::MessageStates::UNKNOWN;
|
||||
};
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return getMsgStatus(bobData, msgId1, aliceUri) == libjami::Account::MessageStates::SENT && getMsgStatus(bob2Data, msgId1, aliceUri) == libjami::Account::MessageStates::SENT; }));
|
||||
libjami::sendMessage(bobId, bobData.conversationId, "2"s, "");
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceData.messages.size() == aliceMsgSize + 2
|
||||
&& bobData.messages.size() == bobMsgSize + 2
|
||||
&& bob2Data.messages.size() == bob2MsgSize + 2;}));
|
||||
auto msgId2 = aliceData.messages.rbegin()->id;
|
||||
// Because bob2Data.status is here only on update, but msgReceived can be good directly at first
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return getMsgStatus(bobData, msgId2, aliceUri) == libjami::Account::MessageStates::SENT && getMsgStatus(bob2Data, msgId2, aliceUri) == libjami::Account::MessageStates::SENT; }));
|
||||
libjami::sendMessage(bobId, bobData.conversationId, "3"s, "");
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceData.messages.size() == aliceMsgSize + 3
|
||||
&& bobData.messages.size() == bobMsgSize + 3
|
||||
&& bob2Data.messages.size() == bob2MsgSize + 3; }));
|
||||
auto msgId3 = aliceData.messages.rbegin()->id;
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return getMsgStatus(bobData, msgId3, aliceUri) == libjami::Account::MessageStates::SENT && getMsgStatus(bob2Data, msgId3, aliceUri) == libjami::Account::MessageStates::SENT; }));
|
||||
libjami::sendMessage(bobId, bobData.conversationId, "4"s, "");
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceData.messages.size() == aliceMsgSize + 4
|
||||
&& bobData.messages.size() == bobMsgSize + 4
|
||||
&& bob2Data.messages.size() == bob2MsgSize + 4; }));
|
||||
auto msgId4 = aliceData.messages.rbegin()->id;
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return getMsgStatus(bobData, msgId4, aliceUri) == libjami::Account::MessageStates::SENT && getMsgStatus(bob2Data, msgId4, aliceUri) == libjami::Account::MessageStates::SENT; }));
|
||||
|
||||
|
||||
// Bob is disabled. Bob2 will get the infos
|
||||
Manager::instance().sendRegister(bobId, false);
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bobData.stopped; }));
|
||||
|
||||
// Second message is set to displayed by alice
|
||||
aliceAccount->setMessageDisplayed("swarm:" + aliceData.conversationId, msgId2, 3);
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return getMsgStatus(bob2Data, msgId1, aliceUri) == libjami::Account::MessageStates::DISPLAYED
|
||||
&& getMsgStatus(bob2Data, msgId2, aliceUri) == libjami::Account::MessageStates::DISPLAYED; }));
|
||||
CPPUNIT_ASSERT(getMsgStatus(bobData, msgId1, aliceUri) != libjami::Account::MessageStates::DISPLAYED);
|
||||
|
||||
// Alice is disabled so she will not sync
|
||||
Manager::instance().sendRegister(aliceId, false);
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceData.stopped; }));
|
||||
|
||||
// Bob is enabled again, should sync infos with bob2
|
||||
Manager::instance().sendRegister(bobId, true);
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return getMsgStatus(bobData, msgId1, aliceUri) == libjami::Account::MessageStates::DISPLAYED
|
||||
&& getMsgStatus(bobData, msgId2, aliceUri) == libjami::Account::MessageStates::DISPLAYED; }));
|
||||
}
|
||||
|
||||
void
|
||||
ConversationFetchSentTest::testSyncFetch()
|
||||
{
|
||||
std::cout << "\nRunning test: " << __func__ << std::endl;
|
||||
connectSignals();
|
||||
|
||||
auto aliceAccount = Manager::instance().getAccount<JamiAccount>(aliceId);
|
||||
auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
|
||||
auto bobUri = bobAccount->getUsername();
|
||||
auto aliceUri = aliceAccount->getUsername();
|
||||
|
||||
// Bob creates a second device
|
||||
auto bobArchive = std::filesystem::current_path().string() + "/bob.gz";
|
||||
std::remove(bobArchive.c_str());
|
||||
bobAccount->exportArchive(bobArchive);
|
||||
std::map<std::string, std::string> details = libjami::getAccountTemplate("RING");
|
||||
details[ConfProperties::TYPE] = "RING";
|
||||
details[ConfProperties::DISPLAYNAME] = "BOB2";
|
||||
details[ConfProperties::ALIAS] = "BOB2";
|
||||
details[ConfProperties::UPNP_ENABLED] = "true";
|
||||
details[ConfProperties::ARCHIVE_PASSWORD] = "";
|
||||
details[ConfProperties::ARCHIVE_PIN] = "";
|
||||
details[ConfProperties::ARCHIVE_PATH] = bobArchive;
|
||||
bob2Id = Manager::instance().addAccount(details);
|
||||
|
||||
// Disconnect bob2, to create a valid conv betwen Alice and Bob1
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bob2Data.deviceAnnounced; }));
|
||||
|
||||
// Create conversation between alice and bob
|
||||
aliceAccount->addContact(bobUri);
|
||||
aliceAccount->sendTrustRequest(bobUri, {});
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bobData.requestReceived; }));
|
||||
CPPUNIT_ASSERT(bobAccount->acceptTrustRequest(aliceUri));
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return !bobData.conversationId.empty() && !bob2Data.conversationId.empty(); }));
|
||||
|
||||
std::this_thread::sleep_for(5s); // Wait for all join messages to be received
|
||||
|
||||
// bob send 4 messages
|
||||
auto aliceMsgSize = aliceData.messages.size(), bob2MsgSize = bob2Data.messages.size(), bobMsgSize = bobData.messages.size();
|
||||
libjami::sendMessage(bobId, bobData.conversationId, "1"s, "");
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() {
|
||||
return aliceData.messages.size() == aliceMsgSize + 1
|
||||
&& bobData.messages.size() == bobMsgSize + 1
|
||||
&& bob2Data.messages.size() == bob2MsgSize + 1; }));
|
||||
auto msgId1 = aliceData.messages.rbegin()->id;
|
||||
auto getMsgStatus = [&](const auto& data, const auto& id, const auto& peer) {
|
||||
for (const auto& msg : data.messages) {
|
||||
if (msg.id == id && msg.status.find(peer) != msg.status.end()) {
|
||||
return static_cast<libjami::Account::MessageStates>(msg.status.at(peer));
|
||||
}
|
||||
}
|
||||
return libjami::Account::MessageStates::UNKNOWN;
|
||||
};
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return getMsgStatus(bobData, msgId1, aliceUri) == libjami::Account::MessageStates::SENT && getMsgStatus(bob2Data, msgId1, aliceUri) == libjami::Account::MessageStates::SENT; }));
|
||||
libjami::sendMessage(bobId, bobData.conversationId, "2"s, "");
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceData.messages.size() == aliceMsgSize + 2
|
||||
&& bobData.messages.size() == bobMsgSize + 2
|
||||
&& bob2Data.messages.size() == bob2MsgSize + 2;}));
|
||||
auto msgId2 = aliceData.messages.rbegin()->id;
|
||||
// Because bob2Data.status is here only on update, but msgReceived can be good directly at first
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return getMsgStatus(bobData, msgId2, aliceUri) == libjami::Account::MessageStates::SENT && getMsgStatus(bob2Data, msgId2, aliceUri) == libjami::Account::MessageStates::SENT; }));
|
||||
libjami::sendMessage(bobId, bobData.conversationId, "3"s, "");
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceData.messages.size() == aliceMsgSize + 3
|
||||
&& bobData.messages.size() == bobMsgSize + 3
|
||||
&& bob2Data.messages.size() == bob2MsgSize + 3; }));
|
||||
auto msgId3 = aliceData.messages.rbegin()->id;
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return getMsgStatus(bobData, msgId3, aliceUri) == libjami::Account::MessageStates::SENT && getMsgStatus(bob2Data, msgId3, aliceUri) == libjami::Account::MessageStates::SENT; }));
|
||||
libjami::sendMessage(bobId, bobData.conversationId, "4"s, "");
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceData.messages.size() == aliceMsgSize + 4
|
||||
&& bobData.messages.size() == bobMsgSize + 4
|
||||
&& bob2Data.messages.size() == bob2MsgSize + 4; }));
|
||||
auto msgId4 = aliceData.messages.rbegin()->id;
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return getMsgStatus(bobData, msgId4, aliceUri) == libjami::Account::MessageStates::SENT && getMsgStatus(bob2Data, msgId4, aliceUri) == libjami::Account::MessageStates::SENT; }));
|
||||
|
||||
// Second message is set to displayed by alice
|
||||
aliceAccount->setMessageDisplayed("swarm:" + aliceData.conversationId, msgId2, 3);
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return getMsgStatus(bobData, msgId1, aliceUri) == libjami::Account::MessageStates::DISPLAYED && getMsgStatus(bob2Data, msgId1, aliceUri) == libjami::Account::MessageStates::DISPLAYED
|
||||
&& getMsgStatus(bobData, msgId2, aliceUri) == libjami::Account::MessageStates::DISPLAYED && getMsgStatus(bob2Data, msgId2, aliceUri) == libjami::Account::MessageStates::DISPLAYED; }));
|
||||
// Other messages are still set to received
|
||||
CPPUNIT_ASSERT(getMsgStatus(bobData, msgId3, aliceUri) == libjami::Account::MessageStates::SENT && getMsgStatus(bob2Data, msgId3, aliceUri) == libjami::Account::MessageStates::SENT && getMsgStatus(bobData, msgId4, aliceUri) == libjami::Account::MessageStates::SENT && getMsgStatus(bob2Data, msgId4, aliceUri) == libjami::Account::MessageStates::SENT);
|
||||
|
||||
// Get conversation members should show the same information
|
||||
auto membersInfos = libjami::getConversationMembers(bobId, bobData.conversationId);
|
||||
CPPUNIT_ASSERT(std::find_if(membersInfos.begin(),
|
||||
membersInfos.end(),
|
||||
[&](auto infos) {
|
||||
return infos["uri"] == aliceUri
|
||||
&& infos["lastDisplayed"] == msgId2;
|
||||
})
|
||||
!= membersInfos.end());
|
||||
|
||||
// Alice is disabled
|
||||
Manager::instance().sendRegister(aliceId, false); // This avoid to sync immediately
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceData.stopped; }));
|
||||
|
||||
// Bob send 2 more messages
|
||||
bob2MsgSize = bob2Data.messages.size();
|
||||
libjami::sendMessage(bobId, bobData.conversationId, "5"s, "");
|
||||
libjami::sendMessage(bobId, bobData.conversationId, "6"s, "");
|
||||
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bob2Data.messages.size() == bob2MsgSize + 2; }));
|
||||
auto msgId5 = bobData.messages.rbegin()->id;
|
||||
auto msgId6 = (bobData.messages.rbegin()+1)->id;
|
||||
// No update
|
||||
CPPUNIT_ASSERT(!cv.wait_for(lk, 30s, [&]() { return getMsgStatus(bobData, msgId5, aliceUri) == libjami::Account::MessageStates::SENT && getMsgStatus(bobData, msgId6, aliceUri) == libjami::Account::MessageStates::SENT; }));
|
||||
// SwarmMessage will not get any status because nobody got the message
|
||||
CPPUNIT_ASSERT(getMsgStatus(bobData, msgId5, aliceUri) == libjami::Account::MessageStates::UNKNOWN);
|
||||
CPPUNIT_ASSERT(getMsgStatus(bobData, msgId6, aliceUri) == libjami::Account::MessageStates::UNKNOWN);
|
||||
}
|
||||
|
||||
} // namespace test
|
||||
} // namespace jami
|
||||
|
||||
RING_TEST_RUNNER(jami::test::ConversationFetchSentTest::name())
|
||||
Reference in New Issue
Block a user