diff --git a/tests/assets/filler.mp4 b/tests/assets/filler.mp4 deleted file mode 100644 index 35cf6c7e..00000000 Binary files a/tests/assets/filler.mp4 and /dev/null differ diff --git a/tests/assets/playlists/2024/02/2024-02-01.json b/tests/assets/playlists/2024/02/2024-02-01.json index a0d05dc4..1661619e 100644 --- a/tests/assets/playlists/2024/02/2024-02-01.json +++ b/tests/assets/playlists/2024/02/2024-02-01.json @@ -277,6 +277,18 @@ "out": 15.0, "duration": 15.0, "source": "tests/assets/media_sorted/LightSeaGreen_00-00-15.mp4" + }, + { + "in": 0, + "out": 30.0, + "duration": 30.0, + "source": "tests/assets/media_sorted/Yellow_00-00-30.mp4" + }, + { + "in": 0, + "out": 30.0, + "duration": 30.0, + "source": "tests/assets/media_sorted/Aqua_00-00-30.mp4" } ] } diff --git a/tests/src/engine_playlist.rs b/tests/src/engine_playlist.rs index a3491d88..3c59160c 100644 --- a/tests/src/engine_playlist.rs +++ b/tests/src/engine_playlist.rs @@ -29,8 +29,8 @@ fn test_gen_source() { config.playlist.start_sec = Some(0.0); config.playlist.length = "24:00:00".into(); config.playlist.length_sec = Some(86400.0); - config.playlist.path = "assets/media_mix/playlists".into(); - config.storage.filler = "assets/media_mix/filler.mp4".into(); + config.playlist.path = "assets/playlists".into(); + config.storage.filler = "assets/media_filler/filler_0.mp4".into(); config.logging.log_to_file = false; config.logging.timestamp = false; config.logging.level = LevelFilter::Trace; @@ -89,7 +89,7 @@ fn test_gen_source() { 100, ); - assert_eq!(valid_media.source, "assets/media_mix/filler.mp4"); + assert_eq!(valid_media.source, "assets/media_filler/filler_0.mp4"); } #[test] @@ -106,8 +106,8 @@ fn playlist_missing() { config.playlist.start_sec = Some(0.0); config.playlist.length = "24:00:00".into(); config.playlist.length_sec = Some(86400.0); - config.playlist.path = "assets/media_mix/playlists".into(); - config.storage.filler = "assets/media_mix/filler.mp4".into(); + config.playlist.path = "assets/playlists".into(); + config.storage.filler = "assets/media_filler/filler_0.mp4".into(); config.logging.log_to_file = false; config.logging.timestamp = false; config.logging.level = LevelFilter::Trace; @@ -149,8 +149,8 @@ fn playlist_next_missing() { config.playlist.start_sec = Some(0.0); config.playlist.length = "24:00:00".into(); config.playlist.length_sec = Some(86400.0); - config.playlist.path = "assets/media_mix/playlists".into(); - config.storage.filler = "assets/media_mix/filler.mp4".into(); + config.playlist.path = "assets/playlists".into(); + config.storage.filler = "assets/media_filler/filler_0.mp4".into(); config.logging.log_to_file = false; config.logging.timestamp = false; config.logging.level = LevelFilter::Trace; @@ -192,8 +192,8 @@ fn playlist_to_short() { config.playlist.start_sec = Some(21600.0); config.playlist.length = "24:00:00".into(); config.playlist.length_sec = Some(86400.0); - config.playlist.path = "assets/media_mix/playlists".into(); - config.storage.filler = "assets/media_mix/filler.mp4".into(); + config.playlist.path = "assets/playlists".into(); + config.storage.filler = "assets/media_filler/filler_0.mp4".into(); config.logging.log_to_file = false; config.logging.timestamp = false; config.logging.level = log::LevelFilter::Trace; @@ -235,8 +235,8 @@ fn playlist_init_after_list_end() { config.playlist.start_sec = Some(21600.0); config.playlist.length = "24:00:00".into(); config.playlist.length_sec = Some(86400.0); - config.playlist.path = "assets/media_mix/playlists".into(); - config.storage.filler = "assets/media_mix/filler.mp4".into(); + config.playlist.path = "assets/playlists".into(); + config.storage.filler = "assets/media_filler/filler_0.mp4".into(); config.logging.log_to_file = false; config.logging.timestamp = false; config.logging.level = log::LevelFilter::Trace; @@ -278,8 +278,8 @@ fn playlist_change_at_midnight() { config.playlist.start_sec = Some(0.0); config.playlist.length = "24:00:00".into(); config.playlist.length_sec = Some(86400.0); - config.playlist.path = "assets/media_mix/playlists".into(); - config.storage.filler = "assets/media_mix/filler.mp4".into(); + config.playlist.path = "assets/playlists".into(); + config.storage.filler = "assets/media_filler/filler_0.mp4".into(); config.logging.log_to_file = false; config.logging.timestamp = false; config.logging.level = LevelFilter::Trace; @@ -321,8 +321,8 @@ fn playlist_change_before_midnight() { config.playlist.start_sec = Some(0.0); config.playlist.length = "24:00:00".into(); config.playlist.length_sec = Some(86400.0); - config.playlist.path = "assets/media_mix/playlists".into(); - config.storage.filler = "assets/media_mix/filler.mp4".into(); + config.playlist.path = "assets/playlists".into(); + config.storage.filler = "assets/media_filler/filler_0.mp4".into(); config.logging.log_to_file = false; config.logging.timestamp = false; config.logging.level = LevelFilter::Trace; @@ -364,8 +364,8 @@ fn playlist_change_at_six() { config.playlist.start_sec = Some(21600.0); config.playlist.length = "24:00:00".into(); config.playlist.length_sec = Some(86400.0); - config.playlist.path = "assets/media_mix/playlists".into(); - config.storage.filler = "assets/media_mix/filler.mp4".into(); + config.playlist.path = "assets/playlists".into(); + config.storage.filler = "assets/media_filler/filler_0.mp4".into(); config.logging.log_to_file = false; config.logging.timestamp = false; config.out.mode = Null;