Skip to content

Commit 44c9bf9

Browse files
Serial-ATASerial-ATA
committed
Tests: Update for MimeType changes
1 parent 47fca48 commit 44c9bf9

File tree

5 files changed

+29
-26
lines changed

5 files changed

+29
-26
lines changed

‎tests/taglib/test_flac.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fn test_read_picture() {
4040
assert_eq!(info.height, 1);
4141
assert_eq!(info.color_depth, 24);
4242
assert_eq!(info.num_colors, 0);
43-
assert_eq!(pic.mime_type(), &MimeType::Png);
43+
assert_eq!(pic.mime_type(), Some(&MimeType::Png));
4444
assert_eq!(pic.description(), Some("A pixel."));
4545
assert_eq!(pic.data().len(), 150);
4646
}
@@ -57,7 +57,7 @@ fn test_add_picture() {
5757

5858
let new_pic = Picture::new_unchecked(
5959
PictureType::CoverBack,
60-
MimeType::Jpeg,
60+
Some(MimeType::Jpeg),
6161
Some(String::from("new image")),
6262
Vec::from("JPEG data"),
6363
);
@@ -85,7 +85,7 @@ fn test_add_picture() {
8585
assert_eq!(info.height, 1);
8686
assert_eq!(info.color_depth, 24);
8787
assert_eq!(info.num_colors, 0);
88-
assert_eq!(pic.mime_type(), &MimeType::Png);
88+
assert_eq!(pic.mime_type(), Some(&MimeType::Png));
8989
assert_eq!(pic.description(), Some("A pixel."));
9090
assert_eq!(pic.data().len(), 150);
9191

@@ -95,7 +95,7 @@ fn test_add_picture() {
9595
assert_eq!(info.height, 6);
9696
assert_eq!(info.color_depth, 16);
9797
assert_eq!(info.num_colors, 7);
98-
assert_eq!(pic.mime_type(), &MimeType::Jpeg);
98+
assert_eq!(pic.mime_type(), Some(&MimeType::Jpeg));
9999
assert_eq!(pic.description(), Some("new image"));
100100
assert_eq!(pic.data(), b"JPEG data");
101101
}
@@ -113,7 +113,7 @@ fn test_replace_picture() {
113113

114114
let new_pic = Picture::new_unchecked(
115115
PictureType::CoverBack,
116-
MimeType::Jpeg,
116+
Some(MimeType::Jpeg),
117117
Some(String::from("new image")),
118118
Vec::from("JPEG data"),
119119
);
@@ -142,7 +142,7 @@ fn test_replace_picture() {
142142
assert_eq!(info.height, 6);
143143
assert_eq!(info.color_depth, 16);
144144
assert_eq!(info.num_colors, 7);
145-
assert_eq!(pic.mime_type(), &MimeType::Jpeg);
145+
assert_eq!(pic.mime_type(), Some(&MimeType::Jpeg));
146146
assert_eq!(pic.description(), Some("new image"));
147147
assert_eq!(pic.data(), b"JPEG data");
148148
}
@@ -605,7 +605,7 @@ fn test_picture_stored_after_comment() {
605605

606606
let pic = Picture::new_unchecked(
607607
PictureType::CoverFront,
608-
MimeType::Png,
608+
Some(MimeType::Png),
609609
Some(String::from("blank.png")),
610610
BLANK_PNG_DATA.to_vec(),
611611
);
@@ -634,7 +634,7 @@ fn test_picture_stored_after_comment() {
634634
assert_eq!(pictures.len(), 1);
635635
assert_eq!(pictures[0].0.data(), BLANK_PNG_DATA);
636636
assert_eq!(pictures[0].0.pic_type(), PictureType::CoverFront);
637-
assert_eq!(pictures[0].0.mime_type(), &MimeType::Png);
637+
assert_eq!(pictures[0].0.mime_type(), Some(&MimeType::Png));
638638
assert_eq!(pictures[0].0.description(), Some("blank.png"));
639639
assert_eq!(pictures[0].1.width, 3);
640640
assert_eq!(pictures[0].1.height, 2);

‎tests/taglib/test_flacpicture.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fn test_parse() {
2525
assert_eq!(info.height, 1);
2626
assert_eq!(info.color_depth, 24);
2727
assert_eq!(info.num_colors, 0);
28-
assert_eq!(picture.mime_type(), &MimeType::Png);
28+
assert_eq!(picture.mime_type(), Some(&MimeType::Png));
2929
assert_eq!(picture.description(), Some("A pixel."));
3030
assert_eq!(picture.data().len(), 150);
3131
}

‎tests/taglib/test_id3v2.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,10 @@ fn test_parse_apic() {
139139
Id3v2Version::V4,
140140
)
141141
.unwrap();
142-
assert_eq!(f.picture.mime_type(), &MimeType::Unknown(String::from("m")));
142+
assert_eq!(
143+
f.picture.mime_type(),
144+
Some(&MimeType::Unknown(String::from("m")))
145+
);
143146
assert_eq!(f.picture.pic_type(), PictureType::Icon);
144147
assert_eq!(f.picture.description(), Some("d"));
145148
}
@@ -155,7 +158,7 @@ fn test_parse_apic_utf16_bom() {
155158
)
156159
.unwrap();
157160

158-
assert_eq!(f.picture.mime_type(), &MimeType::Jpeg);
161+
assert_eq!(f.picture.mime_type(), Some(&MimeType::Jpeg));
159162
assert_eq!(f.picture.pic_type(), PictureType::Other);
160163
assert_eq!(f.picture.description(), Some("cover.jpg"));
161164
assert_eq!(f.picture.data(), b"\xff\xd8\xff");
@@ -174,7 +177,7 @@ fn test_parse_apicv22() {
174177
)
175178
.unwrap();
176179

177-
assert_eq!(frame.picture.mime_type(), &MimeType::Jpeg);
180+
assert_eq!(frame.picture.mime_type(), Some(&MimeType::Jpeg));
178181
assert_eq!(frame.picture.pic_type(), PictureType::Icon);
179182
assert_eq!(frame.picture.description(), Some("d"));
180183
}
@@ -185,7 +188,7 @@ fn test_render_apic() {
185188
encoding: TextEncoding::UTF8,
186189
picture: Picture::new_unchecked(
187190
PictureType::CoverBack,
188-
MimeType::Png,
191+
Some(MimeType::Png),
189192
Some(String::from("Description")),
190193
b"PNG data".to_vec(),
191194
),
@@ -929,7 +932,7 @@ fn test_compressed_frame_with_broken_length() {
929932
_ => unreachable!(),
930933
};
931934

932-
assert_eq!(picture.mime_type(), &MimeType::Bmp);
935+
assert_eq!(picture.mime_type(), Some(&MimeType::Bmp));
933936
assert_eq!(picture.pic_type(), PictureType::Other);
934937
assert!(picture.description().is_none());
935938
assert_eq!(picture.data().len(), 86414);

‎tests/taglib/test_mp4.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,9 @@ fn test_covr_read() {
258258
};
259259

260260
assert!(covrs.next().is_none());
261-
assert_eq!(picture1.mime_type(), &MimeType::Png);
261+
assert_eq!(picture1.mime_type(), Some(&MimeType::Png));
262262
assert_eq!(picture1.data().len(), 79);
263-
assert_eq!(picture2.mime_type(), &MimeType::Jpeg);
263+
assert_eq!(picture2.mime_type(), Some(&MimeType::Jpeg));
264264
assert_eq!(picture2.data().len(), 287);
265265
}
266266

@@ -276,7 +276,7 @@ fn test_covr_write() {
276276
assert!(tag.contains(&AtomIdent::Fourcc(*b"covr")));
277277
tag.insert_picture(Picture::new_unchecked(
278278
PictureType::Other,
279-
MimeType::Png,
279+
Some(MimeType::Png),
280280
None,
281281
b"foo".to_vec(),
282282
));
@@ -300,11 +300,11 @@ fn test_covr_write() {
300300
};
301301

302302
assert!(covrs.next().is_none());
303-
assert_eq!(picture1.mime_type(), &MimeType::Png);
303+
assert_eq!(picture1.mime_type(), Some(&MimeType::Png));
304304
assert_eq!(picture1.data().len(), 79);
305-
assert_eq!(picture2.mime_type(), &MimeType::Jpeg);
305+
assert_eq!(picture2.mime_type(), Some(&MimeType::Jpeg));
306306
assert_eq!(picture2.data().len(), 287);
307-
assert_eq!(picture3.mime_type(), &MimeType::Png);
307+
assert_eq!(picture3.mime_type(), Some(&MimeType::Png));
308308
assert_eq!(picture3.data().len(), 3);
309309
}
310310
}
@@ -323,9 +323,9 @@ fn test_covr_read2() {
323323
};
324324

325325
assert!(covrs.next().is_none());
326-
assert_eq!(picture1.mime_type(), &MimeType::Png);
326+
assert_eq!(picture1.mime_type(), Some(&MimeType::Png));
327327
assert_eq!(picture1.data().len(), 79);
328-
assert_eq!(picture2.mime_type(), &MimeType::Jpeg);
328+
assert_eq!(picture2.mime_type(), Some(&MimeType::Jpeg));
329329
assert_eq!(picture2.data().len(), 287);
330330
}
331331

@@ -458,9 +458,9 @@ fn test_non_full_meta_atom() {
458458
};
459459

460460
assert!(covrs.next().is_none());
461-
assert_eq!(picture1.mime_type(), &MimeType::Png);
461+
assert_eq!(picture1.mime_type(), Some(&MimeType::Png));
462462
assert_eq!(picture1.data().len(), 79);
463-
assert_eq!(picture2.mime_type(), &MimeType::Jpeg);
463+
assert_eq!(picture2.mime_type(), Some(&MimeType::Jpeg));
464464
assert_eq!(picture2.data().len(), 287);
465465

466466
assert_eq!(tag.artist().as_deref(), Some("Test Artist!!!!"));

‎tests/taglib/test_xiphcomment.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ fn test_picture() {
115115

116116
let picture = Picture::new_unchecked(
117117
PictureType::CoverBack,
118-
MimeType::Jpeg,
118+
Some(MimeType::Jpeg),
119119
Some(String::from("new image")),
120120
b"JPEG data".to_vec(),
121121
);
@@ -140,7 +140,7 @@ fn test_picture() {
140140
assert_eq!(pictures[0].1.height, 6);
141141
assert_eq!(pictures[0].1.color_depth, 16);
142142
assert_eq!(pictures[0].1.num_colors, 7);
143-
assert_eq!(pictures[0].0.mime_type(), &MimeType::Jpeg);
143+
assert_eq!(pictures[0].0.mime_type(), Some(&MimeType::Jpeg));
144144
assert_eq!(pictures[0].0.description(), Some("new image"));
145145
assert_eq!(pictures[0].0.data(), b"JPEG data");
146146
}

0 commit comments

Comments
 (0)