tests: fix fileTransfer test

Change-Id: Ibb1afba82e884913d1e8268fdd584dedef8ae496

test/unitTest/fileTransfer/fileTransfer.cpp

@@ -34,19 +34,20 @@
 
 using namespace DRing::Account;
 
-namespace jami { namespace test {
+namespace jami {
+namespace test {
 
-class FileTransferTest : public CppUnit::TestFixture {
+class FileTransferTest : public CppUnit::TestFixture
+{
 public:
-    FileTransferTest() {
+    FileTransferTest()
+    {
         // Init daemon
         DRing::init(DRing::InitFlag(DRing::DRING_FLAG_DEBUG | DRing::DRING_FLAG_CONSOLE_LOG));
         if (not Manager::instance().initialized)
             CPPUNIT_ASSERT(DRing::start("dring-sample.yml"));
     }
-    ~FileTransferTest() {
-        DRing::fini();
-    }
+    ~FileTransferTest() { DRing::fini(); }
     static std::string name() { return "Call"; }
     bool compare(const std::string& fileA, const std::string& fileB) const;
     void setUp();
@@ -68,7 +69,8 @@ private:
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(FileTransferTest, FileTransferTest::name());
 
 bool
-FileTransferTest::compare(const std::string& fileA, const std::string& fileB) const {
+FileTransferTest::compare(const std::string& fileA, const std::string& fileB) const
+{
     std::ifstream f1(fileA, std::ifstream::binary | std::ifstream::ate);
     std::ifstream f2(fileB, std::ifstream::binary | std::ifstream::ate);
 
@@ -113,7 +115,8 @@ FileTransferTest::setUp()
     std::mutex mtx;
     std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
-    confHandlers.insert(DRing::exportable_callback<DRing::ConfigurationSignal::VolatileDetailsChanged>(
+    confHandlers.insert(
+        DRing::exportable_callback<DRing::ConfigurationSignal::VolatileDetailsChanged>(
             [&](const std::string&, const std::map<std::string, std::string>&) {
                 bool ready = false;
                 auto details = aliceAccount->getVolatileAccountDetails();
@@ -138,8 +141,8 @@ FileTransferTest::tearDown()
     std::unique_lock<std::mutex> lk {mtx};
     std::condition_variable cv;
     auto currentAccSize = Manager::instance().getAccountList().size();
-    confHandlers.insert(DRing::exportable_callback<DRing::ConfigurationSignal::AccountsChanged>(
-    [&]() {
+    confHandlers.insert(
+        DRing::exportable_callback<DRing::ConfigurationSignal::AccountsChanged>([&]() {
             if (Manager::instance().getAccountList().size() <= currentAccSize - 2) {
                 cv.notify_one();
             }
@@ -173,13 +176,13 @@ FileTransferTest::testCachedFileTransfer()
     std::condition_variable cv;
     std::condition_variable cv2;
     std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>> confHandlers;
-    bool transferCreated = false, transferFinished = false;
+    bool transferWaiting = false, transferFinished = false;
     DRing::DataTransferId finalId;
     // Watch signals
     confHandlers.insert(DRing::exportable_callback<DRing::DataTransferSignal::DataTransferEvent>(
         [&](const long unsigned int& id, int code) {
-        if (code == static_cast<int>(DRing::DataTransferEventCode::created)) {
-            transferCreated = true;
+            if (code == static_cast<int>(DRing::DataTransferEventCode::wait_host_acceptance)) {
+                transferWaiting = true;
                 finalId = id;
                 cv.notify_one();
             } else if (code == static_cast<int>(DRing::DataTransferEventCode::finished)) {
@@ -190,14 +193,6 @@ FileTransferTest::testCachedFileTransfer()
         }));
     DRing::registerSignalHandlers(confHandlers);
 
-    bool successfullyReceive = false;
-    bobAccount->connectionManager().onChannelRequest(
-    [&successfullyReceive, &cv](const std::string&, const std::string& name) {
-        successfullyReceive = name.substr(0, 7) == "file://";
-        cv.notify_one();
-        return true;
-    });
-
     // Create file to send
     std::ofstream sendFile("SEND");
     CPPUNIT_ASSERT(sendFile.is_open());
@@ -215,13 +210,11 @@ FileTransferTest::testCachedFileTransfer()
     CPPUNIT_ASSERT(DRing::sendFile(info, id) == DRing::DataTransferError::success);
 
     cv.wait_for(lk, std::chrono::seconds(30));
-    CPPUNIT_ASSERT(successfullyReceive);
-
-    cv.wait_for(lk, std::chrono::seconds(30));
-    CPPUNIT_ASSERT(transferCreated);
+    CPPUNIT_ASSERT(transferWaiting);
 
     auto rcv_path = "RECV";
-    CPPUNIT_ASSERT(DRing::acceptFileTransfer(finalId, rcv_path, 0) == DRing::DataTransferError::success);
+    CPPUNIT_ASSERT(DRing::acceptFileTransfer(finalId, rcv_path, 0)
+                   == DRing::DataTransferError::success);
 
     // Wait 2 times, both sides will got a finished status
     cv.wait_for(lk, std::chrono::seconds(30));
@@ -257,13 +250,13 @@ FileTransferTest::testMultipleFileTransfer()
     std::condition_variable cv;
     std::condition_variable cv2;
     std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>> confHandlers;
-    bool transferCreated = false, transferFinished = false;
+    bool transferWaiting = false, transferFinished = false;
     DRing::DataTransferId finalId;
     // Watch signals
     confHandlers.insert(DRing::exportable_callback<DRing::DataTransferSignal::DataTransferEvent>(
         [&](const long unsigned int& id, int code) {
-        if (code == static_cast<int>(DRing::DataTransferEventCode::created)) {
-            transferCreated = true;
+            if (code == static_cast<int>(DRing::DataTransferEventCode::wait_host_acceptance)) {
+                transferWaiting = true;
                 finalId = id;
                 cv.notify_one();
             } else if (code == static_cast<int>(DRing::DataTransferEventCode::finished)) {
@@ -274,14 +267,6 @@ FileTransferTest::testMultipleFileTransfer()
         }));
     DRing::registerSignalHandlers(confHandlers);
 
-    bool successfullyReceive = false;
-    bobAccount->connectionManager().onChannelRequest(
-    [&successfullyReceive, &cv](const std::string&, const std::string& name) {
-        successfullyReceive = name.substr(0, 7) == "file://";
-        cv.notify_one();
-        return true;
-    });
-
     // Create file to send
     std::ofstream sendFile("SEND");
     CPPUNIT_ASSERT(sendFile.is_open());
@@ -303,13 +288,12 @@ FileTransferTest::testMultipleFileTransfer()
     CPPUNIT_ASSERT(DRing::sendFile(info, id) == DRing::DataTransferError::success);
 
     cv.wait_for(lk, std::chrono::seconds(30));
-    CPPUNIT_ASSERT(successfullyReceive);
-
-    cv.wait_for(lk, std::chrono::seconds(30));
-    CPPUNIT_ASSERT(transferCreated);
+    CPPUNIT_ASSERT(transferWaiting);
+    transferWaiting = false;
 
     auto rcv_path = "RECV";
-    CPPUNIT_ASSERT(DRing::acceptFileTransfer(finalId, rcv_path, 0) == DRing::DataTransferError::success);
+    CPPUNIT_ASSERT(DRing::acceptFileTransfer(finalId, rcv_path, 0)
+                   == DRing::DataTransferError::success);
 
     // Wait 2 times, both sides will got a finished status
     cv.wait_for(lk, std::chrono::seconds(30));
@@ -328,13 +312,11 @@ FileTransferTest::testMultipleFileTransfer()
     CPPUNIT_ASSERT(DRing::sendFile(info2, id) == DRing::DataTransferError::success);
 
     cv.wait_for(lk, std::chrono::seconds(30));
-    CPPUNIT_ASSERT(successfullyReceive);
-
-    cv.wait_for(lk, std::chrono::seconds(30));
-    CPPUNIT_ASSERT(transferCreated);
+    CPPUNIT_ASSERT(transferWaiting);
 
     rcv_path = "RECV2";
-    CPPUNIT_ASSERT(DRing::acceptFileTransfer(finalId, rcv_path, 0) == DRing::DataTransferError::success);
+    CPPUNIT_ASSERT(DRing::acceptFileTransfer(finalId, rcv_path, 0)
+                   == DRing::DataTransferError::success);
 
     // Wait 2 times, both sides will got a finished status
     cv.wait_for(lk, std::chrono::seconds(30));
@@ -353,6 +335,7 @@ FileTransferTest::testMultipleFileTransfer()
     std::this_thread::sleep_for(std::chrono::seconds(3));
 }
 
-}} // namespace test
+} // namespace test
+} // namespace jami
 
 RING_TEST_RUNNER(jami::test::FileTransferTest::name())
\ No newline at end of file