From bcebaf499e7ddd669b01ced57eb313972c2c13cd Mon Sep 17 00:00:00 2001
From: Antoine Gersant <antoine.gersant@lesforges.org>
Date: Wed, 25 Nov 2020 18:02:57 -0800
Subject: [PATCH] Test cleanup

---
 src/index/metadata.rs | 36 +++++++++++++++---------------------
 src/index/test.rs     |  8 --------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/index/metadata.rs b/src/index/metadata.rs
index f5a4b88..324294b 100644
--- a/src/index/metadata.rs
+++ b/src/index/metadata.rs
@@ -317,29 +317,23 @@ fn test_read_metadata() {
 		read(Path::new("test-data/formats/sample.ape")).unwrap(),
 		sample_tags
 	);
+}
 
-	let flac_artwork_tag = SongTags {
-		has_artwork: true,
-		..flac_sample_tag
-	};
-	let mp3_artwork_tag = SongTags {
-		has_artwork: true,
-		..mp3_sample_tag
-	};
-	let m4a_artwork_tag = SongTags {
-		has_artwork: true,
-		..m4a_sample_tag
-	};
-	assert_eq!(
-		read(Path::new("test-data/artwork/sample.mp3")).unwrap(),
-		mp3_artwork_tag
+#[test]
+fn test_read_artwork() {
+	assert!(
+		read(Path::new("test-data/artwork/sample.mp3"))
+			.unwrap()
+			.has_artwork
 	);
-	assert_eq!(
-		read(Path::new("test-data/artwork/sample.flac")).unwrap(),
-		flac_artwork_tag
+	assert!(
+		read(Path::new("test-data/artwork/sample.flac"))
+			.unwrap()
+			.has_artwork
 	);
-	assert_eq!(
-		read(Path::new("test-data/artwork/sample.m4a")).unwrap(),
-		m4a_artwork_tag
+	assert!(
+		read(Path::new("test-data/artwork/sample.m4a"))
+			.unwrap()
+			.has_artwork
 	);
 }
diff --git a/src/index/test.rs b/src/index/test.rs
index 0afe2a9..0764da3 100644
--- a/src/index/test.rs
+++ b/src/index/test.rs
@@ -76,14 +76,6 @@ fn test_embedded_artwork() {
 
 	assert_eq!(songs.len(), 1);
 	let song = &songs[0];
-	assert_eq!(song.path, song_path.to_string_lossy().as_ref());
-	assert_eq!(song.track_number, Some(7));
-	assert_eq!(song.disc_number, None);
-	assert_eq!(song.title, Some("なぜ (Why?)".to_owned()));
-	assert_eq!(song.artist, Some("Tobokegao".to_owned()));
-	assert_eq!(song.album_artist, None);
-	assert_eq!(song.album, Some("Picnic".to_owned()));
-	assert_eq!(song.year, Some(2016));
 	assert_eq!(song.artwork, Some(song_path.to_string_lossy().into_owned()));
 }