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

swarm: add ability to answer to a message

Browse Source 
GitLab: #318
Change-Id: I12c04096a91c40b5e6c9c435373cce23b4065d7e
This commit is contained in:
Sébastien Blin
2022-07-18 15:51:17 -04:00
parent eaf11b51f8
commit dca84be45c
17 changed files with 124 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
test/unitTest/conversation/conversation.cpp
View File

@ -108,6 +108,7 @@ private:
void testSyncWithoutPinnedCert();
void testImportMalformedContacts();
void testRemoveReaddMultipleDevice();
void testSendReply();
CPPUNIT_TEST_SUITE(ConversationTest);
CPPUNIT_TEST(testCreateConversation);
@ -146,6 +147,7 @@ private:
CPPUNIT_TEST(testSyncWithoutPinnedCert);
CPPUNIT_TEST(testImportMalformedContacts);
CPPUNIT_TEST(testRemoveReaddMultipleDevice);
CPPUNIT_TEST(testSendReply);
CPPUNIT_TEST_SUITE_END();
};
@ -2819,6 +2821,78 @@ ConversationTest::testRemoveReaddMultipleDevice()
cv.wait_for(lk, 30s, [&]() { return conversationReadyBob && conversationReadyBob2; }));
}
void
ConversationTest::testSendReply()
{
auto aliceAccount = Manager::instance().getAccount<JamiAccount>(aliceId);
auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
auto bobUri = bobAccount->getUsername();
std::mutex mtx;
std::unique_lock<std::mutex> lk {mtx};
std::condition_variable cv;
std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>> confHandlers;
std::vector<std::map<std::string, std::string>> messageBobReceived = {},
messageAliceReceived = {};
confHandlers.insert(DRing::exportable_callback<DRing::ConversationSignal::MessageReceived>(
[&](const std::string& accountId,
const std::string& /* conversationId */,
std::map<std::string, std::string> message) {
if (accountId == bobId) {
messageBobReceived.emplace_back(message);
} else {
messageAliceReceived.emplace_back(message);
}
cv.notify_one();
}));
bool requestReceived = false;
confHandlers.insert(
DRing::exportable_callback<DRing::ConversationSignal::ConversationRequestReceived>(
[&](const std::string& /*accountId*/,
const std::string& /* conversationId */,
std::map<std::string, std::string> /*metadatas*/) {
requestReceived = true;
cv.notify_one();
}));
bool conversationReady = false;
confHandlers.insert(DRing::exportable_callback<DRing::ConversationSignal::ConversationReady>(
[&](const std::string& accountId, const std::string& /* conversationId */) {
if (accountId == bobId) {
conversationReady = true;
cv.notify_one();
}
}));
DRing::registerSignalHandlers(confHandlers);
auto convId = DRing::startConversation(aliceId);
DRing::addConversationMember(aliceId, convId, bobUri);
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return requestReceived; }));
DRing::acceptConversationRequest(bobId, convId);
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return conversationReady; }));
// Assert that repository exists
auto repoPath = fileutils::get_data_dir() + DIR_SEPARATOR_STR + bobAccount->getAccountID()
+ DIR_SEPARATOR_STR + "conversations" + DIR_SEPARATOR_STR + convId;
CPPUNIT_ASSERT(fileutils::isDirectory(repoPath));
// Wait that alice sees Bob
cv.wait_for(lk, 30s, [&]() { return messageAliceReceived.size() == 2; });
messageBobReceived.clear();
DRing::sendMessage(aliceId, convId, "hi"s, "");
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return messageBobReceived.size() == 1; }));
auto validId = messageBobReceived.at(0).at("id");
DRing::sendMessage(aliceId, convId, "foo"s, validId);
CPPUNIT_ASSERT(cv.wait_for(lk, 10s, [&]() { return messageBobReceived.size() == 2; }));
CPPUNIT_ASSERT(messageBobReceived.rbegin()->at("reply-to") == validId);
// Check if parent doesn't exists, no message is generated
DRing::sendMessage(aliceId, convId, "foo"s, "invalid");
CPPUNIT_ASSERT(!cv.wait_for(lk, 10s, [&]() { return messageBobReceived.size() == 3; }));
}
} // namespace test
} // namespace jami