From dc300e1c9c1f3a6fecd4b4dc56db98cb39b61d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?=
<francois-simon.fauteux-chapleau@savoirfairelinux.com>
Date: Fri, 25 Apr 2025 14:46:09 -0400
Subject: [PATCH] cmake: copy files used by ut_media_player
GitLab: #1124
Change-Id: Iaeac4b3cec40edb5633b2db346c3bcc167cc054a
---
CMakeLists.txt | 1 +
test/unitTest/call/recorder.cpp | 2 +-
test/unitTest/media/{ => data}/jami.jpg | Bin
test/unitTest/media/{ => data}/test.mp3 | Bin
test/unitTest/media/{ => data}/test_video_file.mp4 | Bin
test/unitTest/media/test_media_player.cpp | 12 ++++++------
6 files changed, 8 insertions(+), 7 deletions(-)
rename test/unitTest/media/{ => data}/jami.jpg (100%)
rename test/unitTest/media/{ => data}/test.mp3 (100%)
rename test/unitTest/media/{ => data}/test_video_file.mp4 (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 896e6c6684..04d46c71ba 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 2a54f130fa..e0038629d1 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 5c2a970c49..93972d8c1d 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);
--
GitLab