Skip to content

Commit 069b7bf

Browse files
Serial-ATASerial-ATA
committed
Tests: Switch to test_log
We have really good debug/trace logs now. Having them available for test failures is a huge help.
1 parent e54a0ab commit 069b7bf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+415
-408
lines changed

‎lofty/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ hound = { git = "https://github.com/ruuda/hound.git", rev = "02e66effb33683d
3636
# tag_writer example
3737
structopt = { version = "0.3.26", default-features = false }
3838
tempfile = "3.10.1"
39+
test-log = "0.2.16"
3940
iai-callgrind = "0.12.0"
4041

4142
[lints]

‎lofty/src/ape/tag/mod.rs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ mod tests {
572572
use crate::picture::{MimeType, Picture, PictureType};
573573
use std::io::Cursor;
574574

575-
#[test]
575+
#[test_log::test]
576576
fn parse_ape() {
577577
let mut expected_tag = ApeTag::default();
578578

@@ -636,7 +636,7 @@ mod tests {
636636
}
637637
}
638638

639-
#[test]
639+
#[test_log::test]
640640
fn ape_re_read() {
641641
let tag_bytes = crate::tag::utils::test_utils::read_path("tests/tags/assets/test.apev2");
642642
let mut reader = Cursor::new(tag_bytes);
@@ -664,7 +664,7 @@ mod tests {
664664
assert_eq!(parsed_tag, temp_parsed_tag);
665665
}
666666

667-
#[test]
667+
#[test_log::test]
668668
fn ape_to_tag() {
669669
let tag_bytes = crate::tag::utils::test_utils::read_path("tests/tags/assets/test.apev2");
670670
let mut reader = Cursor::new(tag_bytes);
@@ -680,7 +680,7 @@ mod tests {
680680
crate::tag::utils::test_utils::verify_tag(&tag, true, true);
681681
}
682682

683-
#[test]
683+
#[test_log::test]
684684
fn tag_to_ape() {
685685
fn verify_key(tag: &ApeTag, key: &str, expected_val: &str) {
686686
assert_eq!(
@@ -701,7 +701,7 @@ mod tests {
701701
verify_key(&ape_tag, "Genre", "Classical");
702702
}
703703

704-
#[test]
704+
#[test_log::test]
705705
fn set_track() {
706706
let mut ape = ApeTag::default();
707707
let track = 1;
@@ -712,7 +712,7 @@ mod tests {
712712
assert!(ape.track_total().is_none());
713713
}
714714

715-
#[test]
715+
#[test_log::test]
716716
fn set_track_total() {
717717
let mut ape = ApeTag::default();
718718
let track_total = 2;
@@ -723,7 +723,7 @@ mod tests {
723723
assert_eq!(ape.track_total().unwrap(), track_total);
724724
}
725725

726-
#[test]
726+
#[test_log::test]
727727
fn set_track_and_track_total() {
728728
let mut ape = ApeTag::default();
729729
let track = 1;
@@ -736,7 +736,7 @@ mod tests {
736736
assert_eq!(ape.track_total().unwrap(), track_total);
737737
}
738738

739-
#[test]
739+
#[test_log::test]
740740
fn set_track_total_and_track() {
741741
let mut ape = ApeTag::default();
742742
let track_total = 2;
@@ -749,7 +749,7 @@ mod tests {
749749
assert_eq!(ape.track().unwrap(), track);
750750
}
751751

752-
#[test]
752+
#[test_log::test]
753753
fn set_disk() {
754754
let mut ape = ApeTag::default();
755755
let disk = 1;
@@ -760,7 +760,7 @@ mod tests {
760760
assert!(ape.disk_total().is_none());
761761
}
762762

763-
#[test]
763+
#[test_log::test]
764764
fn set_disk_total() {
765765
let mut ape = ApeTag::default();
766766
let disk_total = 2;
@@ -771,7 +771,7 @@ mod tests {
771771
assert_eq!(ape.disk_total().unwrap(), disk_total);
772772
}
773773

774-
#[test]
774+
#[test_log::test]
775775
fn set_disk_and_disk_total() {
776776
let mut ape = ApeTag::default();
777777
let disk = 1;
@@ -784,7 +784,7 @@ mod tests {
784784
assert_eq!(ape.disk_total().unwrap(), disk_total);
785785
}
786786

787-
#[test]
787+
#[test_log::test]
788788
fn set_disk_total_and_disk() {
789789
let mut ape = ApeTag::default();
790790
let disk_total = 2;
@@ -797,7 +797,7 @@ mod tests {
797797
assert_eq!(ape.disk().unwrap(), disk);
798798
}
799799

800-
#[test]
800+
#[test_log::test]
801801
fn track_number_tag_to_ape() {
802802
let track_number = 1;
803803

@@ -814,7 +814,7 @@ mod tests {
814814
assert!(tag.track_total().is_none());
815815
}
816816

817-
#[test]
817+
#[test_log::test]
818818
fn track_total_tag_to_ape() {
819819
let track_total = 2;
820820

@@ -831,7 +831,7 @@ mod tests {
831831
assert_eq!(tag.track_total().unwrap(), track_total);
832832
}
833833

834-
#[test]
834+
#[test_log::test]
835835
fn track_number_and_track_total_tag_to_ape() {
836836
let track_number = 1;
837837
let track_total = 2;
@@ -854,7 +854,7 @@ mod tests {
854854
assert_eq!(tag.track_total().unwrap(), track_total);
855855
}
856856

857-
#[test]
857+
#[test_log::test]
858858
fn disk_number_tag_to_ape() {
859859
let disk_number = 1;
860860

@@ -871,7 +871,7 @@ mod tests {
871871
assert!(tag.disk_total().is_none());
872872
}
873873

874-
#[test]
874+
#[test_log::test]
875875
fn disk_total_tag_to_ape() {
876876
let disk_total = 2;
877877

@@ -888,7 +888,7 @@ mod tests {
888888
assert_eq!(tag.disk_total().unwrap(), disk_total);
889889
}
890890

891-
#[test]
891+
#[test_log::test]
892892
fn disk_number_and_disk_total_tag_to_ape() {
893893
let disk_number = 1;
894894
let disk_total = 2;
@@ -911,7 +911,7 @@ mod tests {
911911
assert_eq!(tag.disk_total().unwrap(), disk_total);
912912
}
913913

914-
#[test]
914+
#[test_log::test]
915915
fn skip_reading_cover_art() {
916916
let p = Picture::new_unchecked(
917917
PictureType::CoverFront,

‎lofty/src/id3/v1/tag.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ mod tests {
463463
use crate::prelude::*;
464464
use crate::tag::{Tag, TagType};
465465

466-
#[test]
466+
#[test_log::test]
467467
fn parse_id3v1() {
468468
let expected_tag = Id3v1Tag {
469469
title: Some(String::from("Foo title")),
@@ -481,7 +481,7 @@ mod tests {
481481
assert_eq!(expected_tag, parsed_tag);
482482
}
483483

484-
#[test]
484+
#[test_log::test]
485485
fn id3v2_re_read() {
486486
let tag = crate::tag::utils::test_utils::read_path("tests/tags/assets/test.id3v1");
487487
let parsed_tag = crate::id3::v1::read::parse_id3v1(tag.try_into().unwrap());
@@ -496,7 +496,7 @@ mod tests {
496496
assert_eq!(parsed_tag, temp_parsed_tag);
497497
}
498498

499-
#[test]
499+
#[test_log::test]
500500
fn id3v1_to_tag() {
501501
let tag_bytes = crate::tag::utils::test_utils::read_path("tests/tags/assets/test.id3v1");
502502
let id3v1 = crate::id3::v1::read::parse_id3v1(tag_bytes.try_into().unwrap());
@@ -506,7 +506,7 @@ mod tests {
506506
crate::tag::utils::test_utils::verify_tag(&tag, true, true);
507507
}
508508

509-
#[test]
509+
#[test_log::test]
510510
fn tag_to_id3v1() {
511511
let tag = crate::tag::utils::test_utils::create_tag(TagType::Id3v1);
512512

‎lofty/src/id3/v2/items/audio_text_frame.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ mod tests {
250250
}
251251
}
252252

253-
#[test]
253+
#[test_log::test]
254254
fn atxt_decode() {
255255
let expected = expected();
256256

@@ -261,7 +261,7 @@ mod tests {
261261
assert_eq!(parsed_atxt, expected);
262262
}
263263

264-
#[test]
264+
#[test_log::test]
265265
fn atxt_encode() {
266266
let to_encode = expected();
267267

‎lofty/src/id3/v2/items/encapsulated_object.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ mod tests {
144144
}
145145
}
146146

147-
#[test]
147+
#[test_log::test]
148148
fn geob_decode() {
149149
let expected = expected();
150150

@@ -155,7 +155,7 @@ mod tests {
155155
assert_eq!(parsed_geob, expected);
156156
}
157157

158-
#[test]
158+
#[test_log::test]
159159
fn geob_encode() {
160160
let to_encode = expected();
161161

‎lofty/src/id3/v2/items/event_timing_codes_frame.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ mod tests {
307307
}
308308
}
309309

310-
#[test]
310+
#[test_log::test]
311311
fn etco_decode() {
312312
let cont = crate::tag::utils::test_utils::read_path("tests/tags/assets/id3v2/test.etco");
313313

@@ -318,7 +318,7 @@ mod tests {
318318
assert_eq!(parsed_etco, expected());
319319
}
320320

321-
#[test]
321+
#[test_log::test]
322322
fn etco_encode() {
323323
let encoded = expected().as_bytes();
324324

‎lofty/src/id3/v2/items/ownership_frame.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ mod tests {
153153
}
154154
}
155155

156-
#[test]
156+
#[test_log::test]
157157
fn owne_decode() {
158158
let cont = crate::tag::utils::test_utils::read_path("tests/tags/assets/id3v2/test.owne");
159159

@@ -164,7 +164,7 @@ mod tests {
164164
assert_eq!(parsed_owne, expected());
165165
}
166166

167-
#[test]
167+
#[test_log::test]
168168
fn owne_encode() {
169169
let encoded = expected().as_bytes(false).unwrap();
170170

‎lofty/src/id3/v2/items/popularimeter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ mod tests {
167167
assert_eq!(popm_bytes[email.len() + 2..].len(), counter_len);
168168
}
169169

170-
#[test]
170+
#[test_log::test]
171171
fn write_popm() {
172172
let popm_u32_boundary = PopularimeterFrame {
173173
header: FrameHeader::new(super::FRAME_ID, FrameFlags::default()),

‎lofty/src/id3/v2/items/private_frame.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ mod tests {
113113
}
114114
}
115115

116-
#[test]
116+
#[test_log::test]
117117
fn priv_decode() {
118118
let cont = crate::tag::utils::test_utils::read_path("tests/tags/assets/id3v2/test.priv");
119119

@@ -124,7 +124,7 @@ mod tests {
124124
assert_eq!(parsed_priv, expected());
125125
}
126126

127-
#[test]
127+
#[test_log::test]
128128
fn priv_encode() {
129129
let encoded = expected().as_bytes().unwrap();
130130

‎lofty/src/id3/v2/items/relative_volume_adjustment_frame.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ mod tests {
286286
}
287287
}
288288

289-
#[test]
289+
#[test_log::test]
290290
fn rva2_decode() {
291291
let cont = crate::tag::utils::test_utils::read_path("tests/tags/assets/id3v2/test.rva2");
292292

@@ -301,7 +301,7 @@ mod tests {
301301
assert_eq!(parsed_rva2, expected());
302302
}
303303

304-
#[test]
304+
#[test_log::test]
305305
#[allow(unstable_name_collisions)]
306306
fn rva2_encode() {
307307
let encoded = expected().as_bytes();

0 commit comments

Comments
 (0)