diff --git a/CMakeLists.txt b/CMakeLists.txt index 896e6c6684d48110f749184e2f82cd84201b8016..04d46c71baf45c90e60bc98b15ed3441c6cd6b2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -779,6 +779,7 @@ else() file(COPY test/unitTest/actors DESTINATION ${CMAKE_BINARY_DIR}) file(COPY test/unitTest/conversation/rsc DESTINATION ${CMAKE_BINARY_DIR}/conversation) + file(COPY test/unitTest/media/data DESTINATION ${CMAKE_BINARY_DIR}/media) add_library(ut_library STATIC test/unitTest/common.cpp) target_link_libraries(ut_library diff --git a/test/unitTest/call/recorder.cpp b/test/unitTest/call/recorder.cpp index 2a54f130faca4462a06c1acbab6d98eb63172cbf..e0038629d107d3065e5156073eb0d26914bed52f 100644 --- a/test/unitTest/call/recorder.cpp +++ b/test/unitTest/call/recorder.cpp @@ -86,7 +86,7 @@ public: std::unique_lock<std::mutex> lk {mtx}; std::condition_variable cv; - std::string videoPath = "file://" + std::filesystem::absolute("media/test_video_file.mp4").string(); + std::string videoPath = "file://" + std::filesystem::absolute("media/data/test_video_file.mp4").string(); private: void registerSignalHandlers(); diff --git a/test/unitTest/media/jami.jpg b/test/unitTest/media/data/jami.jpg similarity index 100% rename from test/unitTest/media/jami.jpg rename to test/unitTest/media/data/jami.jpg diff --git a/test/unitTest/media/test.mp3 b/test/unitTest/media/data/test.mp3 similarity index 100% rename from test/unitTest/media/test.mp3 rename to test/unitTest/media/data/test.mp3 diff --git a/test/unitTest/media/test_video_file.mp4 b/test/unitTest/media/data/test_video_file.mp4 similarity index 100% rename from test/unitTest/media/test_video_file.mp4 rename to test/unitTest/media/data/test_video_file.mp4 diff --git a/test/unitTest/media/test_media_player.cpp b/test/unitTest/media/test_media_player.cpp index 5c2a970c49e11fe94a0d949fc61637683201f541..93972d8c1d258955fdb74eddb3ee258f1553f2b9 100644 --- a/test/unitTest/media/test_media_player.cpp +++ b/test/unitTest/media/test_media_player.cpp @@ -101,7 +101,7 @@ void MediaPlayerTest::testCreate() { JAMI_INFO("Start testCreate"); - playerId1_ = jami::createMediaPlayer("./media/test_video_file.mp4"); + playerId1_ = jami::createMediaPlayer("./media/data/test_video_file.mp4"); mediaPlayer = jami::getMediaPlayer(playerId1_); cv.wait_for(lk, 5s); CPPUNIT_ASSERT(playerId1_ == playerId2_); @@ -118,7 +118,7 @@ void MediaPlayerTest::testJPG() { JAMI_INFO("Start testJpg"); - playerId1_ = jami::createMediaPlayer("./media/jami.jpg"); + playerId1_ = jami::createMediaPlayer("./media/data/jami.jpg"); mediaPlayer = jami::getMediaPlayer(playerId1_); cv.wait_for(lk, 5s); CPPUNIT_ASSERT(playerId1_ == playerId2_); @@ -134,7 +134,7 @@ void MediaPlayerTest::testAudioFile() { JAMI_INFO("Start testAudioFile"); - playerId1_ = jami::createMediaPlayer("./media/test.mp3"); + playerId1_ = jami::createMediaPlayer("./media/data/test.mp3"); mediaPlayer = jami::getMediaPlayer(playerId1_); cv.wait_for(lk, 5s); CPPUNIT_ASSERT(playerId1_ == playerId2_); @@ -149,7 +149,7 @@ MediaPlayerTest::testAudioFile() void MediaPlayerTest::testPause() { - playerId1_ = jami::createMediaPlayer("./media/test_video_file.mp4"); + playerId1_ = jami::createMediaPlayer("./media/data/test_video_file.mp4"); mediaPlayer = jami::getMediaPlayer(playerId1_); cv.wait_for(lk, 5s); JAMI_INFO("Start testPause"); @@ -170,7 +170,7 @@ void MediaPlayerTest::testSeekWhilePaused() { JAMI_INFO("Start testSeekWhilePaused"); - playerId1_ = jami::createMediaPlayer("./media/test_video_file.mp4"); + playerId1_ = jami::createMediaPlayer("./media/data/test_video_file.mp4"); mediaPlayer = jami::getMediaPlayer(playerId1_); cv.wait_for(lk, 5s); @@ -199,7 +199,7 @@ void MediaPlayerTest::testSeekWhilePlaying() { JAMI_INFO("Start testSeekWhilePlaying"); - playerId1_ = jami::createMediaPlayer("./media/test_video_file.mp4"); + playerId1_ = jami::createMediaPlayer("./media/data/test_video_file.mp4"); mediaPlayer = jami::getMediaPlayer(playerId1_); cv.wait_for(lk, 5s); mediaPlayer->pause(false);