jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

contact_list: fix trust request update bugs

Browse Source 
https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1804
Change-Id: I8cb3ffc7d5b1b2b8bbfe018b922c260a569411fb
This commit is contained in:
François-Simon Fauteux-Chapleau
2024-07-22 10:48:06 -04:00
parent 13e51e8879
commit 51df87226b
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/unitTest/conversation/conversationMembersEvent.cpp
View File

@ -1657,12 +1657,25 @@ ConversationMembersEventTest::testAddContactTwice()
std::cout << "\nRunning test: " << __func__ << std::endl;
auto aliceAccount = Manager::instance().getAccount<JamiAccount>(aliceId);
auto aliceUri = aliceAccount->getUsername();
auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
auto bobUri = bobAccount->getUsername();
// Add contact
aliceAccount->addContact(bobUri);
aliceAccount->sendTrustRequest(bobUri, {});
CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&]() { return bobData.requestReceived; }));
auto oldConversationId = aliceData.conversationId;
CPPUNIT_ASSERT(!oldConversationId.empty());
// Check that the trust request's data is correct
auto bobTrustRequests = bobAccount->getTrustRequests();
CPPUNIT_ASSERT(bobTrustRequests.size() == 1);
auto request = bobTrustRequests[0];
CPPUNIT_ASSERT(request["from"] == aliceUri);
CPPUNIT_ASSERT(request["conversationId"] == oldConversationId);
// Remove and re-add contact
aliceAccount->removeContact(bobUri, false);
CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&]() { return aliceData.removed; }));
// wait that connections are closed.
@ -1671,6 +1684,17 @@ ConversationMembersEventTest::testAddContactTwice()
aliceAccount->addContact(bobUri);
aliceAccount->sendTrustRequest(bobUri, {});
CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&]() { return bobData.requestRemoved && bobData.requestReceived; }));
auto newConversationId = aliceData.conversationId;
CPPUNIT_ASSERT(!newConversationId.empty());
CPPUNIT_ASSERT(newConversationId != oldConversationId);
// Check that the trust request's data was correctly
// updated when we received the second request
bobTrustRequests = bobAccount->getTrustRequests();
CPPUNIT_ASSERT(bobTrustRequests.size() == 1);
request = bobTrustRequests[0];
CPPUNIT_ASSERT(request["from"] == aliceUri);
CPPUNIT_ASSERT(request["conversationId"] == newConversationId);
}
void