diff --git a/Cargo.toml b/Cargo.toml index 6e332e2..f790b1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,3 +25,4 @@ hex = "0.4.0" [dev-dependencies] clap = "2.33.0" +pretty_assertions = "0.6.1" diff --git a/src/attribute.rs b/src/attribute.rs index 1a513b7..95f99a6 100644 --- a/src/attribute.rs +++ b/src/attribute.rs @@ -96,6 +96,7 @@ fn split(value: &str, terminator: char) -> Vec { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_parser() { diff --git a/src/master_playlist.rs b/src/master_playlist.rs index ff2a944..04b2d99 100644 --- a/src/master_playlist.rs +++ b/src/master_playlist.rs @@ -445,6 +445,7 @@ impl FromStr for MasterPlaylist { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_parser() { diff --git a/src/media_playlist.rs b/src/media_playlist.rs index dc360df..7d66cb4 100644 --- a/src/media_playlist.rs +++ b/src/media_playlist.rs @@ -379,6 +379,7 @@ impl FromStr for MediaPlaylist { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn too_large_segment_duration_test() { diff --git a/src/media_segment.rs b/src/media_segment.rs index f842d2c..65394d0 100644 --- a/src/media_segment.rs +++ b/src/media_segment.rs @@ -192,6 +192,7 @@ impl Encrypted for MediaSegment { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; use std::time::Duration; #[test] diff --git a/src/tags/basic/m3u.rs b/src/tags/basic/m3u.rs index 019818e..b1f8592 100644 --- a/src/tags/basic/m3u.rs +++ b/src/tags/basic/m3u.rs @@ -62,6 +62,7 @@ impl FromStr for ExtM3u { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/basic/version.rs b/src/tags/basic/version.rs index f7f68ca..e39f079 100644 --- a/src/tags/basic/version.rs +++ b/src/tags/basic/version.rs @@ -104,6 +104,7 @@ impl FromStr for ExtXVersion { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/master_playlist/i_frame_stream_inf.rs b/src/tags/master_playlist/i_frame_stream_inf.rs index cd3c2fa..2e9c9f5 100644 --- a/src/tags/master_playlist/i_frame_stream_inf.rs +++ b/src/tags/master_playlist/i_frame_stream_inf.rs @@ -190,6 +190,7 @@ impl DerefMut for ExtXIFrameStreamInf { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_builder() { diff --git a/src/tags/master_playlist/media.rs b/src/tags/master_playlist/media.rs index 5c986e1..794e131 100644 --- a/src/tags/master_playlist/media.rs +++ b/src/tags/master_playlist/media.rs @@ -740,6 +740,7 @@ impl FromStr for ExtXMedia { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/master_playlist/session_data.rs b/src/tags/master_playlist/session_data.rs index 9bebffd..a264158 100644 --- a/src/tags/master_playlist/session_data.rs +++ b/src/tags/master_playlist/session_data.rs @@ -324,6 +324,7 @@ impl FromStr for ExtXSessionData { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/master_playlist/session_key.rs b/src/tags/master_playlist/session_key.rs index bdd7fdb..6bd3731 100644 --- a/src/tags/master_playlist/session_key.rs +++ b/src/tags/master_playlist/session_key.rs @@ -86,6 +86,7 @@ impl DerefMut for ExtXSessionKey { mod test { use super::*; use crate::types::{EncryptionMethod, KeyFormat}; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/master_playlist/stream_inf.rs b/src/tags/master_playlist/stream_inf.rs index cdd65ab..d8cc87d 100644 --- a/src/tags/master_playlist/stream_inf.rs +++ b/src/tags/master_playlist/stream_inf.rs @@ -376,6 +376,7 @@ impl DerefMut for ExtXStreamInf { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_parser() { diff --git a/src/tags/media_playlist/discontinuity_sequence.rs b/src/tags/media_playlist/discontinuity_sequence.rs index fbfd851..c49b9d7 100644 --- a/src/tags/media_playlist/discontinuity_sequence.rs +++ b/src/tags/media_playlist/discontinuity_sequence.rs @@ -84,6 +84,7 @@ impl FromStr for ExtXDiscontinuitySequence { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/media_playlist/end_list.rs b/src/tags/media_playlist/end_list.rs index 874445b..430354a 100644 --- a/src/tags/media_playlist/end_list.rs +++ b/src/tags/media_playlist/end_list.rs @@ -45,6 +45,7 @@ impl FromStr for ExtXEndList { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/media_playlist/i_frames_only.rs b/src/tags/media_playlist/i_frames_only.rs index ac35ed2..c28d830 100644 --- a/src/tags/media_playlist/i_frames_only.rs +++ b/src/tags/media_playlist/i_frames_only.rs @@ -47,6 +47,7 @@ impl FromStr for ExtXIFramesOnly { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/media_playlist/media_sequence.rs b/src/tags/media_playlist/media_sequence.rs index e41a0a6..ed2babf 100644 --- a/src/tags/media_playlist/media_sequence.rs +++ b/src/tags/media_playlist/media_sequence.rs @@ -81,6 +81,7 @@ impl FromStr for ExtXMediaSequence { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/media_playlist/playlist_type.rs b/src/tags/media_playlist/playlist_type.rs index 1c22b0a..9311191 100644 --- a/src/tags/media_playlist/playlist_type.rs +++ b/src/tags/media_playlist/playlist_type.rs @@ -61,6 +61,7 @@ impl FromStr for ExtXPlaylistType { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_parser() { diff --git a/src/tags/media_playlist/target_duration.rs b/src/tags/media_playlist/target_duration.rs index 83a6aa9..046ccc5 100644 --- a/src/tags/media_playlist/target_duration.rs +++ b/src/tags/media_playlist/target_duration.rs @@ -73,6 +73,7 @@ impl FromStr for ExtXTargetDuration { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/media_segment/byte_range.rs b/src/tags/media_segment/byte_range.rs index 3ad2ad1..936189a 100644 --- a/src/tags/media_segment/byte_range.rs +++ b/src/tags/media_segment/byte_range.rs @@ -104,6 +104,7 @@ impl FromStr for ExtXByteRange { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/media_segment/date_range.rs b/src/tags/media_segment/date_range.rs index e984a48..93061a7 100644 --- a/src/tags/media_segment/date_range.rs +++ b/src/tags/media_segment/date_range.rs @@ -823,6 +823,7 @@ impl fmt::Display for ExtXDateRange { mod test { use super::*; use chrono::offset::TimeZone; + use pretty_assertions::assert_eq; const HOURS_IN_SECS: i32 = 3600; // 1 hour = 3600 seconds diff --git a/src/tags/media_segment/discontinuity.rs b/src/tags/media_segment/discontinuity.rs index 90d4e65..7b3fad5 100644 --- a/src/tags/media_segment/discontinuity.rs +++ b/src/tags/media_segment/discontinuity.rs @@ -44,6 +44,7 @@ impl FromStr for ExtXDiscontinuity { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/media_segment/inf.rs b/src/tags/media_segment/inf.rs index 9d95cbd..fc1cb51 100644 --- a/src/tags/media_segment/inf.rs +++ b/src/tags/media_segment/inf.rs @@ -178,6 +178,7 @@ impl From for ExtInf { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/media_segment/key.rs b/src/tags/media_segment/key.rs index b5e0528..4efac85 100644 --- a/src/tags/media_segment/key.rs +++ b/src/tags/media_segment/key.rs @@ -113,6 +113,7 @@ impl DerefMut for ExtXKey { mod test { use super::*; use crate::types::{EncryptionMethod, KeyFormat}; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/media_segment/map.rs b/src/tags/media_segment/map.rs index be2138a..d702709 100644 --- a/src/tags/media_segment/map.rs +++ b/src/tags/media_segment/map.rs @@ -194,6 +194,7 @@ impl FromStr for ExtXMap { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/media_segment/program_date_time.rs b/src/tags/media_segment/program_date_time.rs index 628cd2a..5ea34ca 100644 --- a/src/tags/media_segment/program_date_time.rs +++ b/src/tags/media_segment/program_date_time.rs @@ -133,6 +133,7 @@ impl DerefMut for ExtXProgramDateTime { mod test { use super::*; use chrono::{Datelike, TimeZone}; + use pretty_assertions::assert_eq; const HOURS_IN_SECS: i32 = 3600; // 1 hour = 3600 seconds diff --git a/src/tags/shared/independent_segments.rs b/src/tags/shared/independent_segments.rs index 07e5f78..47b0f66 100644 --- a/src/tags/shared/independent_segments.rs +++ b/src/tags/shared/independent_segments.rs @@ -35,6 +35,7 @@ impl FromStr for ExtXIndependentSegments { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/tags/shared/start.rs b/src/tags/shared/start.rs index 701b792..22a3acb 100644 --- a/src/tags/shared/start.rs +++ b/src/tags/shared/start.rs @@ -157,6 +157,7 @@ impl FromStr for ExtXStart { #[cfg(test)] mod test { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/types/byte_range.rs b/src/types/byte_range.rs index a1807d1..795514d 100644 --- a/src/types/byte_range.rs +++ b/src/types/byte_range.rs @@ -114,6 +114,7 @@ impl FromStr for ByteRange { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/types/channels.rs b/src/types/channels.rs index 5cad2dc..effec06 100644 --- a/src/types/channels.rs +++ b/src/types/channels.rs @@ -103,6 +103,7 @@ impl fmt::Display for Channels { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/types/closed_captions.rs b/src/types/closed_captions.rs index 2c73a99..93bf543 100644 --- a/src/types/closed_captions.rs +++ b/src/types/closed_captions.rs @@ -40,6 +40,7 @@ impl FromStr for ClosedCaptions { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/types/decimal_floating_point.rs b/src/types/decimal_floating_point.rs index 2c6d13e..5e8c2de 100644 --- a/src/types/decimal_floating_point.rs +++ b/src/types/decimal_floating_point.rs @@ -69,6 +69,7 @@ impl From for DecimalFloatingPoint { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; macro_rules! test_from { ( $($input:expr),* ) => { diff --git a/src/types/decimal_resolution.rs b/src/types/decimal_resolution.rs index b5d9ef4..2a4b4ae 100644 --- a/src/types/decimal_resolution.rs +++ b/src/types/decimal_resolution.rs @@ -68,6 +68,7 @@ impl FromStr for DecimalResolution { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/types/decryption_key.rs b/src/types/decryption_key.rs index 5b04e3d..f974a42 100644 --- a/src/types/decryption_key.rs +++ b/src/types/decryption_key.rs @@ -353,6 +353,7 @@ impl fmt::Display for DecryptionKey { mod test { use super::*; use crate::types::EncryptionMethod; + use pretty_assertions::assert_eq; #[test] fn test_builder() { diff --git a/src/types/encryption_method.rs b/src/types/encryption_method.rs index fb3673f..a555009 100644 --- a/src/types/encryption_method.rs +++ b/src/types/encryption_method.rs @@ -50,6 +50,7 @@ pub enum EncryptionMethod { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/types/hdcp_level.rs b/src/types/hdcp_level.rs index a268181..1d03e2a 100644 --- a/src/types/hdcp_level.rs +++ b/src/types/hdcp_level.rs @@ -17,6 +17,7 @@ pub enum HdcpLevel { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/types/in_stream_id.rs b/src/types/in_stream_id.rs index 1bd7cab..b39ce5c 100644 --- a/src/types/in_stream_id.rs +++ b/src/types/in_stream_id.rs @@ -81,6 +81,7 @@ pub enum InStreamId { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; macro_rules! gen_tests { ( $($string:expr => $enum:expr),* ) => { diff --git a/src/types/initialization_vector.rs b/src/types/initialization_vector.rs index c19bf50..971bcc9 100644 --- a/src/types/initialization_vector.rs +++ b/src/types/initialization_vector.rs @@ -66,6 +66,7 @@ impl FromStr for InitializationVector { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/types/key_format.rs b/src/types/key_format.rs index 5b534ff..3ffac49 100644 --- a/src/types/key_format.rs +++ b/src/types/key_format.rs @@ -39,6 +39,7 @@ impl RequiredVersion for KeyFormat { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/types/key_format_versions.rs b/src/types/key_format_versions.rs index b159f8f..2b4fc95 100644 --- a/src/types/key_format_versions.rs +++ b/src/types/key_format_versions.rs @@ -97,6 +97,7 @@ impl>> From for KeyFormatVersions { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/types/media_type.rs b/src/types/media_type.rs index 52a7e57..19a999f 100644 --- a/src/types/media_type.rs +++ b/src/types/media_type.rs @@ -14,6 +14,7 @@ pub enum MediaType { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_parser() { diff --git a/src/types/protocol_version.rs b/src/types/protocol_version.rs index d81d0ed..1ea2a0e 100644 --- a/src/types/protocol_version.rs +++ b/src/types/protocol_version.rs @@ -73,6 +73,7 @@ impl Default for ProtocolVersion { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/types/signed_decimal_floating_point.rs b/src/types/signed_decimal_floating_point.rs index bb84a76..54a58e5 100644 --- a/src/types/signed_decimal_floating_point.rs +++ b/src/types/signed_decimal_floating_point.rs @@ -36,6 +36,7 @@ impl Deref for SignedDecimalFloatingPoint { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; macro_rules! test_from { ( $( $input:expr => $output:expr ),* ) => { diff --git a/src/types/stream_inf.rs b/src/types/stream_inf.rs index 076e853..d460d56 100644 --- a/src/types/stream_inf.rs +++ b/src/types/stream_inf.rs @@ -300,6 +300,7 @@ impl FromStr for StreamInf { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/types/value.rs b/src/types/value.rs index 90c1783..8c0d961 100644 --- a/src/types/value.rs +++ b/src/types/value.rs @@ -67,6 +67,7 @@ impl From<&str> for Value { #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_display() { diff --git a/src/utils.rs b/src/utils.rs index 9eb7fae..d21d9e6 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -83,6 +83,7 @@ where #[cfg(test)] mod tests { use super::*; + use pretty_assertions::assert_eq; #[test] fn test_parse_yes_or_no() { diff --git a/tests/master_playlist.rs b/tests/master_playlist.rs index 18bcf49..24d901f 100644 --- a/tests/master_playlist.rs +++ b/tests/master_playlist.rs @@ -1,6 +1,8 @@ use hls_m3u8::tags::{ExtXIFrameStreamInf, ExtXStreamInf}; use hls_m3u8::MasterPlaylist; +use pretty_assertions::assert_eq; + #[test] fn test_master_playlist() { let master_playlist = "#EXTM3U\n\