Skip to content

Commit 94efe29

Browse files
committed
Tests: Run Clippy on TagLib tests
1 parent f310e35 commit 94efe29

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

lofty/tests/taglib/test_mpeg.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fn test_audio_properties_xing_header_cbr() {
1717
let f = get_file::<MpegFile>("tests/taglib/data/lame_cbr.mp3");
1818

1919
assert_eq!(f.properties().duration().as_secs(), 1887); // TODO: Off by 9
20-
assert_eq!(f.properties().duration().as_millis(), 1887164);
20+
assert_eq!(f.properties().duration().as_millis(), 1_887_164);
2121
assert_eq!(f.properties().audio_bitrate(), 64);
2222
assert_eq!(f.properties().channels(), 1);
2323
assert_eq!(f.properties().sample_rate(), 44100);
@@ -30,7 +30,7 @@ fn test_audio_properties_xing_header_vbr() {
3030
let f = get_file::<MpegFile>("tests/taglib/data/lame_vbr.mp3");
3131

3232
assert_eq!(f.properties().duration().as_secs(), 1887); // TODO: Off by 9
33-
assert_eq!(f.properties().duration().as_millis(), 1887164);
33+
assert_eq!(f.properties().duration().as_millis(), 1_887_164);
3434
assert_eq!(f.properties().audio_bitrate(), 70);
3535
assert_eq!(f.properties().channels(), 1);
3636
assert_eq!(f.properties().sample_rate(), 44100);
@@ -43,7 +43,7 @@ fn test_audio_properties_vbri_header() {
4343
let f = get_file::<MpegFile>("tests/taglib/data/rare_frames.mp3");
4444

4545
assert_eq!(f.properties().duration().as_secs(), 222); // TODO: Off by 1
46-
assert_eq!(f.properties().duration().as_millis(), 222198);
46+
assert_eq!(f.properties().duration().as_millis(), 222_198);
4747
assert_eq!(f.properties().audio_bitrate(), 233);
4848
assert_eq!(f.properties().channels(), 2);
4949
assert_eq!(f.properties().sample_rate(), 44100);
@@ -55,7 +55,7 @@ fn test_audio_properties_vbri_header() {
5555
fn test_audio_properties_no_vbr_headers() {
5656
let f = get_file::<MpegFile>("tests/taglib/data/bladeenc.mp3");
5757

58-
assert_eq!(f.properties().duration().as_secs(), 3); // Off by 1
58+
assert_eq!(f.properties().duration().as_secs(), 3);
5959
assert_eq!(f.properties().duration().as_millis(), 3553);
6060
assert_eq!(f.properties().audio_bitrate(), 64);
6161
assert_eq!(f.properties().channels(), 1);
@@ -102,7 +102,7 @@ fn test_skip_invalid_frames_3() {
102102
fn test_version_2_duration_with_xing_header() {
103103
let f = get_file::<MpegFile>("tests/taglib/data/mpeg2.mp3");
104104
assert_eq!(f.properties().duration().as_secs(), 5387); // TODO: Off by 15
105-
assert_eq!(f.properties().duration().as_millis(), 5387285);
105+
assert_eq!(f.properties().duration().as_millis(), 5_387_285);
106106
}
107107

108108
#[test]

lofty/tests/taglib/test_ogg.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ fn test_audio_properties() {
8585
assert_eq!(f.properties().sample_rate(), 44100);
8686
assert_eq!(f.properties().version(), 0);
8787
assert_eq!(f.properties().bitrate_max(), 0);
88-
assert_eq!(f.properties().bitrate_nominal(), 112000);
88+
assert_eq!(f.properties().bitrate_nominal(), 112_000);
8989
assert_eq!(f.properties().bitrate_min(), 0);
9090
}
9191

@@ -104,7 +104,7 @@ fn test_page_checksum() {
104104
f.save_to(&mut file, WriteOptions::default()).unwrap();
105105

106106
file.seek(SeekFrom::Start(0x50)).unwrap();
107-
assert_eq!(file.read_u32::<LittleEndian>().unwrap(), 0x3D3BD92D);
107+
assert_eq!(file.read_u32::<LittleEndian>().unwrap(), 0x3D3B_D92D);
108108
}
109109
file.rewind().unwrap();
110110
{
@@ -116,7 +116,7 @@ fn test_page_checksum() {
116116
f.save_to(&mut file, WriteOptions::default()).unwrap();
117117

118118
file.seek(SeekFrom::Start(0x50)).unwrap();
119-
assert_eq!(file.read_u32::<LittleEndian>().unwrap(), 0xD985291C);
119+
assert_eq!(file.read_u32::<LittleEndian>().unwrap(), 0xD985_291C);
120120
}
121121
}
122122

lofty/tests/taglib/test_speex.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ fn test_split_packets() {
4242
let mut f = SpeexFile::read_from(&mut file, ParseOptions::new()).unwrap();
4343
file.rewind().unwrap();
4444

45-
assert_eq!(file.metadata().unwrap().len(), 156330);
45+
assert_eq!(file.metadata().unwrap().len(), 156_330);
4646
assert_eq!(f.vorbis_comments().title().as_deref(), Some(text.as_str()));
4747

4848
// NOTE: TagLib exposes the packets and page headers through `Speex::File`.
4949
// Lofty does not keep this information around, so we just double check with `ogg_pager`.
5050
let packets = ogg_pager::Packets::read(&mut file).unwrap();
5151
assert_eq!(packets.get(0).unwrap().len(), 80);
52-
assert_eq!(packets.get(1).unwrap().len(), 131116);
52+
assert_eq!(packets.get(1).unwrap().len(), 131_116);
5353
assert_eq!(packets.get(2).unwrap().len(), 93);
5454
assert_eq!(packets.get(3).unwrap().len(), 93);
5555

lofty/tests/taglib/test_wavpack.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn test_no_length_properties() {
1919
assert_eq!(f.properties().audio_bitrate(), 1);
2020
assert_eq!(f.properties().channels(), 2);
2121
assert_eq!(f.properties().bit_depth(), 16);
22-
assert_eq!(f.properties().is_lossless(), true);
22+
assert!(f.properties().is_lossless());
2323
assert_eq!(f.properties().sample_rate(), 44100);
2424
// TODO: CPPUNIT_ASSERT_EQUAL(163392U, f.audioProperties()->sampleFrames());
2525
assert_eq!(f.properties().version(), 1031);
@@ -42,8 +42,8 @@ fn test_dsd_stereo_properties() {
4242
assert_eq!(f.properties().audio_bitrate(), 2096);
4343
assert_eq!(f.properties().channels(), 2);
4444
assert_eq!(f.properties().bit_depth(), 8);
45-
assert_eq!(f.properties().is_lossless(), true);
46-
assert_eq!(f.properties().sample_rate(), 352800);
45+
assert!(f.properties().is_lossless());
46+
assert_eq!(f.properties().sample_rate(), 352_800);
4747
// TODO: CPPUNIT_ASSERT_EQUAL(70560U, f.audioProperties()->sampleFrames());
4848
assert_eq!(f.properties().version(), 1040);
4949
}
@@ -56,7 +56,7 @@ fn test_non_standard_rate_properties() {
5656
assert_eq!(f.properties().audio_bitrate(), 0);
5757
assert_eq!(f.properties().channels(), 2);
5858
assert_eq!(f.properties().bit_depth(), 16);
59-
assert_eq!(f.properties().is_lossless(), true);
59+
assert!(f.properties().is_lossless());
6060
assert_eq!(f.properties().sample_rate(), 1000);
6161
// TODO: CPPUNIT_ASSERT_EQUAL(3675U, f.audioProperties()->sampleFrames());
6262
assert_eq!(f.properties().version(), 1040);
@@ -70,7 +70,7 @@ fn test_tagged_properties() {
7070
assert_eq!(f.properties().audio_bitrate(), 172);
7171
assert_eq!(f.properties().channels(), 2);
7272
assert_eq!(f.properties().bit_depth(), 16);
73-
assert_eq!(f.properties().is_lossless(), false);
73+
assert!(!f.properties().is_lossless());
7474
assert_eq!(f.properties().sample_rate(), 44100);
7575
// TODO: CPPUNIT_ASSERT_EQUAL(156556U, f.audioProperties()->sampleFrames());
7676
assert_eq!(f.properties().version(), 1031);

0 commit comments

Comments
 (0)