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

conversation: fix partial file transfer issues

Browse Source 
GitLab: #1118
Change-Id: I4de38d343022ec2712a7e649d73fbdb1da068eb3
This commit is contained in:
François-Simon Fauteux-Chapleau
2025-04-18 17:16:15 -04:00
committed by Adrien Béraud
parent 1dcd67dac0
commit 17524a8c42
5 changed files with 118 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
test/unitTest/fileTransfer/fileTransfer.cpp
View File

@ -97,7 +97,8 @@ private:
void testBadSha3sumIn();
void testAskToMultipleParticipants();
void testCancelInTransfer();
void testCancelOutTransfer();
void testResumeTransferAfterInterruption();
void testDontDownloadExistingFile();
void testTransferInfo();
void testRemoveHardLink();
void testTooLarge();
@ -111,6 +112,8 @@ private:
CPPUNIT_TEST(testBadSha3sumIn);
CPPUNIT_TEST(testAskToMultipleParticipants);
CPPUNIT_TEST(testCancelInTransfer);
CPPUNIT_TEST(testResumeTransferAfterInterruption);
CPPUNIT_TEST(testDontDownloadExistingFile);
CPPUNIT_TEST(testTransferInfo);
CPPUNIT_TEST(testRemoveHardLink);
CPPUNIT_TEST(testTooLarge);
@ -532,6 +535,95 @@ FileTransferTest::testCancelInTransfer()
CPPUNIT_ASSERT(!bobAccount->dataTransfer(convId)->isWaiting(fileId));
}
void
FileTransferTest::testResumeTransferAfterInterruption()
{
// Create conversation
auto aliceAccount = Manager::instance().getAccount<JamiAccount>(aliceId);
auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
auto bobUri = bobAccount->getUsername();
auto aliceUri = aliceAccount->getUsername();
connectSignals();
auto convId = libjami::startConversation(aliceId);
libjami::addConversationMember(aliceId, convId, bobUri);
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bobData.requestReceived; }));
auto aliceMsgSize = aliceData.messages.size();
libjami::acceptConversationRequest(bobId, convId);
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceMsgSize + 1 == aliceData.messages.size(); }));
// Create file to send
constexpr int64_t totalSize = 12800000;
std::ofstream sendFile(sendPath);
CPPUNIT_ASSERT(sendFile.is_open());
sendFile << std::string(totalSize, 'A');
sendFile.close();
// Send file info
auto bobMsgSize = bobData.messages.size();
libjami::sendFile(aliceId, convId, sendPath, "SEND", "");
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bobMsgSize + 1 == bobData.messages.size(); }));
auto id = bobData.messages.rbegin()->id;
auto fileId = bobData.messages.rbegin()->body["fileId"];
libjami::downloadFile(bobId, convId, id, fileId, recvPath);
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bobData.code == static_cast<int>(libjami::DataTransferEventCode::ongoing); }));
Manager::instance().sendRegister(aliceId, false);
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bobData.code == static_cast<int>(libjami::DataTransferEventCode::closed_by_host); }));
int64_t receivedSize = fileutils::size(recvPath + std::string(".tmp"));
CPPUNIT_ASSERT(receivedSize < totalSize);
CPPUNIT_ASSERT(0 < receivedSize);
CPPUNIT_ASSERT(bobAccount->dataTransfer(convId)->isWaiting(fileId));
Manager::instance().sendRegister(aliceId, true);
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bobData.code == static_cast<int>(libjami::DataTransferEventCode::finished); }));
CPPUNIT_ASSERT(!bobAccount->dataTransfer(convId)->isWaiting(fileId));
}
void
FileTransferTest::testDontDownloadExistingFile()
{
// Create conversation
auto aliceAccount = Manager::instance().getAccount<JamiAccount>(aliceId);
auto bobAccount = Manager::instance().getAccount<JamiAccount>(bobId);
auto bobUri = bobAccount->getUsername();
auto aliceUri = aliceAccount->getUsername();
connectSignals();
auto convId = libjami::startConversation(aliceId);
libjami::addConversationMember(aliceId, convId, bobUri);
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bobData.requestReceived; }));
auto aliceMsgSize = aliceData.messages.size();
libjami::acceptConversationRequest(bobId, convId);
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return aliceMsgSize + 1 == aliceData.messages.size(); }));
// Create file to send
constexpr int64_t totalSize = 128000;
std::ofstream sendFile(sendPath);
CPPUNIT_ASSERT(sendFile.is_open());
sendFile << std::string(totalSize, 'A');
sendFile.close();
std::filesystem::copy(sendPath, recvPath);
// Send file info
auto bobMsgSize = bobData.messages.size();
libjami::sendFile(aliceId, convId, sendPath, "SEND", "");
CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]() { return bobMsgSize + 1 == bobData.messages.size(); }));
auto id = bobData.messages.rbegin()->id;
auto fileId = bobData.messages.rbegin()->body["fileId"];
libjami::downloadFile(bobId, convId, id, fileId, recvPath);
CPPUNIT_ASSERT(!cv.wait_for(lk, 10s, [&]() { return bobData.code > 0; }));
CPPUNIT_ASSERT(!bobAccount->dataTransfer(convId)->isWaiting(fileId));
CPPUNIT_ASSERT(fileutils::size(recvPath) == totalSize);
}
void
FileTransferTest::testTransferInfo()
{