Tests: Update Taglib tests for new type names

Serial-ATA · Apr 22, 2023 · e7604fe · e7604fe
1 parent dc8d400
commit e7604fe
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 55 deletions.
diff --git a/tests/taglib/test_aiff.rs b/tests/taglib/test_aiff.rs
@@ -10,7 +10,7 @@ use crate::{assert_delta, temp_file};
 fn test_aiff_properties() {
 	let file = lofty::read_from_path("tests/taglib/data/empty.aiff").unwrap();
 
-	assert_eq!(file.file_type(), FileType::AIFF);
+	assert_eq!(file.file_type(), FileType::Aiff);
 
 	let properties = file.properties();
 	assert_eq!(properties.duration().as_secs(), 0);
@@ -29,7 +29,7 @@ fn test_aiff_properties() {
 fn test_aifc_properties() {
 	let file = lofty::read_from_path("tests/taglib/data/alaw.aifc").unwrap();
 
-	assert_eq!(file.file_type(), FileType::AIFF);
+	assert_eq!(file.file_type(), FileType::Aiff);
 
 	let properties = file.properties();
 	assert_eq!(properties.duration().as_secs(), 0);
@@ -53,42 +53,42 @@ fn test_save_id3v2() {
 	{
 		let mut tfile = lofty::read_from(&mut file).unwrap();
 
-		assert_eq!(tfile.file_type(), FileType::AIFF);
+		assert_eq!(tfile.file_type(), FileType::Aiff);
 
-		assert!(tfile.tag(lofty::TagType::ID3v2).is_none());
+		assert!(tfile.tag(lofty::TagType::Id3v2).is_none());
 
-		let mut tag = lofty::Tag::new(lofty::TagType::ID3v2);
+		let mut tag = lofty::Tag::new(lofty::TagType::Id3v2);
 		tag.set_title("TitleXXX".to_string());
 		tfile.insert_tag(tag);
 		file.rewind().unwrap();
 		tfile.save_to(&mut file).unwrap();
-		assert!(tfile.contains_tag_type(lofty::TagType::ID3v2));
+		assert!(tfile.contains_tag_type(lofty::TagType::Id3v2));
 	}
 
 	file.rewind().unwrap();
 
 	{
 		let mut tfile = lofty::read_from(&mut file).unwrap();
 
-		assert_eq!(tfile.file_type(), FileType::AIFF);
+		assert_eq!(tfile.file_type(), FileType::Aiff);
 
-		let mut tag = tfile.tag(lofty::TagType::ID3v2).unwrap().to_owned();
+		let mut tag = tfile.tag(lofty::TagType::Id3v2).unwrap().to_owned();
 		assert_eq!(tag.title().as_deref(), Some("TitleXXX"));
 		tag.set_title("".to_string());
 		tfile.insert_tag(tag);
 		file.rewind().unwrap();
 		tfile.save_to(&mut file).unwrap();
-		assert!(!tfile.contains_tag_type(lofty::TagType::ID3v2));
+		assert!(!tfile.contains_tag_type(lofty::TagType::Id3v2));
 	}
 
 	file.rewind().unwrap();
 
 	{
 		let tfile = lofty::read_from(&mut file).unwrap();
 
-		assert_eq!(tfile.file_type(), FileType::AIFF);
+		assert_eq!(tfile.file_type(), FileType::Aiff);
 
-		assert!(!tfile.contains_tag_type(lofty::TagType::ID3v2));
+		assert!(!tfile.contains_tag_type(lofty::TagType::Id3v2));
 	}
 }
 
@@ -100,7 +100,7 @@ fn test_save_id3v2() {
 fn test_fuzzed_file1() {
 	assert_eq!(
 		get_filetype("tests/taglib/data/segfault.aif"),
-		FileType::AIFF
+		FileType::Aiff
 	);
 }
 

diff --git a/tests/taglib/test_ape.rs b/tests/taglib/test_ape.rs
@@ -80,13 +80,13 @@ fn test_properties_390() {
 fn test_fuzzed_file_1() {
 	assert_eq!(
 		get_filetype("tests/taglib/data/longloop.ape"),
-		FileType::APE
+		FileType::Ape
 	);
 }
 
 #[test]
 fn test_fuzzed_file_2() {
-	assert_eq!(get_filetype("tests/taglib/data/zerodiv.ape"), FileType::APE);
+	assert_eq!(get_filetype("tests/taglib/data/zerodiv.ape"), FileType::Ape);
 }
 
 #[test]

diff --git a/tests/taglib/test_fileref.rs b/tests/taglib/test_fileref.rs
@@ -103,12 +103,12 @@ fn test_speex() {
 
 #[test]
 fn test_flac() {
-	file_ref_save("no-tags.flac", FileType::FLAC);
+	file_ref_save("no-tags.flac", FileType::Flac);
 }
 
 #[test]
 fn test_mp3() {
-	file_ref_save("xing.mp3", FileType::MPEG);
+	file_ref_save("xing.mp3", FileType::Mpeg);
 }
 
 #[test]
@@ -120,35 +120,35 @@ fn test_true_audio() {
 
 #[test]
 fn test_mp4_1() {
-	file_ref_save("has-tags.m4a", FileType::MP4);
+	file_ref_save("has-tags.m4a", FileType::Mp4);
 }
 
 #[test]
 #[ignore] // TODO: The file has a malformed `free` atom. How does TagLib handle this? Currently we mess up entirely and just write a duplicate tag.
 fn test_mp4_2() {
-	file_ref_save("no-tags.m4a", FileType::MP4);
+	file_ref_save("no-tags.m4a", FileType::Mp4);
 }
 
 #[test]
 #[ignore] // TODO: We are able to write the first tag and even reread, but the second save causes a `SizeMismatch`.
 fn test_mp4_3() {
-	file_ref_save("no-tags.3g2", FileType::MP4);
+	file_ref_save("no-tags.3g2", FileType::Mp4);
 }
 
 #[test]
 fn test_mp4_4() {
-	file_ref_save("blank_video.m4v", FileType::MP4);
+	file_ref_save("blank_video.m4v", FileType::Mp4);
 }
 
 #[test]
 fn test_wav() {
-	file_ref_save("empty.wav", FileType::WAV);
+	file_ref_save("empty.wav", FileType::Wav);
 }
 
 #[test]
 #[ignore] // TODO: We don't yet support FLAC in oga
 fn test_oga_flac() {
-	file_ref_save("empty_flac.oga", FileType::FLAC);
+	file_ref_save("empty_flac.oga", FileType::Flac);
 }
 
 #[test]
@@ -158,17 +158,17 @@ fn test_oga_vorbis() {
 
 #[test]
 fn test_ape() {
-	file_ref_save("mac-399.ape", FileType::APE);
+	file_ref_save("mac-399.ape", FileType::Ape);
 }
 
 #[test]
 fn test_aiff_1() {
-	file_ref_save("empty.aiff", FileType::AIFF);
+	file_ref_save("empty.aiff", FileType::Aiff);
 }
 
 #[test]
 fn test_aiff_2() {
-	file_ref_save("alaw.aifc", FileType::AIFF);
+	file_ref_save("alaw.aifc", FileType::Aiff);
 }
 
 #[test]
@@ -222,7 +222,7 @@ fn test_default_file_extensions() {
 fn test_file_resolver() {
 	{
 		let file = lofty::read_from_path("tests/taglib/data/xing.mp3").unwrap();
-		assert_eq!(file.file_type(), FileType::MPEG);
+		assert_eq!(file.file_type(), FileType::Mpeg);
 	}
 
 	struct DummyResolver;

diff --git a/tests/taglib/test_id3v1.rs b/tests/taglib/test_id3v1.rs
@@ -3,15 +3,15 @@ use crate::temp_file;
 use std::io::Seek;
 
 use lofty::id3::v1::{ID3v1Tag, GENRES};
-use lofty::mpeg::MPEGFile;
+use lofty::mpeg::MpegFile;
 use lofty::{Accessor, AudioFile, ParseOptions};
 
 #[test]
 #[ignore] // TODO: We probably should be stripping whitespace
 fn test_strip_whitespace() {
 	let mut file = temp_file!("tests/taglib/data/xing.mp3");
 	{
-		let mut f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+		let mut f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 		file.rewind().unwrap();
 
 		let mut tag = ID3v1Tag::default();
@@ -21,7 +21,7 @@ fn test_strip_whitespace() {
 	}
 	file.rewind().unwrap();
 	{
-		let f = MPEGFile::read_from(&mut file, ParseOptions::new()).unwrap();
+		let f = MpegFile::read_from(&mut file, ParseOptions::new()).unwrap();
 		assert_eq!(f.id3v1().unwrap().artist().as_deref(), Some("Artist"));
 	}
 }

diff --git a/tests/taglib/test_mp4.rs b/tests/taglib/test_mp4.rs
@@ -420,7 +420,7 @@ fn test_remove_metadata() {
 
 		assert!(f.ilst().is_some());
 		assert!(!f.ilst().unwrap().is_empty());
-		TagType::MP4ilst.remove_from(&mut file).unwrap();
+		TagType::Mp4Ilst.remove_from(&mut file).unwrap();
 	}
 	file.rewind().unwrap();
 	{