mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2026-06-14 10:19:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use a standard type rather than TagLib::uint.

Browse Source 
This won't break the ABI compatibility.
This commit is contained in:
Tsuda Kageyu
2015-12-03 01:50:44 +09:00
parent 085a0ef298
commit a0b8683656
131 changed files with 775 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test_apetag.cpp
View File

@@ -78,7 +78,7 @@ public:
APE::Item item3 = APE::Item("TRACKNUMBER", "29");
tag.setItem("TRACKNUMBER", item3);
properties = tag.properties();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), properties["TRACKNUMBER"].size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, properties["TRACKNUMBER"].size());
CPPUNIT_ASSERT_EQUAL(String("17"), properties["TRACKNUMBER"][0]);
CPPUNIT_ASSERT_EQUAL(String("29"), properties["TRACKNUMBER"][1]);
@@ -94,7 +94,7 @@ public:
APE::Tag tag;
PropertyMap unsuccessful = tag.setProperties(properties);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), unsuccessful.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, unsuccessful.size());
CPPUNIT_ASSERT(unsuccessful.contains("A"));
CPPUNIT_ASSERT(unsuccessful.contains("MP+"));
}

8
tests/test_asf.cpp
View File

@@ -105,7 +105,7 @@ public:
CPPUNIT_ASSERT(f.tag()->contains("WM/TrackNumber"));
CPPUNIT_ASSERT_EQUAL(ASF::Attribute::DWordType,
f.tag()->attribute("WM/TrackNumber").front().type());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(123), f.tag()->track());
CPPUNIT_ASSERT_EQUAL((unsigned int)123, f.tag()->track());
f.tag()->setTrack(234);
f.save();
}
@@ -114,7 +114,7 @@ public:
CPPUNIT_ASSERT(f.tag()->contains("WM/TrackNumber"));
CPPUNIT_ASSERT_EQUAL(ASF::Attribute::UnicodeType,
f.tag()->attribute("WM/TrackNumber").front().type());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(234), f.tag()->track());
CPPUNIT_ASSERT_EQUAL((unsigned int)234, f.tag()->track());
}
}
@@ -193,7 +193,7 @@ public:
{
ASF::File f(newname.c_str());
ASF::AttributeList values2 = f.tag()->attribute("WM/Picture");
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), values2.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)1, values2.size());
ASF::Attribute attr2 = values2.front();
ASF::Picture picture2 = attr2.toPicture();
CPPUNIT_ASSERT(picture2.isValid());
@@ -230,7 +230,7 @@ public:
{
ASF::File f(newname.c_str());
ASF::AttributeList values2 = f.tag()->attribute("WM/Picture");
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), values2.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, values2.size());
ASF::Picture picture3 = values2[1].toPicture();
CPPUNIT_ASSERT(picture3.isValid());
CPPUNIT_ASSERT_EQUAL(String("image/jpeg"), picture3.mimeType());

18
tests/test_bytevector.cpp
View File

@@ -350,24 +350,24 @@ public:
ByteVector a = ByteVector("0123456789");
ByteVector b = a.mid(3, 4);
b.resize(6, 'A');
CPPUNIT_ASSERT_EQUAL(TagLib::uint(6), b.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)6, b.size());
CPPUNIT_ASSERT_EQUAL('6', b[3]);
CPPUNIT_ASSERT_EQUAL('A', b[4]);
CPPUNIT_ASSERT_EQUAL('A', b[5]);
b.resize(10, 'B');
CPPUNIT_ASSERT_EQUAL(TagLib::uint(10), b.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)10, b.size());
CPPUNIT_ASSERT_EQUAL('6', b[3]);
CPPUNIT_ASSERT_EQUAL('B', b[6]);
CPPUNIT_ASSERT_EQUAL('B', b[9]);
b.resize(3, 'C');
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), b.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)3, b.size());
CPPUNIT_ASSERT_EQUAL(-1, b.find('C'));
b.resize(3);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), b.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)3, b.size());
// Check if a and b were properly detached.
CPPUNIT_ASSERT_EQUAL(TagLib::uint(10), a.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)10, a.size());
CPPUNIT_ASSERT_EQUAL('3', a[3]);
CPPUNIT_ASSERT_EQUAL('5', a[5]);
@@ -375,17 +375,17 @@ public:
ByteVector c = ByteVector("0123456789").mid(3, 4);
c.resize(6, 'A');
CPPUNIT_ASSERT_EQUAL(TagLib::uint(6), c.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)6, c.size());
CPPUNIT_ASSERT_EQUAL('6', c[3]);
CPPUNIT_ASSERT_EQUAL('A', c[4]);
CPPUNIT_ASSERT_EQUAL('A', c[5]);
c.resize(10, 'B');
CPPUNIT_ASSERT_EQUAL(TagLib::uint(10), c.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)10, c.size());
CPPUNIT_ASSERT_EQUAL('6', c[3]);
CPPUNIT_ASSERT_EQUAL('B', c[6]);
CPPUNIT_ASSERT_EQUAL('B', c[9]);
c.resize(3, 'C');
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), c.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)3, c.size());
CPPUNIT_ASSERT_EQUAL(-1, c.find('C'));
}
@@ -439,7 +439,7 @@ public:
CPPUNIT_ASSERT_EQUAL(t2, ByteVector::fromBase64(s2.toBase64()));
CPPUNIT_ASSERT_EQUAL(t3, ByteVector::fromBase64(s3.toBase64()));
ByteVector all((uint)256);
ByteVector all((unsigned int)256);
// in order
{

4
tests/test_bytevectorlist.cpp
View File

@@ -19,7 +19,7 @@ public:
ByteVector v("a b");
ByteVectorList l = ByteVectorList::split(v, " ");
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), l.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, l.size());
CPPUNIT_ASSERT_EQUAL(ByteVector("a"), l[0]);
CPPUNIT_ASSERT_EQUAL(ByteVector("b"), l[1]);
}
@@ -29,7 +29,7 @@ public:
ByteVector v("a");
ByteVectorList l = ByteVectorList::split(v, " ");
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), l.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)1, l.size());
CPPUNIT_ASSERT_EQUAL(ByteVector("a"), l[0]);
}

4
tests/test_file.cpp
View File

@@ -65,7 +65,7 @@ public:
file.seek(0);
const ByteVector v = file.readBlock(file.length());
CPPUNIT_ASSERT_EQUAL((TagLib::uint)10, v.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)10, v.size());
CPPUNIT_ASSERT_EQUAL((long)v.find("23"), file.find("23"));
CPPUNIT_ASSERT_EQUAL((long)v.find("23", 2), file.find("23", 2));
@@ -93,7 +93,7 @@ public:
file.seek(0);
const ByteVector v = file.readBlock(file.length());
CPPUNIT_ASSERT_EQUAL((TagLib::uint)10, v.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)10, v.size());
CPPUNIT_ASSERT_EQUAL((long)v.rfind("23"), file.rfind("23"));
CPPUNIT_ASSERT_EQUAL((long)v.rfind("23", 7), file.rfind("23", 7));

12
tests/test_fileref.cpp
View File

@@ -71,8 +71,8 @@ public:
CPPUNIT_ASSERT_EQUAL(f.tag()->title(), String("test title"));
CPPUNIT_ASSERT_EQUAL(f.tag()->genre(), String("Test!"));
CPPUNIT_ASSERT_EQUAL(f.tag()->album(), String("albummmm"));
CPPUNIT_ASSERT_EQUAL(f.tag()->track(), TagLib::uint(5));
CPPUNIT_ASSERT_EQUAL(f.tag()->year(), TagLib::uint(2020));
CPPUNIT_ASSERT_EQUAL(f.tag()->track(), (unsigned int)5);
CPPUNIT_ASSERT_EQUAL(f.tag()->year(), (unsigned int)2020);
f.tag()->setArtist("ttest artist");
f.tag()->setTitle("ytest title");
f.tag()->setGenre("uTest!");
@@ -88,8 +88,8 @@ public:
CPPUNIT_ASSERT_EQUAL(f.tag()->title(), String("ytest title"));
CPPUNIT_ASSERT_EQUAL(f.tag()->genre(), String("uTest!"));
CPPUNIT_ASSERT_EQUAL(f.tag()->album(), String("ialbummmm"));
CPPUNIT_ASSERT_EQUAL(f.tag()->track(), TagLib::uint(7));
CPPUNIT_ASSERT_EQUAL(f.tag()->year(), TagLib::uint(2080));
CPPUNIT_ASSERT_EQUAL(f.tag()->track(), (unsigned int)7);
CPPUNIT_ASSERT_EQUAL(f.tag()->year(), (unsigned int)2080);
}
{
FileStream fs(newname.c_str());
@@ -99,8 +99,8 @@ public:
CPPUNIT_ASSERT_EQUAL(f.tag()->title(), String("ytest title"));
CPPUNIT_ASSERT_EQUAL(f.tag()->genre(), String("uTest!"));
CPPUNIT_ASSERT_EQUAL(f.tag()->album(), String("ialbummmm"));
CPPUNIT_ASSERT_EQUAL(f.tag()->track(), TagLib::uint(7));
CPPUNIT_ASSERT_EQUAL(f.tag()->year(), TagLib::uint(2080));
CPPUNIT_ASSERT_EQUAL(f.tag()->track(), (unsigned int)7);
CPPUNIT_ASSERT_EQUAL(f.tag()->year(), (unsigned int)2080);
}
}

26
tests/test_flac.cpp
View File

@@ -63,7 +63,7 @@ public:
FLAC::File f(newname.c_str());
List<FLAC::Picture *> lst = f.pictureList();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), lst.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)1, lst.size());
FLAC::Picture *pic = lst.front();
CPPUNIT_ASSERT_EQUAL(FLAC::Picture::FrontCover, pic->type());
@@ -73,7 +73,7 @@ public:
CPPUNIT_ASSERT_EQUAL(0, pic->numColors());
CPPUNIT_ASSERT_EQUAL(String("image/png"), pic->mimeType());
CPPUNIT_ASSERT_EQUAL(String("A pixel."), pic->description());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(150), pic->data().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)150, pic->data().size());
}
void testAddPicture()
@@ -84,7 +84,7 @@ public:
{
FLAC::File f(newname.c_str());
List<FLAC::Picture *> lst = f.pictureList();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), lst.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)1, lst.size());
FLAC::Picture *newpic = new FLAC::Picture();
newpic->setType(FLAC::Picture::BackCover);
@@ -101,7 +101,7 @@ public:
{
FLAC::File f(newname.c_str());
List<FLAC::Picture *> lst = f.pictureList();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), lst.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, lst.size());
FLAC::Picture *pic = lst[0];
CPPUNIT_ASSERT_EQUAL(FLAC::Picture::FrontCover, pic->type());
@@ -111,7 +111,7 @@ public:
CPPUNIT_ASSERT_EQUAL(0, pic->numColors());
CPPUNIT_ASSERT_EQUAL(String("image/png"), pic->mimeType());
CPPUNIT_ASSERT_EQUAL(String("A pixel."), pic->description());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(150), pic->data().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)150, pic->data().size());
pic = lst[1];
CPPUNIT_ASSERT_EQUAL(FLAC::Picture::BackCover, pic->type());
@@ -133,7 +133,7 @@ public:
{
FLAC::File f(newname.c_str());
List<FLAC::Picture *> lst = f.pictureList();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), lst.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)1, lst.size());
FLAC::Picture *newpic = new FLAC::Picture();
newpic->setType(FLAC::Picture::BackCover);
@@ -151,7 +151,7 @@ public:
{
FLAC::File f(newname.c_str());
List<FLAC::Picture *> lst = f.pictureList();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), lst.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)1, lst.size());
FLAC::Picture *pic = lst[0];
CPPUNIT_ASSERT_EQUAL(FLAC::Picture::BackCover, pic->type());
@@ -173,7 +173,7 @@ public:
{
FLAC::File f(newname.c_str());
List<FLAC::Picture *> lst = f.pictureList();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), lst.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)1, lst.size());
f.removePictures();
f.save();
@@ -181,7 +181,7 @@ public:
{
FLAC::File f(newname.c_str());
List<FLAC::Picture *> lst = f.pictureList();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), lst.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)0, lst.size());
}
}
@@ -220,7 +220,7 @@ public:
{
FLAC::File f(newname.c_str());
Ogg::FieldListMap m = f.xiphComment()->fieldListMap();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), m["ARTIST"].size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, m["ARTIST"].size());
CPPUNIT_ASSERT_EQUAL(String("artist 1"), m["ARTIST"][0]);
CPPUNIT_ASSERT_EQUAL(String("artist 2"), m["ARTIST"][1]);
}
@@ -243,7 +243,7 @@ public:
{
FLAC::File f(newname.c_str());
PropertyMap dict = f.properties();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), dict["ARTIST"].size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, dict["ARTIST"].size());
CPPUNIT_ASSERT_EQUAL(String("artøst 1"), dict["ARTIST"][0]);
CPPUNIT_ASSERT_EQUAL(String("artöst 2"), dict["ARTIST"][1]);
}
@@ -256,8 +256,8 @@ public:
map[L"H\x00c4\x00d6"] = String("bla");
FLAC::File f(copy.fileName().c_str());
PropertyMap invalid = f.setProperties(map);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), invalid.size());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.properties().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)1, invalid.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)0, f.properties().size());
}
void testAudioProperties()

2
tests/test_flacpicture.cpp
View File

@@ -34,7 +34,7 @@ public:
CPPUNIT_ASSERT_EQUAL(0, pic.numColors());
CPPUNIT_ASSERT_EQUAL(String("image/png"), pic.mimeType());
CPPUNIT_ASSERT_EQUAL(String("A pixel."), pic.description());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(150), pic.data().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)150, pic.data().size());
}
void testPassThrough()

78
tests/test_id3v2.cpp
View File

@@ -204,7 +204,7 @@ public:
"d\x00"
"\x00", 14);
ID3v2::AttachedPictureFrame *frame =
static_cast<TagLib::ID3v2::AttachedPictureFrame*>(factory->createFrame(data, TagLib::uint(2)));
static_cast<TagLib::ID3v2::AttachedPictureFrame*>(factory->createFrame(data, (unsigned int)2));
CPPUNIT_ASSERT(frame);
CPPUNIT_ASSERT_EQUAL(String("image/jpeg"), frame->mimeType());
@@ -225,13 +225,13 @@ public:
"d\x00"
"\x00", 14);
ID3v2::AttachedPictureFrame *frame =
static_cast<TagLib::ID3v2::AttachedPictureFrame*>(factory->createFrame(data, TagLib::uint(2)));
static_cast<TagLib::ID3v2::AttachedPictureFrame*>(factory->createFrame(data, (unsigned int)2));
CPPUNIT_ASSERT(frame);
ID3v2::Tag tag;
tag.addFrame(frame);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1034), tag.render().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)1034, tag.render().size());
}
// http://bugs.kde.org/show_bug.cgi?id=151078
@@ -260,7 +260,7 @@ public:
"\x00\x00\x00\x03", 33));
CPPUNIT_ASSERT_EQUAL(String("email@example.com"), f.email());
CPPUNIT_ASSERT_EQUAL(2, f.rating());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), f.counter());
CPPUNIT_ASSERT_EQUAL((unsigned int)3, f.counter());
}
void testParsePOPMWithoutCounter()
@@ -272,7 +272,7 @@ public:
"\x02", 29));
CPPUNIT_ASSERT_EQUAL(String("email@example.com"), f.email());
CPPUNIT_ASSERT_EQUAL(2, f.rating());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.counter());
CPPUNIT_ASSERT_EQUAL((unsigned int)0, f.counter());
}
void testRenderPOPM()
@@ -476,11 +476,11 @@ public:
CPPUNIT_ASSERT_EQUAL(ID3v2::SynchronizedLyricsFrame::Lyrics, f.type());
CPPUNIT_ASSERT_EQUAL(String("foo"), f.description());
ID3v2::SynchronizedLyricsFrame::SynchedTextList stl = f.synchedText();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), stl.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, stl.size());
CPPUNIT_ASSERT_EQUAL(String("Example"), stl[0].text);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1234), stl[0].time);
CPPUNIT_ASSERT_EQUAL((unsigned int)1234, stl[0].time);
CPPUNIT_ASSERT_EQUAL(String("Lyrics"), stl[1].text);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4567), stl[1].time);
CPPUNIT_ASSERT_EQUAL((unsigned int)4567, stl[1].time);
}
void testRenderSynchronizedLyricsFrame()
@@ -525,11 +525,11 @@ public:
CPPUNIT_ASSERT_EQUAL(ID3v2::EventTimingCodesFrame::AbsoluteMilliseconds,
f.timestampFormat());
ID3v2::EventTimingCodesFrame::SynchedEventList sel = f.synchedEvents();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), sel.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, sel.size());
CPPUNIT_ASSERT_EQUAL(ID3v2::EventTimingCodesFrame::IntroStart, sel[0].type);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(62300), sel[0].time);
CPPUNIT_ASSERT_EQUAL((unsigned int)62300, sel[0].time);
CPPUNIT_ASSERT_EQUAL(ID3v2::EventTimingCodesFrame::AudioFileEnds, sel[1].type);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3600000), sel[1].time);
CPPUNIT_ASSERT_EQUAL((unsigned int)3600000, sel[1].time);
}
void testRenderEventTimingCodesFrame()
@@ -589,8 +589,8 @@ public:
"\x00" // Encoding
"(22)Death Metal", 26); // Text
ID3v2::TextIdentificationFrame *frame =
static_cast<TagLib::ID3v2::TextIdentificationFrame*>(factory->createFrame(data, TagLib::uint(3)));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), frame->fieldList().size());
static_cast<TagLib::ID3v2::TextIdentificationFrame*>(factory->createFrame(data, (unsigned int)3));
CPPUNIT_ASSERT_EQUAL((unsigned int)1, frame->fieldList().size());
CPPUNIT_ASSERT_EQUAL(String("Death Metal"), frame->fieldList()[0]);
ID3v2::Tag tag;
@@ -608,8 +608,8 @@ public:
"\x00" // Encoding
"(4)Eurodisco", 23); // Text
ID3v2::TextIdentificationFrame *frame =
static_cast<TagLib::ID3v2::TextIdentificationFrame*>(factory->createFrame(data, TagLib::uint(3)));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), frame->fieldList().size());
static_cast<TagLib::ID3v2::TextIdentificationFrame*>(factory->createFrame(data, (unsigned int)3));
CPPUNIT_ASSERT_EQUAL((unsigned int)2, frame->fieldList().size());
CPPUNIT_ASSERT_EQUAL(String("4"), frame->fieldList()[0]);
CPPUNIT_ASSERT_EQUAL(String("Eurodisco"), frame->fieldList()[1]);
@@ -627,8 +627,8 @@ public:
"\0" // Encoding
"14\0Eurodisco", 23); // Text
ID3v2::TextIdentificationFrame *frame =
static_cast<TagLib::ID3v2::TextIdentificationFrame*>(factory->createFrame(data, TagLib::uint(4)));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), frame->fieldList().size());
static_cast<TagLib::ID3v2::TextIdentificationFrame*>(factory->createFrame(data, (unsigned int)4));
CPPUNIT_ASSERT_EQUAL((unsigned int)2, frame->fieldList().size());
CPPUNIT_ASSERT_EQUAL(String("14"), frame->fieldList()[0]);
CPPUNIT_ASSERT_EQUAL(String("Eurodisco"), frame->fieldList()[1]);
@@ -641,7 +641,7 @@ public:
{
MPEG::File f(TEST_FILE_PATH_C("id3v22-tda.mp3"), false);
CPPUNIT_ASSERT(f.tag());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2010), f.tag()->year());
CPPUNIT_ASSERT_EQUAL((unsigned int)2010, f.tag()->year());
}
void testUpdateFullDate22()
@@ -685,15 +685,15 @@ public:
MPEG::File bar(newname.c_str());
tf = static_cast<ID3v2::TextIdentificationFrame *>(bar.ID3v2Tag()->frameList("TDOR").front());
CPPUNIT_ASSERT(tf);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), tf->fieldList().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)1, tf->fieldList().size());
CPPUNIT_ASSERT_EQUAL(String("2011"), tf->fieldList().front());
tf = static_cast<ID3v2::TextIdentificationFrame *>(bar.ID3v2Tag()->frameList("TDRC").front());
CPPUNIT_ASSERT(tf);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), tf->fieldList().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)1, tf->fieldList().size());
CPPUNIT_ASSERT_EQUAL(String("2012-04-17T12:01"), tf->fieldList().front());
tf = dynamic_cast<ID3v2::TextIdentificationFrame *>(bar.ID3v2Tag()->frameList("TIPL").front());
CPPUNIT_ASSERT(tf);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(8), tf->fieldList().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)8, tf->fieldList().size());
CPPUNIT_ASSERT_EQUAL(String("Guitar"), tf->fieldList()[0]);
CPPUNIT_ASSERT_EQUAL(String("Artist 1"), tf->fieldList()[1]);
CPPUNIT_ASSERT_EQUAL(String("Drums"), tf->fieldList()[2]);
@@ -726,7 +726,7 @@ public:
CPPUNIT_ASSERT_EQUAL(String("image/bmp"), frame->mimeType());
CPPUNIT_ASSERT_EQUAL(ID3v2::AttachedPictureFrame::Other, frame->type());
CPPUNIT_ASSERT_EQUAL(String(""), frame->description());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(86414), frame->picture().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)86414, frame->picture().size());
#else
@@ -756,12 +756,12 @@ public:
string newname = copy.fileName();
MPEG::File f(newname.c_str());
PropertyMap dict = f.ID3v2Tag(false)->properties();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(6), dict.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)6, dict.size());
CPPUNIT_ASSERT(dict.contains("USERTEXTDESCRIPTION1"));
CPPUNIT_ASSERT(dict.contains("QuodLibet::USERTEXTDESCRIPTION2"));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), dict["USERTEXTDESCRIPTION1"].size());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), dict["QuodLibet::USERTEXTDESCRIPTION2"].size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, dict["USERTEXTDESCRIPTION1"].size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, dict["QuodLibet::USERTEXTDESCRIPTION2"].size());
CPPUNIT_ASSERT_EQUAL(String("userTextData1"), dict["USERTEXTDESCRIPTION1"][0]);
CPPUNIT_ASSERT_EQUAL(String("userTextData2"), dict["USERTEXTDESCRIPTION1"][1]);
CPPUNIT_ASSERT_EQUAL(String("userTextData1"), dict["QuodLibet::USERTEXTDESCRIPTION2"][0]);
@@ -912,20 +912,20 @@ public:
ID3v2::ChapterFrame f1(&header, chapterData);
CPPUNIT_ASSERT_EQUAL(ByteVector("C"), f1.elementID());
CPPUNIT_ASSERT((TagLib::uint)0x03 == f1.startTime());
CPPUNIT_ASSERT((TagLib::uint)0x05 == f1.endTime());
CPPUNIT_ASSERT((TagLib::uint)0x02 == f1.startOffset());
CPPUNIT_ASSERT((TagLib::uint)0x03 == f1.endOffset());
CPPUNIT_ASSERT((TagLib::uint)0x00 == f1.embeddedFrameList().size());
CPPUNIT_ASSERT((unsigned int)0x03 == f1.startTime());
CPPUNIT_ASSERT((unsigned int)0x05 == f1.endTime());
CPPUNIT_ASSERT((unsigned int)0x02 == f1.startOffset());
CPPUNIT_ASSERT((unsigned int)0x03 == f1.endOffset());
CPPUNIT_ASSERT((unsigned int)0x00 == f1.embeddedFrameList().size());
ID3v2::ChapterFrame f2(&header, chapterData + embeddedFrameData);
CPPUNIT_ASSERT_EQUAL(ByteVector("C"), f2.elementID());
CPPUNIT_ASSERT((TagLib::uint)0x03 == f2.startTime());
CPPUNIT_ASSERT((TagLib::uint)0x05 == f2.endTime());
CPPUNIT_ASSERT((TagLib::uint)0x02 == f2.startOffset());
CPPUNIT_ASSERT((TagLib::uint)0x03 == f2.endOffset());
CPPUNIT_ASSERT((TagLib::uint)0x01 == f2.embeddedFrameList().size());
CPPUNIT_ASSERT((unsigned int)0x03 == f2.startTime());
CPPUNIT_ASSERT((unsigned int)0x05 == f2.endTime());
CPPUNIT_ASSERT((unsigned int)0x02 == f2.startOffset());
CPPUNIT_ASSERT((unsigned int)0x03 == f2.endOffset());
CPPUNIT_ASSERT((unsigned int)0x01 == f2.embeddedFrameList().size());
CPPUNIT_ASSERT(f2.embeddedFrameList("TIT2").size() == 1);
CPPUNIT_ASSERT(f2.embeddedFrameList("TIT2")[0]->toString() == "CH1");
}
@@ -1018,10 +1018,10 @@ public:
CPPUNIT_ASSERT_EQUAL(ByteVector("T"), f.elementID());
CPPUNIT_ASSERT(!f.isTopLevel());
CPPUNIT_ASSERT(f.isOrdered());
CPPUNIT_ASSERT((TagLib::uint)0x02 == f.entryCount());
CPPUNIT_ASSERT((unsigned int)0x02 == f.entryCount());
CPPUNIT_ASSERT_EQUAL(ByteVector("C"), f.childElements()[0]);
CPPUNIT_ASSERT_EQUAL(ByteVector("D"), f.childElements()[1]);
CPPUNIT_ASSERT((TagLib::uint)0x01 == f.embeddedFrameList().size());
CPPUNIT_ASSERT((unsigned int)0x01 == f.embeddedFrameList().size());
CPPUNIT_ASSERT(f.embeddedFrameList("TIT2").size() == 1);
CPPUNIT_ASSERT(f.embeddedFrameList("TIT2")[0]->toString() == "TC1");
}
@@ -1132,7 +1132,7 @@ public:
// Sample rate will be 32000 if we can't skip the second tag.
CPPUNIT_ASSERT(f.hasID3v2Tag());
CPPUNIT_ASSERT_EQUAL((TagLib::uint)8049, f.ID3v2Tag()->header()->completeTagSize());
CPPUNIT_ASSERT_EQUAL((unsigned int)8049, f.ID3v2Tag()->header()->completeTagSize());
CPPUNIT_ASSERT_EQUAL(44100, f.audioProperties()->sampleRate());
@@ -1143,7 +1143,7 @@ public:
MPEG::File f(copy.fileName().c_str());
CPPUNIT_ASSERT(f.hasID3v2Tag());
CPPUNIT_ASSERT_EQUAL((long)3594, f.length());
CPPUNIT_ASSERT_EQUAL((TagLib::uint)1505, f.ID3v2Tag()->header()->completeTagSize());
CPPUNIT_ASSERT_EQUAL((unsigned int)1505, f.ID3v2Tag()->header()->completeTagSize());
CPPUNIT_ASSERT_EQUAL(String("Artist A"), f.ID3v2Tag()->artist());
CPPUNIT_ASSERT_EQUAL(44100, f.audioProperties()->sampleRate());

10
tests/test_info.cpp
View File

@@ -24,7 +24,7 @@ public:
tag.setFieldText("TEST", "Dummy Text");
CPPUNIT_ASSERT_EQUAL(String("Test title 1"), tag.title());
RIFF::Info::FieldListMap map = tag.fieldListMap();
CPPUNIT_ASSERT_EQUAL(String("Test title 1"), map["INAM"]);
CPPUNIT_ASSERT_EQUAL(String("Dummy Text"), map["TEST"]);
@@ -34,14 +34,14 @@ public:
{
RIFF::Info::Tag tag;
CPPUNIT_ASSERT_EQUAL((TagLib::uint)0, tag.track());
CPPUNIT_ASSERT_EQUAL((unsigned int)0, tag.track());
tag.setTrack(1234);
CPPUNIT_ASSERT_EQUAL((TagLib::uint)1234, tag.track());
CPPUNIT_ASSERT_EQUAL((unsigned int)1234, tag.track());
CPPUNIT_ASSERT_EQUAL(String("1234"), tag.fieldText("IPRT"));
CPPUNIT_ASSERT_EQUAL((TagLib::uint)0, tag.year());
CPPUNIT_ASSERT_EQUAL((unsigned int)0, tag.year());
tag.setYear(1234);
CPPUNIT_ASSERT_EQUAL((TagLib::uint)1234, tag.year());
CPPUNIT_ASSERT_EQUAL((unsigned int)1234, tag.year());
CPPUNIT_ASSERT_EQUAL(String("1234"), tag.fieldText("ICRD"));
}
};

1
tests/test_it.cpp
View File

@@ -26,7 +26,6 @@
using namespace std;
using namespace TagLib;
using TagLib::uint;
static const String titleBefore("test song name");
static const String titleAfter("changed title");

20
tests/test_mp4.cpp
View File

@@ -249,11 +249,11 @@ public:
MP4::File f(TEST_FILE_PATH_C("has-tags.m4a"));
CPPUNIT_ASSERT(f.tag()->contains("covr"));
MP4::CoverArtList l = f.tag()->item("covr").toCoverArtList();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), l.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, l.size());
CPPUNIT_ASSERT_EQUAL(MP4::CoverArt::PNG, l[0].format());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(79), l[0].data().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)79, l[0].data().size());
CPPUNIT_ASSERT_EQUAL(MP4::CoverArt::JPEG, l[1].format());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(287), l[1].data().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)287, l[1].data().size());
}
void testCovrWrite()
@@ -273,13 +273,13 @@ public:
MP4::File f(filename.c_str());
CPPUNIT_ASSERT(f.tag()->contains("covr"));
MP4::CoverArtList l = f.tag()->item("covr").toCoverArtList();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), l.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)3, l.size());
CPPUNIT_ASSERT_EQUAL(MP4::CoverArt::PNG, l[0].format());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(79), l[0].data().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)79, l[0].data().size());
CPPUNIT_ASSERT_EQUAL(MP4::CoverArt::JPEG, l[1].format());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(287), l[1].data().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)287, l[1].data().size());
CPPUNIT_ASSERT_EQUAL(MP4::CoverArt::PNG, l[2].format());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), l[2].data().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)3, l[2].data().size());
}
}
@@ -288,11 +288,11 @@ public:
MP4::File f(TEST_FILE_PATH_C("covr-junk.m4a"));
CPPUNIT_ASSERT(f.tag()->contains("covr"));
MP4::CoverArtList l = f.tag()->item("covr").toCoverArtList();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), l.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, l.size());
CPPUNIT_ASSERT_EQUAL(MP4::CoverArt::PNG, l[0].format());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(79), l[0].data().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)79, l[0].data().size());
CPPUNIT_ASSERT_EQUAL(MP4::CoverArt::JPEG, l[1].format());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(287), l[1].data().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)287, l[1].data().size());
}
void testProperties()

6
tests/test_mpeg.cpp
View File

@@ -128,7 +128,7 @@ public:
}
{
MPEG::File f2(newname.c_str());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f2.ID3v2Tag()->header()->majorVersion());
CPPUNIT_ASSERT_EQUAL((unsigned int)4, f2.ID3v2Tag()->header()->majorVersion());
CPPUNIT_ASSERT_EQUAL(String("Artist A"), f2.tag()->artist());
CPPUNIT_ASSERT_EQUAL(xxx, f2.tag()->title());
}
@@ -148,7 +148,7 @@ public:
}
{
MPEG::File f2(newname.c_str());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f2.ID3v2Tag()->header()->majorVersion());
CPPUNIT_ASSERT_EQUAL((unsigned int)4, f2.ID3v2Tag()->header()->majorVersion());
CPPUNIT_ASSERT_EQUAL(String("Artist A"), f2.tag()->artist());
CPPUNIT_ASSERT_EQUAL(xxx, f2.tag()->title());
}
@@ -171,7 +171,7 @@ public:
}
{
MPEG::File f2(newname.c_str());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), f2.ID3v2Tag()->header()->majorVersion());
CPPUNIT_ASSERT_EQUAL((unsigned int)3, f2.ID3v2Tag()->header()->majorVersion());
CPPUNIT_ASSERT_EQUAL(String("Artist A"), f2.tag()->artist());
CPPUNIT_ASSERT_EQUAL(xxx, f2.tag()->title());
}

14
tests/test_ogg.cpp
View File

@@ -95,7 +95,7 @@ public:
Vorbis::File f(newname.c_str());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.tag()->properties().size());
CPPUNIT_ASSERT_EQUAL((unsigned int)0, f.tag()->properties().size());
PropertyMap newTags;
StringList values("value 1");
@@ -104,8 +104,8 @@ public:
f.tag()->setProperties(newTags);
PropertyMap map = f.tag()->properties();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), map.size());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), map["ARTIST"].size());
CPPUNIT_ASSERT_EQUAL((unsigned int)1, map.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, map["ARTIST"].size());
CPPUNIT_ASSERT_EQUAL(String("value 1"), map["ARTIST"][0]);
}
@@ -117,7 +117,7 @@ public:
Vorbis::File f(newname.c_str());
PropertyMap tags = f.tag()->properties();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2), tags["UNUSUALTAG"].size());
CPPUNIT_ASSERT_EQUAL((unsigned int)2, tags["UNUSUALTAG"].size());
CPPUNIT_ASSERT_EQUAL(String("usual value"), tags["UNUSUALTAG"][0]);
CPPUNIT_ASSERT_EQUAL(String("another value"), tags["UNUSUALTAG"][1]);
CPPUNIT_ASSERT_EQUAL(
@@ -160,7 +160,7 @@ public:
f.save();
f.seek(0x50);
CPPUNIT_ASSERT_EQUAL((TagLib::uint)0x3d3bd92d, f.readBlock(4).toUInt(0, true));
CPPUNIT_ASSERT_EQUAL((unsigned int)0x3d3bd92d, f.readBlock(4).toUInt(0, true));
}
{
Vorbis::File f(copy.fileName().c_str());
@@ -168,7 +168,7 @@ public:
f.save();
f.seek(0x50);
CPPUNIT_ASSERT_EQUAL((TagLib::uint)0xd985291c, f.readBlock(4).toUInt(0, true));
CPPUNIT_ASSERT_EQUAL((unsigned int)0xd985291c, f.readBlock(4).toUInt(0, true));
}
}
@@ -194,7 +194,7 @@ public:
f = new Vorbis::File(newname.c_str());
List<FLAC::Picture *> lst = f->tag()->pictureList();
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), lst.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)1, lst.size());
CPPUNIT_ASSERT_EQUAL(int(5), lst[0]->width());
CPPUNIT_ASSERT_EQUAL(int(6), lst[0]->height());
CPPUNIT_ASSERT_EQUAL(int(16), lst[0]->colorDepth());

150
tests/test_riff.cpp
View File

@@ -13,14 +13,14 @@ class PublicRIFF : public RIFF::File
{
public:
PublicRIFF(FileName file) : RIFF::File(file, BigEndian) {};
TagLib::uint riffSize() { return RIFF::File::riffSize(); };
TagLib::uint chunkCount() { return RIFF::File::chunkCount(); };
TagLib::uint chunkOffset(TagLib::uint i) { return RIFF::File::chunkOffset(i); };
TagLib::uint chunkPadding(TagLib::uint i) { return RIFF::File::chunkPadding(i); };
TagLib::uint chunkDataSize(TagLib::uint i) { return RIFF::File::chunkDataSize(i); };
ByteVector chunkName(TagLib::uint i) { return RIFF::File::chunkName(i); };
ByteVector chunkData(TagLib::uint i) { return RIFF::File::chunkData(i); };
void setChunkData(TagLib::uint i, const ByteVector &data) {
unsigned int riffSize() { return RIFF::File::riffSize(); };
unsigned int chunkCount() { return RIFF::File::chunkCount(); };
unsigned int chunkOffset(unsigned int i) { return RIFF::File::chunkOffset(i); };
unsigned int chunkPadding(unsigned int i) { return RIFF::File::chunkPadding(i); };
unsigned int chunkDataSize(unsigned int i) { return RIFF::File::chunkDataSize(i); };
ByteVector chunkName(unsigned int i) { return RIFF::File::chunkName(i); };
ByteVector chunkData(unsigned int i) { return RIFF::File::chunkData(i); };
void setChunkData(unsigned int i, const ByteVector &data) {
RIFF::File::setChunkData(i, data);
}
void setChunkData(const ByteVector &name, const ByteVector &data) {
@@ -29,7 +29,7 @@ public:
virtual TagLib::Tag* tag() const { return 0; };
virtual TagLib::AudioProperties* audioProperties() const { return 0;};
virtual bool save() { return false; };
void removeChunk(TagLib::uint i) { RIFF::File::removeChunk(i); }
void removeChunk(unsigned int i) { RIFF::File::removeChunk(i); }
void removeChunk(const ByteVector &name) { RIFF::File::removeChunk(name); }
};
@@ -53,7 +53,7 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x1728 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x1728 + 8), f.chunkOffset(2));
f.setChunkData("TEST", "foo");
}
@@ -61,8 +61,8 @@ public:
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("foo"), f.chunkData(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x1728 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(3), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x1728 + 8), f.chunkOffset(2));
f.setChunkData("SSND", "abcd");
@@ -95,33 +95,33 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(long(4400), f.length());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4399 - 8), f.riffSize());
CPPUNIT_ASSERT_EQUAL((unsigned int)(4399 - 8), f.riffSize());
f.setChunkData("TEST", "abcd");
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4412 - 8), f.riffSize());
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4412 - 8), f.riffSize());
}
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL(long(4412), f.length());
}
}
@@ -133,33 +133,33 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(long(4399), f.length());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4399 - 8), f.riffSize());
CPPUNIT_ASSERT_EQUAL((unsigned int)(4399 - 8), f.riffSize());
f.setChunkData("TEST", "abcd");
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4412 - 8), f.riffSize());
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4412 - 8), f.riffSize());
}
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL(long(4412), f.length());
}
}
@@ -171,33 +171,33 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(long(4399), f.length());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4399 - 8), f.riffSize());
CPPUNIT_ASSERT_EQUAL((unsigned int)(4399 - 8), f.riffSize());
f.setChunkData("TEST", "abc");
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(3), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4411 - 8), f.riffSize());
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4411 - 8), f.riffSize());
}
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(3), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL(long(4412), f.length());
}
}
@@ -210,17 +210,17 @@ public:
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(ByteVector("COMM"), f.chunkName(0));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(1));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x0026 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x0026 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x1728 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x1728 + 8), f.chunkOffset(2));
const ByteVector data(0x400, ' ');
f.setChunkData("SSND", data);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x0026 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x042E + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x0026 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x042E + 8), f.chunkOffset(2));
f.seek(f.chunkOffset(0) - 8);
CPPUNIT_ASSERT_EQUAL(ByteVector("COMM"), f.readBlock(4));
@@ -230,9 +230,9 @@ public:
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.readBlock(4));
f.setChunkData(0, data);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x0414 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x081C + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x0414 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x081C + 8), f.chunkOffset(2));
f.seek(f.chunkOffset(0) - 8);
CPPUNIT_ASSERT_EQUAL(ByteVector("COMM"), f.readBlock(4));
@@ -242,8 +242,8 @@ public:
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.readBlock(4));
f.removeChunk("SSND");
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x0414 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x0414 + 8), f.chunkOffset(1));
f.seek(f.chunkOffset(0) - 8);
CPPUNIT_ASSERT_EQUAL(ByteVector("COMM"), f.readBlock(4));
@@ -251,7 +251,7 @@ public:
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.readBlock(4));
f.removeChunk(0);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL((unsigned int)(0x000C + 8), f.chunkOffset(0));
f.seek(f.chunkOffset(0) - 8);
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.readBlock(4));

6
tests/test_string.cpp
View File

@@ -266,9 +266,9 @@ public:
ByteVector lf("abc\x0axyz", 7);
ByteVector crlf("abc\x0d\x0axyz", 8);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(7), String(cr).size());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(7), String(lf).size());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(8), String(crlf).size());
CPPUNIT_ASSERT_EQUAL((unsigned int)7, String(cr).size());
CPPUNIT_ASSERT_EQUAL((unsigned int)7, String(lf).size());
CPPUNIT_ASSERT_EQUAL((unsigned int)8, String(crlf).size());
CPPUNIT_ASSERT_EQUAL(L'\x0d', String(cr)[3]);
CPPUNIT_ASSERT_EQUAL(L'\x0a', String(lf)[3]);

12
tests/test_synchdata.cpp
View File

@@ -47,7 +47,7 @@ public:
char data[] = { 0, 0, 0, 127 };
ByteVector v(data, 4);
CPPUNIT_ASSERT_EQUAL(ID3v2::SynchData::toUInt(v), TagLib::uint(127));
CPPUNIT_ASSERT_EQUAL(ID3v2::SynchData::toUInt(v), (unsigned int)127);
CPPUNIT_ASSERT_EQUAL(ID3v2::SynchData::fromUInt(127), v);
}
@@ -56,7 +56,7 @@ public:
char data[] = { 0, 0, 1, 0 };
ByteVector v(data, 4);
CPPUNIT_ASSERT_EQUAL(ID3v2::SynchData::toUInt(v), TagLib::uint(128));
CPPUNIT_ASSERT_EQUAL(ID3v2::SynchData::toUInt(v), (unsigned int)128);
CPPUNIT_ASSERT_EQUAL(ID3v2::SynchData::fromUInt(128), v);
}
@@ -65,7 +65,7 @@ public:
char data[] = { 0, 0, 1, 1 };
ByteVector v(data, 4);
CPPUNIT_ASSERT_EQUAL(ID3v2::SynchData::toUInt(v), TagLib::uint(129));
CPPUNIT_ASSERT_EQUAL(ID3v2::SynchData::toUInt(v), (unsigned int)129);
CPPUNIT_ASSERT_EQUAL(ID3v2::SynchData::fromUInt(129), v);
}
@@ -74,8 +74,8 @@ public:
char data[] = { 0, 0, 0, -1 };
char data2[] = { 0, 0, -1, -1 };
CPPUNIT_ASSERT_EQUAL(TagLib::uint(255), ID3v2::SynchData::toUInt(ByteVector(data, 4)));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(65535), ID3v2::SynchData::toUInt(ByteVector(data2, 4)));
CPPUNIT_ASSERT_EQUAL((unsigned int)255, ID3v2::SynchData::toUInt(ByteVector(data, 4)));
CPPUNIT_ASSERT_EQUAL((unsigned int)65535, ID3v2::SynchData::toUInt(ByteVector(data2, 4)));
}
void testToUIntBrokenAndTooLarge()
@@ -83,7 +83,7 @@ public:
char data[] = { 0, 0, 0, -1, 0 };
ByteVector v(data, 5);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(255), ID3v2::SynchData::toUInt(v));
CPPUNIT_ASSERT_EQUAL((unsigned int)255, ID3v2::SynchData::toUInt(v));
}
void testDecode1()

14
tests/test_xiphcomment.cpp
View File

@@ -27,11 +27,11 @@ public:
void testYear()
{
Ogg::XiphComment cmt;
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), cmt.year());
CPPUNIT_ASSERT_EQUAL((unsigned int)0, cmt.year());
cmt.addField("YEAR", "2009");
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2009), cmt.year());
CPPUNIT_ASSERT_EQUAL((unsigned int)2009, cmt.year());
cmt.addField("DATE", "2008");
CPPUNIT_ASSERT_EQUAL(TagLib::uint(2008), cmt.year());
CPPUNIT_ASSERT_EQUAL((unsigned int)2008, cmt.year());
}
void testSetYear()
@@ -47,11 +47,11 @@ public:
void testTrack()
{
Ogg::XiphComment cmt;
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), cmt.track());
CPPUNIT_ASSERT_EQUAL((unsigned int)0, cmt.track());
cmt.addField("TRACKNUM", "7");
CPPUNIT_ASSERT_EQUAL(TagLib::uint(7), cmt.track());
CPPUNIT_ASSERT_EQUAL((unsigned int)7, cmt.track());
cmt.addField("TRACKNUMBER", "8");
CPPUNIT_ASSERT_EQUAL(TagLib::uint(8), cmt.track());
CPPUNIT_ASSERT_EQUAL((unsigned int)8, cmt.track());
}
void testSetTrack()
@@ -73,7 +73,7 @@ public:
Ogg::XiphComment cmt;
PropertyMap unsuccessful = cmt.setProperties(map);
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), unsuccessful.size());
CPPUNIT_ASSERT_EQUAL((unsigned int)3, unsuccessful.size());
CPPUNIT_ASSERT(cmt.properties().isEmpty());
}