Skip to content

Commit 683d4aa

Browse files
Serial-ATASerial-ATA
committed
Tests: Update TagLib tests for new module structure
1 parent d1743c2 commit 683d4aa

19 files changed

+69
-41
lines changed

‎tests/taglib/test_aiff.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ use crate::{assert_delta, temp_file};
33

44
use std::io::Seek;
55

6+
use lofty::config::{ParseOptions, WriteOptions};
7+
use lofty::file::{AudioFile, FileType};
68
use lofty::id3::v2::Id3v2Tag;
79
use lofty::iff::aiff::{AiffCompressionType, AiffFile};
8-
use lofty::{Accessor, AudioFile, FileType, ParseOptions, Probe, WriteOptions};
10+
use lofty::probe::Probe;
11+
use lofty::tag::{Accessor, TagType};
912

1013
#[test]
1114
fn test_aiff_properties() {
@@ -66,7 +69,7 @@ fn test_save_id3v2() {
6669
tfile.set_id3v2(id3v2);
6770
file.rewind().unwrap();
6871
tfile.save_to(&mut file, WriteOptions::default()).unwrap();
69-
assert!(tfile.contains_tag_type(lofty::TagType::Id3v2));
72+
assert!(tfile.contains_tag_type(TagType::Id3v2));
7073
}
7174

7275
file.rewind().unwrap();
@@ -88,7 +91,7 @@ fn test_save_id3v2() {
8891

8992
{
9093
let tfile = AiffFile::read_from(&mut file, ParseOptions::new()).unwrap();
91-
assert!(!tfile.contains_tag_type(lofty::TagType::Id3v2));
94+
assert!(!tfile.contains_tag_type(TagType::Id3v2));
9295
}
9396
}
9497

‎tests/taglib/test_ape.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ use std::io::Seek;
55
use std::time::Duration;
66

77
use lofty::ape::{ApeFile, ApeItem, ApeTag};
8+
use lofty::config::{ParseOptions, WriteOptions};
9+
use lofty::file::{AudioFile, FileType};
810
use lofty::id3::v1::Id3v1Tag;
9-
use lofty::{Accessor, AudioFile, FileType, ItemValue, ParseOptions, Probe, TagExt, WriteOptions};
11+
use lofty::probe::Probe;
12+
use lofty::tag::{Accessor, ItemValue, TagExt};
1013

1114
fn test_399(path: &str) {
1215
let f = get_file::<ApeFile>(path);

‎tests/taglib/test_apetag.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ use crate::temp_file;
33
use std::io::Seek;
44

55
use lofty::ape::{ApeItem, ApeTag};
6+
use lofty::config::{ParseOptions, WriteOptions};
7+
use lofty::file::AudioFile;
68
use lofty::musepack::MpcFile;
7-
use lofty::{Accessor, AudioFile, ItemValue, ParseOptions, TagExt, WriteOptions};
9+
use lofty::tag::{Accessor, ItemValue, TagExt};
810

911
#[test]
1012
fn test_is_empty() {

‎tests/taglib/test_fileref.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ use crate::temp_file;
33
use std::fs::File;
44
use std::io::{Read, Seek};
55

6+
use lofty::config::{GlobalOptions, ParseOptions, WriteOptions};
67
use lofty::error::ErrorKind;
8+
use lofty::file::{AudioFile, FileType, TaggedFile, TaggedFileExt};
79
use lofty::resolve::FileResolver;
8-
use lofty::{
9-
Accessor, AudioFile, FileProperties, FileType, GlobalOptions, ParseOptions, Tag, TagExt,
10-
TagType, TaggedFile, TaggedFileExt, WriteOptions,
11-
};
10+
use lofty::tag::{Accessor, Tag, TagExt, TagType};
1211

1312
fn file_ref_save(path: &str, expected_file_type: FileType) {
1413
let path = format!("tests/taglib/data/{path}");
@@ -214,12 +213,13 @@ fn test_default_file_extensions() {
214213
// Marker test, Lofty does not replicate this API
215214
}
216215

216+
use lofty::properties::FileProperties;
217217
use rusty_fork::rusty_fork_test;
218218

219219
rusty_fork_test! {
220220
#[test]
221221
fn test_file_resolver() {
222-
lofty::apply_global_options(GlobalOptions::new().use_custom_resolvers(true));
222+
lofty::config::apply_global_options(GlobalOptions::new().use_custom_resolvers(true));
223223

224224
{
225225
let file = lofty::read_from_path("tests/taglib/data/xing.mp3").unwrap();
@@ -236,15 +236,15 @@ rusty_fork_test! {
236236
impl AudioFile for DummyResolver {
237237
type Properties = ();
238238

239-
fn read_from<R>(_: &mut R, _: ParseOptions) -> lofty::Result<Self>
239+
fn read_from<R>(_: &mut R, _: ParseOptions) -> lofty::error::Result<Self>
240240
where
241241
R: Read + Seek,
242242
Self: Sized,
243243
{
244244
Ok(Self)
245245
}
246246

247-
fn save_to(&self, _: &mut File, _: WriteOptions) -> lofty::Result<()> {
247+
fn save_to(&self, _: &mut File, _: WriteOptions) -> lofty::error::Result<()> {
248248
unimplemented!()
249249
}
250250

‎tests/taglib/test_flac.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ use crate::util::get_file;
33

44
use std::io::{Read, Seek, SeekFrom};
55

6+
use lofty::config::{ParseOptions, WriteOptions};
7+
use lofty::file::AudioFile;
68
use lofty::flac::FlacFile;
79
use lofty::id3::v2::Id3v2Tag;
810
use lofty::ogg::{OggPictureStorage, VorbisComments};
9-
use lofty::{
10-
Accessor, AudioFile, MimeType, ParseOptions, Picture, PictureInformation, PictureType, TagExt,
11-
WriteOptions,
12-
};
11+
use lofty::picture::{MimeType, Picture, PictureInformation, PictureType};
12+
use lofty::tag::{Accessor, TagExt};
1313

1414
#[test]
1515
fn test_signature() {

‎tests/taglib/test_flacpicture.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use lofty::{MimeType, ParsingMode, Picture, PictureType};
1+
use lofty::config::ParsingMode;
2+
use lofty::picture::{MimeType, Picture, PictureType};
23

34
const DATA: &[u8] = &[
45
0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x09, 0x69, 0x6D, 0x61, 0x67, 0x65, 0x2F, 0x70, 0x6E,

‎tests/taglib/test_id3v2.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ use std::borrow::Cow;
44
use std::collections::HashMap;
55
use std::io::Seek;
66

7+
use lofty::config::{ParseOptions, ParsingMode, WriteOptions};
8+
use lofty::file::AudioFile;
79
use lofty::id3::v2::{
810
AttachedPictureFrame, ChannelInformation, ChannelType, CommentFrame, Event,
911
EventTimingCodesFrame, EventType, ExtendedTextFrame, ExtendedUrlFrame, Frame, FrameFlags,
@@ -13,10 +15,9 @@ use lofty::id3::v2::{
1315
UrlLinkFrame,
1416
};
1517
use lofty::mpeg::MpegFile;
16-
use lofty::{
17-
Accessor, AudioFile, MimeType, ParseOptions, ParsingMode, Picture, PictureType, TagExt,
18-
TextEncoding, WriteOptions,
19-
};
18+
use lofty::picture::{MimeType, Picture, PictureType};
19+
use lofty::tag::{Accessor, TagExt};
20+
use lofty::TextEncoding;
2021

2122
#[test]
2223
fn test_unsynch_decode() {

‎tests/taglib/test_info.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use lofty::iff::wav::RIFFInfoList;
2-
use lofty::Accessor;
2+
use lofty::tag::Accessor;
33

44
#[test]
55
fn test_title() {

‎tests/taglib/test_mp4.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ use crate::util::get_file;
44
use std::borrow::Cow;
55
use std::io::{Read, Seek};
66

7+
use lofty::config::{ParseOptions, WriteOptions};
8+
use lofty::file::AudioFile;
79
use lofty::mp4::{Atom, AtomData, AtomIdent, Ilst, Mp4Codec, Mp4File};
8-
use lofty::{
9-
Accessor, AudioFile, MimeType, ParseOptions, Picture, PictureType, TagExt, TagType,
10-
WriteOptions,
11-
};
10+
use lofty::picture::{MimeType, Picture, PictureType};
11+
use lofty::tag::{Accessor, TagExt, TagType};
1212

1313
#[test]
1414
fn test_properties_aac() {

‎tests/taglib/test_mpc.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ use crate::util::get_file;
44
use std::io::Seek;
55

66
use lofty::ape::ApeTag;
7+
use lofty::config::{ParseOptions, WriteOptions};
8+
use lofty::file::AudioFile;
79
use lofty::id3::v1::Id3v1Tag;
810
use lofty::musepack::{MpcFile, MpcProperties};
9-
use lofty::{Accessor, AudioFile, ParseOptions, Probe, TagExt, WriteOptions};
11+
use lofty::probe::Probe;
12+
use lofty::tag::{Accessor, TagExt};
1013

1114
#[test]
1215
fn test_properties_sv8() {

‎tests/taglib/test_mpeg.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ use std::fs::File;
55
use std::io::Seek;
66

77
use lofty::ape::ApeTag;
8+
use lofty::config::{ParseOptions, WriteOptions};
9+
use lofty::file::AudioFile;
810
use lofty::id3::v1::Id3v1Tag;
911
use lofty::id3::v2::{Id3v2Tag, Id3v2Version};
1012
use lofty::mpeg::MpegFile;
11-
use lofty::{Accessor, AudioFile, ParseOptions, WriteOptions};
13+
use lofty::tag::Accessor;
1214

1315
#[test]
1416
fn test_audio_properties_xing_header_cbr() {

‎tests/taglib/test_ogaflac.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ use crate::temp_file;
22

33
use std::io::{Seek, SeekFrom};
44

5+
use lofty::config::{ParseOptions, WriteOptions};
6+
use lofty::file::AudioFile;
57
use lofty::flac::FlacFile;
68
use lofty::ogg::VorbisComments;
7-
use lofty::{Accessor, AudioFile, ParseOptions, WriteOptions};
9+
use lofty::tag::Accessor;
810

911
// TODO: We don't support FLAC in OGA (#172)
1012
#[test]

‎tests/taglib/test_ogg.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ use crate::util::get_file;
44
use std::io::{Read, Seek, SeekFrom};
55

66
use byteorder::{LittleEndian, ReadBytesExt};
7+
use lofty::config::{ParseOptions, WriteOptions};
8+
use lofty::file::AudioFile;
79
use lofty::ogg::VorbisFile;
8-
use lofty::{Accessor, AudioFile, ParseOptions, WriteOptions};
10+
use lofty::tag::Accessor;
911

1012
#[test]
1113
fn test_simple() {

‎tests/taglib/test_opus.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ use crate::util::get_file;
33

44
use std::io::Seek;
55

6+
use lofty::config::{ParseOptions, WriteOptions};
7+
use lofty::file::AudioFile;
68
use lofty::ogg::OpusFile;
7-
use lofty::{Accessor, AudioFile, ParseOptions, WriteOptions};
9+
use lofty::tag::Accessor;
810

911
#[test]
1012
fn test_audio_properties() {

‎tests/taglib/test_speex.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
use crate::temp_file;
22
use crate::util::get_file;
3+
use lofty::config::{ParseOptions, WriteOptions};
4+
use lofty::file::AudioFile;
5+
use lofty::ogg::{SpeexFile, VorbisComments};
6+
use lofty::tag::Accessor;
37

48
use std::io::Seek;
59

6-
use lofty::ogg::{SpeexFile, VorbisComments};
7-
use lofty::{Accessor, AudioFile, ParseOptions, WriteOptions};
8-
910
#[test]
1011
fn test_audio_properties() {
1112
let f = get_file::<SpeexFile>("tests/taglib/data/empty.spx");

‎tests/taglib/test_wav.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
use crate::temp_file;
22
use crate::util::get_file;
3+
use lofty::config::{ParseOptions, WriteOptions};
4+
use lofty::file::AudioFile;
35
use lofty::id3::v2::Id3v2Tag;
46
use lofty::iff::wav::{RIFFInfoList, WavFile, WavFormat};
5-
use lofty::{Accessor, AudioFile, ParseOptions, TagType, WriteOptions};
7+
use lofty::tag::{Accessor, TagType};
8+
69
use std::io::{Cursor, Read, Seek, SeekFrom};
710

811
#[test]

‎tests/taglib/test_wavpack.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ use std::fs::File;
55
use std::io::Seek;
66

77
use lofty::ape::ApeTag;
8+
use lofty::config::{ParseOptions, WriteOptions};
9+
use lofty::file::AudioFile;
810
use lofty::id3::v1::Id3v1Tag;
11+
use lofty::tag::Accessor;
912
use lofty::wavpack::WavPackFile;
10-
use lofty::{Accessor, AudioFile, ParseOptions, WriteOptions};
1113

1214
#[test]
1315
fn test_no_length_properties() {

‎tests/taglib/test_xiphcomment.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ use crate::temp_file;
22

33
use std::io::Seek;
44

5+
use lofty::config::{ParseOptions, WriteOptions};
6+
use lofty::file::AudioFile;
57
use lofty::ogg::{OggPictureStorage, VorbisComments, VorbisFile};
6-
use lofty::{
7-
Accessor, AudioFile, MimeType, ParseOptions, Picture, PictureInformation, PictureType, TagExt,
8-
WriteOptions,
9-
};
8+
use lofty::picture::{MimeType, Picture, PictureInformation, PictureType};
9+
use lofty::tag::{Accessor, TagExt};
1010

1111
#[test]
1212
fn test_year() {

‎tests/taglib/util/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use lofty::{AudioFile, ParseOptions};
1+
use lofty::config::ParseOptions;
2+
use lofty::file::AudioFile;
23
use std::fs::File;
34

45
pub fn get_file<F: AudioFile>(path: &str) -> F {

0 commit comments

Comments
 (0)