mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-11-14 13:42:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-master-to-taglib2

Browse Source 
# Conflicts:
#	taglib/ape/apefile.cpp
#	taglib/ape/apeitem.cpp
#	taglib/ape/apeproperties.cpp
#	taglib/ape/apetag.cpp
#	taglib/ape/apetag.h
#	taglib/asf/asffile.cpp
#	taglib/asf/asfpicture.cpp
#	taglib/flac/flacfile.cpp
#	taglib/flac/flacpicture.cpp
#	taglib/flac/flacproperties.cpp
#	taglib/it/itfile.cpp
#	taglib/it/itproperties.cpp
#	taglib/mod/modfile.cpp
#	taglib/mod/modfilebase.cpp
#	taglib/mod/modfilebase.h
#	taglib/mod/modfileprivate.h
#	taglib/mod/modproperties.cpp
#	taglib/mp4/mp4item.cpp
#	taglib/mp4/mp4tag.cpp
#	taglib/mp4/mp4tag.h
#	taglib/mpc/mpcfile.cpp
#	taglib/mpc/mpcproperties.cpp
#	taglib/mpc/mpcproperties.h
#	taglib/mpeg/id3v1/id3v1tag.cpp
#	taglib/mpeg/id3v1/id3v1tag.h
#	taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
#	taglib/mpeg/id3v2/frames/chapterframe.cpp
#	taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp
#	taglib/mpeg/id3v2/frames/popularimeterframe.cpp
#	taglib/mpeg/id3v2/frames/relativevolumeframe.cpp
#	taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
#	taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
#	taglib/mpeg/id3v2/frames/textidentificationframe.cpp
#	taglib/mpeg/id3v2/id3v2frame.cpp
#	taglib/mpeg/id3v2/id3v2framefactory.cpp
#	taglib/mpeg/id3v2/id3v2framefactory.h
#	taglib/mpeg/id3v2/id3v2tag.cpp
#	taglib/mpeg/id3v2/id3v2tag.h
#	taglib/mpeg/mpegfile.cpp
#	taglib/mpeg/mpegheader.cpp
#	taglib/ogg/flac/oggflacfile.cpp
#	taglib/ogg/opus/opusproperties.cpp
#	taglib/ogg/speex/speexproperties.cpp
#	taglib/ogg/vorbis/vorbisproperties.cpp
#	taglib/ogg/xiphcomment.cpp
#	taglib/ogg/xiphcomment.h
#	taglib/riff/aiff/aiffproperties.cpp
#	taglib/riff/rifffile.cpp
#	taglib/riff/rifffile.h
#	taglib/riff/wav/infotag.cpp
#	taglib/riff/wav/infotag.h
#	taglib/riff/wav/wavproperties.cpp
#	taglib/riff/wav/wavproperties.h
#	taglib/s3m/s3mproperties.cpp
#	taglib/tagunion.cpp
#	taglib/tagunion.h
#	taglib/toolkit/taglib.h
#	taglib/toolkit/tbytevector.cpp
#	taglib/toolkit/tbytevector.h
#	taglib/toolkit/tbytevectorlist.cpp
#	taglib/toolkit/tbytevectorstream.cpp
#	taglib/toolkit/tbytevectorstream.h
#	taglib/toolkit/tfile.cpp
#	taglib/toolkit/tfile.h
#	taglib/toolkit/tfilestream.cpp
#	taglib/toolkit/tfilestream.h
#	taglib/toolkit/tiostream.h
#	taglib/toolkit/tlist.h
#	taglib/toolkit/tlist.tcc
#	taglib/toolkit/tmap.h
#	taglib/toolkit/tmap.tcc
#	taglib/toolkit/tstring.cpp
#	taglib/toolkit/tstring.h
#	taglib/trueaudio/trueaudiofile.cpp
#	taglib/trueaudio/trueaudioproperties.cpp
#	taglib/trueaudio/trueaudioproperties.h
#	taglib/wavpack/wavpackfile.cpp
#	taglib/wavpack/wavpackproperties.cpp
#	taglib/wavpack/wavpackproperties.h
#	taglib/xm/xmfile.cpp
#	taglib/xm/xmproperties.cpp
#	tests/test_apetag.cpp
#	tests/test_asf.cpp
#	tests/test_bytevector.cpp
#	tests/test_bytevectorlist.cpp
#	tests/test_file.cpp
#	tests/test_flac.cpp
#	tests/test_flacpicture.cpp
#	tests/test_id3v2.cpp
#	tests/test_info.cpp
#	tests/test_mp4.cpp
#	tests/test_ogg.cpp
#	tests/test_riff.cpp
#	tests/test_string.cpp
#	tests/test_xiphcomment.cpp
This commit is contained in:
Tsuda Kageyu
2015-12-03 14:44:17 +09:00
parent afa137e1c1 24f220224d
commit 6857926da2
142 changed files with 1608 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_apetag.cpp
View File

@ -94,7 +94,7 @@ public:
APE::Tag tag;
PropertyMap unsuccessful = tag.setProperties(properties);
CPPUNIT_ASSERT_EQUAL(size_t(2), unsuccessful.size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(1), values2.size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(2), values2.size());
CPPUNIT_ASSERT_EQUAL((size_t)2, values2.size());
ASF::Picture picture3 = values2[1].toPicture();
CPPUNIT_ASSERT(picture3.isValid());
CPPUNIT_ASSERT_EQUAL(String("image/jpeg"), picture3.mimeType());

132
tests/test_bytevector.cpp
View File

@ -44,6 +44,7 @@ class TestByteVector : public CppUnit::TestFixture
CPPUNIT_TEST(testIterator);
CPPUNIT_TEST(testResize);
CPPUNIT_TEST(testAppend);
CPPUNIT_TEST(testBase64);
CPPUNIT_TEST_SUITE_END();
public:
@ -193,12 +194,12 @@ public:
CPPUNIT_ASSERT(ByteVector::fromUInt32LE(287454020) == ByteVector::fromUInt32BE(1144201745));
CPPUNIT_ASSERT(ByteVector::fromUInt64LE(1234605615291183940) == ByteVector::fromUInt64BE(4914309075945333265));
const uchar PI32LE[] = { 0x00, 0xdb, 0x0f, 0x49, 0x40 };
const uchar PI32BE[] = { 0x00, 0x40, 0x49, 0x0f, 0xdb };
const uchar PI64LE[] = { 0x00, 0x18, 0x2d, 0x44, 0x54, 0xfb, 0x21, 0x09, 0x40 };
const uchar PI64BE[] = { 0x00, 0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18 };
const uchar PI80LE[] = { 0x00, 0x00, 0xc0, 0x68, 0x21, 0xa2, 0xda, 0x0f, 0xc9, 0x00, 0x40 };
const uchar PI80BE[] = { 0x00, 0x40, 0x00, 0xc9, 0x0f, 0xda, 0xa2, 0x21, 0x68, 0xc0, 0x00 };
const unsigned char PI32LE[] = { 0x00, 0xdb, 0x0f, 0x49, 0x40 };
const unsigned char PI32BE[] = { 0x00, 0x40, 0x49, 0x0f, 0xdb };
const unsigned char PI64LE[] = { 0x00, 0x18, 0x2d, 0x44, 0x54, 0xfb, 0x21, 0x09, 0x40 };
const unsigned char PI64BE[] = { 0x00, 0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18 };
const unsigned char PI80LE[] = { 0x00, 0x00, 0xc0, 0x68, 0x21, 0xa2, 0xda, 0x0f, 0xc9, 0x00, 0x40 };
const unsigned char PI80BE[] = { 0x00, 0x40, 0x00, 0xc9, 0x0f, 0xda, 0xa2, 0x21, 0x68, 0xc0, 0x00 };
ByteVector pi32le(reinterpret_cast<const char*>(PI32LE), 5);
CPPUNIT_ASSERT_EQUAL(31415, static_cast<int>(pi32le.toFloat32LE(1) * 10000));
@ -332,24 +333,24 @@ public:
ByteVector a = ByteVector("0123456789");
ByteVector b = a.mid(3, 4);
b.resize(6, 'A');
CPPUNIT_ASSERT_EQUAL(size_t(6), b.size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(10), b.size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(3), b.size());
CPPUNIT_ASSERT_EQUAL((size_t)3, b.size());
CPPUNIT_ASSERT_EQUAL(ByteVector::npos(), b.find('C'));
b.resize(3);
CPPUNIT_ASSERT_EQUAL(size_t(3), b.size());
CPPUNIT_ASSERT_EQUAL((size_t)3, b.size());
// Check if a and b were properly detached.
CPPUNIT_ASSERT_EQUAL(size_t(10), a.size());
CPPUNIT_ASSERT_EQUAL((size_t)10, a.size());
CPPUNIT_ASSERT_EQUAL('3', a[3]);
CPPUNIT_ASSERT_EQUAL('5', a[5]);
@ -362,12 +363,12 @@ public:
CPPUNIT_ASSERT_EQUAL('A', c[4]);
CPPUNIT_ASSERT_EQUAL('A', c[5]);
c.resize(10, 'B');
CPPUNIT_ASSERT_EQUAL(size_t(10), c.size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(3), c.size());
CPPUNIT_ASSERT_EQUAL((size_t)3, c.size());
CPPUNIT_ASSERT_EQUAL(ByteVector::npos(), c.find('C'));
}
@ -385,6 +386,111 @@ public:
CPPUNIT_ASSERT_EQUAL(ByteVector("taglib"), v2);
}
void testBase64()
{
ByteVector sempty;
ByteVector t0("a"); // test 1 byte
ByteVector t1("any carnal pleasure.");
ByteVector t2("any carnal pleasure");
ByteVector t3("any carnal pleasur");
ByteVector s0("a"); // test 1 byte
ByteVector s1("any carnal pleasure.");
ByteVector s2("any carnal pleasure");
ByteVector s3("any carnal pleasur");
ByteVector eempty;
ByteVector e0("YQ==");
ByteVector e1("YW55IGNhcm5hbCBwbGVhc3VyZS4=");
ByteVector e2("YW55IGNhcm5hbCBwbGVhc3VyZQ==");
ByteVector e3("YW55IGNhcm5hbCBwbGVhc3Vy");
// Encode
CPPUNIT_ASSERT_EQUAL(eempty, sempty.toBase64());
CPPUNIT_ASSERT_EQUAL(e0, s0.toBase64());
CPPUNIT_ASSERT_EQUAL(e1, s1.toBase64());
CPPUNIT_ASSERT_EQUAL(e2, s2.toBase64());
CPPUNIT_ASSERT_EQUAL(e3, s3.toBase64());
// Decode
CPPUNIT_ASSERT_EQUAL(sempty, eempty.toBase64());
CPPUNIT_ASSERT_EQUAL(s0, ByteVector::fromBase64(e0));
CPPUNIT_ASSERT_EQUAL(s1, ByteVector::fromBase64(e1));
CPPUNIT_ASSERT_EQUAL(s2, ByteVector::fromBase64(e2));
CPPUNIT_ASSERT_EQUAL(s3, ByteVector::fromBase64(e3));
CPPUNIT_ASSERT_EQUAL(t0, ByteVector::fromBase64(s0.toBase64()));
CPPUNIT_ASSERT_EQUAL(t1, ByteVector::fromBase64(s1.toBase64()));
CPPUNIT_ASSERT_EQUAL(t2, ByteVector::fromBase64(s2.toBase64()));
CPPUNIT_ASSERT_EQUAL(t3, ByteVector::fromBase64(s3.toBase64()));
ByteVector all((size_t)256, '\0');
// in order
{
for(int i = 0; i < 256; i++){
all[i]=(unsigned char)i;
}
ByteVector b64 = all.toBase64();
ByteVector original = ByteVector::fromBase64(b64);
CPPUNIT_ASSERT_EQUAL(all,original);
}
// reverse
{
for(int i = 0; i < 256; i++){
all[i]=(unsigned char)255-i;
}
ByteVector b64 = all.toBase64();
ByteVector original = ByteVector::fromBase64(b64);
CPPUNIT_ASSERT_EQUAL(all,original);
}
// all zeroes
{
for(int i = 0; i < 256; i++){
all[i]=0;
}
ByteVector b64 = all.toBase64();
ByteVector original = ByteVector::fromBase64(b64);
CPPUNIT_ASSERT_EQUAL(all,original);
}
// all ones
{
for(int i = 0; i < 256; i++){
all[i]=(unsigned char)0xff;
}
ByteVector b64 = all.toBase64();
ByteVector original = ByteVector::fromBase64(b64);
CPPUNIT_ASSERT_EQUAL(all,original);
}
// Missing end bytes
{
// No missing bytes
ByteVector m0("YW55IGNhcm5hbCBwbGVhc3VyZQ==");
CPPUNIT_ASSERT_EQUAL(s2,ByteVector::fromBase64(m0));
// 1 missing byte
ByteVector m1("YW55IGNhcm5hbCBwbGVhc3VyZQ=");
CPPUNIT_ASSERT_EQUAL(sempty,ByteVector::fromBase64(m1));
// 2 missing bytes
ByteVector m2("YW55IGNhcm5hbCBwbGVhc3VyZQ");
CPPUNIT_ASSERT_EQUAL(sempty,ByteVector::fromBase64(m2));
// 3 missing bytes
ByteVector m3("YW55IGNhcm5hbCBwbGVhc3VyZ");
CPPUNIT_ASSERT_EQUAL(sempty,ByteVector::fromBase64(m3));
}
// Grok invalid characters
{
ByteVector invalid("abd\x00\x01\x02\x03\x04");
CPPUNIT_ASSERT_EQUAL(sempty,ByteVector::fromBase64(invalid));
}
}
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestByteVector);

4
tests/test_bytevectorlist.cpp
View File

@ -19,7 +19,7 @@ public:
ByteVector v("a b");
ByteVectorList l = ByteVectorList::split(v, " ");
CPPUNIT_ASSERT_EQUAL(size_t(2), l.size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(1), l.size());
CPPUNIT_ASSERT_EQUAL((size_t)1, l.size());
CPPUNIT_ASSERT_EQUAL(ByteVector("a"), l[0]);
}

12
tests/test_fileref.cpp
View File

@ -73,8 +73,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!");
@ -90,8 +90,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());
@ -101,8 +101,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);
}
}

53
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(size_t(1), lst.size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(150), pic->data().size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(1), lst.size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(2), lst.size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(150), pic->data().size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(1), lst.size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(1), lst.size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(1), lst.size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(0), lst.size());
CPPUNIT_ASSERT_EQUAL((size_t)0, lst.size());
}
}
@ -220,7 +220,7 @@ public:
{
FLAC::File f(newname.c_str());
Ogg::FieldListMap m = f.xiphComment()->fieldListMap();
CPPUNIT_ASSERT_EQUAL(size_t(2), m["ARTIST"].size());
CPPUNIT_ASSERT_EQUAL((size_t)2, m["ARTIST"].size());
CPPUNIT_ASSERT_EQUAL(String("artist 1"), m["ARTIST"][0]);
CPPUNIT_ASSERT_EQUAL(String("artist 2"), m["ARTIST"][1]);
}
@ -232,20 +232,21 @@ public:
ScopedFileCopy copy("silence-44-s", ".flac");
string newname = copy.fileName();
FLAC::File *f = new FLAC::File(newname.c_str());
PropertyMap dict;
dict["ARTIST"].append("artøst 1");
dict["ARTIST"].append("artöst 2");
f->setProperties(dict);
f->save();
delete f;
f = new FLAC::File(newname.c_str());
dict = f->properties();
CPPUNIT_ASSERT_EQUAL(size_t(2), dict["ARTIST"].size());
CPPUNIT_ASSERT_EQUAL(String("artøst 1"), dict["ARTIST"][0]);
CPPUNIT_ASSERT_EQUAL(String("artöst 2"), dict["ARTIST"][1]);
delete f;
{
FLAC::File f(newname.c_str());
PropertyMap dict;
dict["ARTIST"].append("artøst 1");
dict["ARTIST"].append("artöst 2");
f.setProperties(dict);
f.save();
}
{
FLAC::File f(newname.c_str());
PropertyMap dict = f.properties();
CPPUNIT_ASSERT_EQUAL((size_t)2, dict["ARTIST"].size());
CPPUNIT_ASSERT_EQUAL(String("artøst 1"), dict["ARTIST"][0]);
CPPUNIT_ASSERT_EQUAL(String("artöst 2"), dict["ARTIST"][1]);
}
}
void testInvalid()
@ -255,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(size_t(1), invalid.size());
CPPUNIT_ASSERT_EQUAL(size_t(0), f.properties().size());
CPPUNIT_ASSERT_EQUAL((size_t)1, invalid.size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(150), pic.data().size());
CPPUNIT_ASSERT_EQUAL((size_t)150, pic.data().size());
}
void testPassThrough()

72
tests/test_id3v2.cpp
View File

@ -237,7 +237,7 @@ public:
ID3v2::Tag tag;
tag.addFrame(frame);
CPPUNIT_ASSERT_EQUAL(size_t(1034), tag.render().size());
CPPUNIT_ASSERT_EQUAL((size_t)1034, tag.render().size());
}
// http://bugs.kde.org/show_bug.cgi?id=151078
@ -266,7 +266,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()
@ -278,7 +278,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()
@ -344,7 +344,7 @@ public:
CPPUNIT_ASSERT_EQUAL(String("ident"), f.identification());
CPPUNIT_ASSERT_EQUAL(15.0f / 512.0f,
f.volumeAdjustment(ID3v2::RelativeVolumeFrame::FrontRight));
CPPUNIT_ASSERT_EQUAL((uchar)8,
CPPUNIT_ASSERT_EQUAL((unsigned char)8,
f.peakVolume(ID3v2::RelativeVolumeFrame::FrontRight).bitsRepresentingPeak);
CPPUNIT_ASSERT_EQUAL(ByteVector("\x45"),
f.peakVolume(ID3v2::RelativeVolumeFrame::FrontRight).peakVolume);
@ -482,11 +482,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(size_t(2), stl.size());
CPPUNIT_ASSERT_EQUAL((size_t)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()
@ -533,9 +533,9 @@ public:
ID3v2::EventTimingCodesFrame::SynchedEventList sel = f.synchedEvents();
CPPUNIT_ASSERT_EQUAL(size_t(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()
@ -598,7 +598,7 @@ public:
header.setMajorVersion(3);
ID3v2::TextIdentificationFrame *frame =
static_cast<TagLib::ID3v2::TextIdentificationFrame*>(factory->createFrame(data, &header));
CPPUNIT_ASSERT_EQUAL(size_t(1), frame->fieldList().size());
CPPUNIT_ASSERT_EQUAL((size_t)1, frame->fieldList().size());
CPPUNIT_ASSERT_EQUAL(String("Death Metal"), frame->fieldList()[0]);
ID3v2::Tag tag;
@ -619,7 +619,7 @@ public:
header.setMajorVersion(3);
ID3v2::TextIdentificationFrame *frame =
static_cast<TagLib::ID3v2::TextIdentificationFrame*>(factory->createFrame(data, &header));
CPPUNIT_ASSERT_EQUAL(size_t(2), frame->fieldList().size());
CPPUNIT_ASSERT_EQUAL((size_t)2, frame->fieldList().size());
CPPUNIT_ASSERT_EQUAL(String("4"), frame->fieldList()[0]);
CPPUNIT_ASSERT_EQUAL(String("Eurodisco"), frame->fieldList()[1]);
@ -639,7 +639,7 @@ public:
ID3v2::Header header;
ID3v2::TextIdentificationFrame *frame =
static_cast<TagLib::ID3v2::TextIdentificationFrame*>(factory->createFrame(data, &header));
CPPUNIT_ASSERT_EQUAL(size_t(2), frame->fieldList().size());
CPPUNIT_ASSERT_EQUAL((size_t)2, frame->fieldList().size());
CPPUNIT_ASSERT_EQUAL(String("14"), frame->fieldList()[0]);
CPPUNIT_ASSERT_EQUAL(String("Eurodisco"), frame->fieldList()[1]);
@ -652,7 +652,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()
@ -696,15 +696,15 @@ public:
MPEG::File bar(newname.c_str());
tf = static_cast<ID3v2::TextIdentificationFrame *>(bar.ID3v2Tag()->frameList("TDOR").front());
CPPUNIT_ASSERT(tf);
CPPUNIT_ASSERT_EQUAL(size_t(1), tf->fieldList().size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(1), tf->fieldList().size());
CPPUNIT_ASSERT_EQUAL(String("2012-04-17"), tf->fieldList().front());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(8), tf->fieldList().size());
CPPUNIT_ASSERT_EQUAL((size_t)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]);
@ -737,7 +737,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(size_t(86414), frame->picture().size());
CPPUNIT_ASSERT_EQUAL((size_t)86414, frame->picture().size());
#else
@ -767,12 +767,12 @@ public:
string newname = copy.fileName();
MPEG::File f(newname.c_str());
PropertyMap dict = f.ID3v2Tag(false)->properties();
CPPUNIT_ASSERT_EQUAL(size_t(6), dict.size());
CPPUNIT_ASSERT_EQUAL((size_t)6, dict.size());
CPPUNIT_ASSERT(dict.contains("USERTEXTDESCRIPTION1"));
CPPUNIT_ASSERT(dict.contains("QuodLibet::USERTEXTDESCRIPTION2"));
CPPUNIT_ASSERT_EQUAL(size_t(2), dict["USERTEXTDESCRIPTION1"].size());
CPPUNIT_ASSERT_EQUAL(size_t(2), dict["QuodLibet::USERTEXTDESCRIPTION2"].size());
CPPUNIT_ASSERT_EQUAL((size_t)2, dict["USERTEXTDESCRIPTION1"].size());
CPPUNIT_ASSERT_EQUAL((size_t)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]);
@ -923,20 +923,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");
}
@ -1029,10 +1029,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");
}
@ -1143,7 +1143,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());
@ -1153,8 +1153,8 @@ public:
{
MPEG::File f(copy.fileName().c_str());
CPPUNIT_ASSERT(f.hasID3v2Tag());
CPPUNIT_ASSERT_EQUAL(3594LL, f.length());
CPPUNIT_ASSERT_EQUAL((TagLib::uint)1505, f.ID3v2Tag()->header()->completeTagSize());
CPPUNIT_ASSERT_EQUAL((long long)3594, f.length());
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());

8
tests/test_info.cpp
View File

@ -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"));
}
};

27
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");
@ -108,20 +107,20 @@ private:
CPPUNIT_ASSERT_EQUAL( 0, p->bitrate());
CPPUNIT_ASSERT_EQUAL( 0, p->sampleRate());
CPPUNIT_ASSERT_EQUAL(64, p->channels());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL(true, p->stereo());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->instrumentCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 5, p->sampleCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort)535, p->version());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort)532, p->compatibleVersion());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 9, p->flags());
CPPUNIT_ASSERT_EQUAL((TagLib::uchar)128, p->globalVolume());
CPPUNIT_ASSERT_EQUAL((TagLib::uchar) 48, p->mixVolume());
CPPUNIT_ASSERT_EQUAL((TagLib::uchar)125, p->tempo());
CPPUNIT_ASSERT_EQUAL((TagLib::uchar) 6, p->bpmSpeed());
CPPUNIT_ASSERT_EQUAL((TagLib::uchar)128, p->panningSeparation());
CPPUNIT_ASSERT_EQUAL((TagLib::uchar) 0, p->pitchWheelDepth());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0, p->instrumentCount());
CPPUNIT_ASSERT_EQUAL((unsigned short) 5, p->sampleCount());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((unsigned short)535, p->version());
CPPUNIT_ASSERT_EQUAL((unsigned short)532, p->compatibleVersion());
CPPUNIT_ASSERT_EQUAL((unsigned short) 9, p->flags());
CPPUNIT_ASSERT_EQUAL((unsigned char)128, p->globalVolume());
CPPUNIT_ASSERT_EQUAL((unsigned char) 48, p->mixVolume());
CPPUNIT_ASSERT_EQUAL((unsigned char)125, p->tempo());
CPPUNIT_ASSERT_EQUAL((unsigned char) 6, p->bpmSpeed());
CPPUNIT_ASSERT_EQUAL((unsigned char)128, p->panningSeparation());
CPPUNIT_ASSERT_EQUAL((unsigned char) 0, p->pitchWheelDepth());
CPPUNIT_ASSERT_EQUAL(title, t->title());
CPPUNIT_ASSERT_EQUAL(String(), t->artist());
CPPUNIT_ASSERT_EQUAL(String(), t->album());

2
tests/test_mod.cpp
View File

@ -111,7 +111,7 @@ private:
CPPUNIT_ASSERT_EQUAL(0, p->sampleRate());
CPPUNIT_ASSERT_EQUAL(8, p->channels());
CPPUNIT_ASSERT_EQUAL(31U, p->instrumentCount());
CPPUNIT_ASSERT_EQUAL((uchar)1, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL((unsigned char)1, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL(title, t->title());
CPPUNIT_ASSERT_EQUAL(String(), t->artist());
CPPUNIT_ASSERT_EQUAL(String(), t->album());

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(size_t(2), l.size());
CPPUNIT_ASSERT_EQUAL((size_t)2, l.size());
CPPUNIT_ASSERT_EQUAL(MP4::CoverArt::PNG, l[0].format());
CPPUNIT_ASSERT_EQUAL(size_t(79), l[0].data().size());
CPPUNIT_ASSERT_EQUAL((size_t)79, l[0].data().size());
CPPUNIT_ASSERT_EQUAL(MP4::CoverArt::JPEG, l[1].format());
CPPUNIT_ASSERT_EQUAL(size_t(287), l[1].data().size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(3), l.size());
CPPUNIT_ASSERT_EQUAL((size_t)3, l.size());
CPPUNIT_ASSERT_EQUAL(MP4::CoverArt::PNG, l[0].format());
CPPUNIT_ASSERT_EQUAL(size_t(79), l[0].data().size());
CPPUNIT_ASSERT_EQUAL((size_t)79, l[0].data().size());
CPPUNIT_ASSERT_EQUAL(MP4::CoverArt::JPEG, l[1].format());
CPPUNIT_ASSERT_EQUAL(size_t(287), l[1].data().size());
CPPUNIT_ASSERT_EQUAL((size_t)287, l[1].data().size());
CPPUNIT_ASSERT_EQUAL(MP4::CoverArt::PNG, l[2].format());
CPPUNIT_ASSERT_EQUAL(size_t(3), l[2].data().size());
CPPUNIT_ASSERT_EQUAL((size_t)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(size_t(2), l.size());
CPPUNIT_ASSERT_EQUAL((size_t)2, l.size());
CPPUNIT_ASSERT_EQUAL(MP4::CoverArt::PNG, l[0].format());
CPPUNIT_ASSERT_EQUAL(size_t(79), l[0].data().size());
CPPUNIT_ASSERT_EQUAL((size_t)79, l[0].data().size());
CPPUNIT_ASSERT_EQUAL(MP4::CoverArt::JPEG, l[1].format());
CPPUNIT_ASSERT_EQUAL(size_t(287), l[1].data().size());
CPPUNIT_ASSERT_EQUAL((size_t)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

@ -49,7 +49,7 @@ public:
String longText(std::string(128 * 1024, ' ').c_str());
for (size_t i = 0; i < longText.length(); ++i)
longText[i] = static_cast<wchar>(L'A' + (i % 26));
longText[i] = static_cast<wchar_t>(L'A' + (i % 26));
{
Ogg::Vorbis::File f(newname.c_str());
@ -94,7 +94,7 @@ public:
Ogg::Vorbis::File f(newname.c_str());
CPPUNIT_ASSERT_EQUAL(size_t(0), f.tag()->properties().size());
CPPUNIT_ASSERT_EQUAL((size_t)0, f.tag()->properties().size());
PropertyMap newTags;
StringList values("value 1");
@ -103,8 +103,8 @@ public:
f.tag()->setProperties(newTags);
PropertyMap map = f.tag()->properties();
CPPUNIT_ASSERT_EQUAL(size_t(1), map.size());
CPPUNIT_ASSERT_EQUAL(size_t(2), map["ARTIST"].size());
CPPUNIT_ASSERT_EQUAL((size_t)1, map.size());
CPPUNIT_ASSERT_EQUAL((size_t)2, map["ARTIST"].size());
CPPUNIT_ASSERT_EQUAL(String("value 1"), map["ARTIST"][0]);
}
@ -116,7 +116,7 @@ public:
Ogg::Vorbis::File f(newname.c_str());
PropertyMap tags = f.tag()->properties();
CPPUNIT_ASSERT_EQUAL(size_t(2), tags["UNUSUALTAG"].size());
CPPUNIT_ASSERT_EQUAL((size_t)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(
@ -159,7 +159,7 @@ public:
f.save();
f.seek(0x50);
CPPUNIT_ASSERT_EQUAL((TagLib::uint)0x3d3bd92d, f.readBlock(4).toUInt32BE(0));
CPPUNIT_ASSERT_EQUAL((unsigned int)0x3d3bd92d, f.readBlock(4).toUInt32BE(0));
}
{
Ogg::Vorbis::File f(copy.fileName().c_str());
@ -167,7 +167,7 @@ public:
f.save();
f.seek(0x50);
CPPUNIT_ASSERT_EQUAL((TagLib::uint)0xd985291c, f.readBlock(4).toUInt32BE(0));
CPPUNIT_ASSERT_EQUAL((unsigned int)0xd985291c, f.readBlock(4).toUInt32BE(0));
}
}

2
tests/test_oggflac.cpp
View File

@ -54,7 +54,7 @@ public:
String longText(std::string(128 * 1024, ' ').c_str());
for(size_t i = 0; i < longText.length(); ++i)
longText[i] = static_cast<wchar>(L'A' + (i % 26));
longText[i] = static_cast<wchar_t>(L'A' + (i % 26));
{
Ogg::FLAC::File f(newname.c_str());

2
tests/test_opus.cpp
View File

@ -70,7 +70,7 @@ public:
String longText(std::string(128 * 1024, ' ').c_str());
for(size_t i = 0; i < longText.length(); ++i)
longText[i] = static_cast<wchar>(L'A' + (i % 26));
longText[i] = static_cast<wchar_t>(L'A' + (i % 26));
{
Ogg::Opus::File f(newname.c_str());

163
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(); };
long long 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(); };
long long 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(0x1728 + 8LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(0x1728 + 8LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((unsigned int)(3), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((long long)(0x1728 + 8), f.chunkOffset(2));
f.setChunkData("SSND", "abcd");
@ -95,34 +95,34 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(0xff0 + 8LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4400LL, f.length());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4399 - 8), f.riffSize());
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((long long)(4400), f.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)(4399 - 8), f.riffSize());
f.setChunkData("TEST", "abcd");
CPPUNIT_ASSERT_EQUAL(4088LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4408LL, f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4088LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4408LL, f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4412LL, f.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL((long long)(4412), f.length());
}
}
@ -133,34 +133,34 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(0xff0 + 8LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4399LL, f.length());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4399 - 8), f.riffSize());
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((long long)(4399), f.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)(4399 - 8), f.riffSize());
f.setChunkData("TEST", "abcd");
CPPUNIT_ASSERT_EQUAL(4088LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4408LL, f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4088LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4408LL, f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4412LL, f.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL((long long)(4412), f.length());
}
}
@ -171,34 +171,34 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(0xff0 + 8LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4399LL, f.length());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4399 - 8), f.riffSize());
CPPUNIT_ASSERT_EQUAL((unsigned int)(0), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((long long)(4399), f.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)(4399 - 8), f.riffSize());
f.setChunkData("TEST", "abc");
CPPUNIT_ASSERT_EQUAL(4088LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4408LL, f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4088LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4408LL, f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL((long long)(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(4412LL, f.length());
CPPUNIT_ASSERT_EQUAL((unsigned int)(1), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL((long 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(0x000C + 8LL, f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL((long long)(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(1));
CPPUNIT_ASSERT_EQUAL(0x0026 + 8LL, f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL((long long)(0x0026 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(0x1728 + 8LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((long long)(0x1728 + 8), f.chunkOffset(2));
const ByteVector data(0x400, ' ');
f.setChunkData("SSND", data);
CPPUNIT_ASSERT_EQUAL(0x000C + 8LL, f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(0x0026 + 8LL, f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(0x042E + 8LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((long long)(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL((long long)(0x0026 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL((long long)(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(0x000C + 8LL, f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(0x0414 + 8LL, f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(0x081C + 8LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL((long long)(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL((long long)(0x0414 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL((long long)(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(0x000C + 8LL, f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(0x0414 + 8LL, f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL((long long)(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL((long long)(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(0x000C + 8LL, f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL((long long)(0x000C + 8), f.chunkOffset(0));
f.seek(f.chunkOffset(0) - 8);
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.readBlock(4));
@ -260,4 +260,3 @@ public:
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestRIFF);

20
tests/test_s3m.cpp
View File

@ -98,17 +98,17 @@ private:
CPPUNIT_ASSERT_EQUAL( 0, p->bitrate());
CPPUNIT_ASSERT_EQUAL( 0, p->sampleRate());
CPPUNIT_ASSERT_EQUAL(16, p->channels());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL(false, p->stereo());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 5, p->sampleCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->flags());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort)4896, p->trackerVersion());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 2, p->fileFormatVersion());
CPPUNIT_ASSERT_EQUAL((TagLib::uchar) 64, p->globalVolume());
CPPUNIT_ASSERT_EQUAL((TagLib::uchar) 48, p->masterVolume());
CPPUNIT_ASSERT_EQUAL((TagLib::uchar)125, p->tempo());
CPPUNIT_ASSERT_EQUAL((TagLib::uchar) 6, p->bpmSpeed());
CPPUNIT_ASSERT_EQUAL((unsigned short) 5, p->sampleCount());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0, p->flags());
CPPUNIT_ASSERT_EQUAL((unsigned short)4896, p->trackerVersion());
CPPUNIT_ASSERT_EQUAL((unsigned short) 2, p->fileFormatVersion());
CPPUNIT_ASSERT_EQUAL((unsigned char) 64, p->globalVolume());
CPPUNIT_ASSERT_EQUAL((unsigned char) 48, p->masterVolume());
CPPUNIT_ASSERT_EQUAL((unsigned char)125, p->tempo());
CPPUNIT_ASSERT_EQUAL((unsigned char) 6, p->bpmSpeed());
CPPUNIT_ASSERT_EQUAL(title, t->title());
CPPUNIT_ASSERT_EQUAL(String(), t->artist());
CPPUNIT_ASSERT_EQUAL(String(), t->album());

2
tests/test_speex.cpp
View File

@ -35,7 +35,7 @@ public:
String longText(std::string(128 * 1024, ' ').c_str());
for (size_t i = 0; i < longText.length(); ++i)
longText[i] = static_cast<wchar>(L'A' + (i % 26));
longText[i] = static_cast<wchar_t>(L'A' + (i % 26));
{
Ogg::Speex::File f(newname.c_str());

6
tests/test_string.cpp
View File

@ -284,9 +284,9 @@ public:
ByteVector lf("abc\x0axyz", 7);
ByteVector crlf("abc\x0d\x0axyz", 8);
CPPUNIT_ASSERT_EQUAL(size_t(7), String(cr).size());
CPPUNIT_ASSERT_EQUAL(size_t(7), String(lf).size());
CPPUNIT_ASSERT_EQUAL(size_t(8), String(crlf).size());
CPPUNIT_ASSERT_EQUAL((size_t)7, String(cr).size());
CPPUNIT_ASSERT_EQUAL((size_t)7, String(lf).size());
CPPUNIT_ASSERT_EQUAL((size_t)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()

48
tests/test_xiphcomment.cpp
View File

@ -20,6 +20,7 @@ class TestXiphComment : public CppUnit::TestFixture
CPPUNIT_TEST(testInvalidKeys);
CPPUNIT_TEST(testClearComment);
CPPUNIT_TEST(testRemoveFields);
CPPUNIT_TEST(testPicture);
CPPUNIT_TEST_SUITE_END();
public:
@ -27,11 +28,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 +48,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 +74,7 @@ public:
Ogg::XiphComment cmt;
PropertyMap unsuccessful = cmt.setProperties(map);
CPPUNIT_ASSERT_EQUAL(size_t(3), unsuccessful.size());
CPPUNIT_ASSERT_EQUAL((size_t)3, unsuccessful.size());
CPPUNIT_ASSERT(cmt.properties().isEmpty());
}
@ -119,6 +120,39 @@ public:
CPPUNIT_ASSERT_EQUAL(String("Xiph.Org libVorbis I 20050304"), f.tag()->vendorID());
}
void testPicture()
{
ScopedFileCopy copy("empty", ".ogg");
string newname = copy.fileName();
{
Ogg::Vorbis::File f(newname.c_str());
FLAC::Picture *newpic = new FLAC::Picture();
newpic->setType(FLAC::Picture::BackCover);
newpic->setWidth(5);
newpic->setHeight(6);
newpic->setColorDepth(16);
newpic->setNumColors(7);
newpic->setMimeType("image/jpeg");
newpic->setDescription("new image");
newpic->setData("JPEG data");
f.tag()->addPicture(newpic);
f.save();
}
{
Ogg::Vorbis::File f(newname.c_str());
List<FLAC::Picture *> lst = f.tag()->pictureList();
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());
CPPUNIT_ASSERT_EQUAL((int)7, lst[0]->numColors());
CPPUNIT_ASSERT_EQUAL(String("image/jpeg"), lst[0]->mimeType());
CPPUNIT_ASSERT_EQUAL(String("new image"), lst[0]->description());
CPPUNIT_ASSERT_EQUAL(ByteVector("JPEG data"), lst[0]->data());
}
}
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestXiphComment);

32
tests/test_xm.cpp
View File

@ -130,14 +130,14 @@ public:
CPPUNIT_ASSERT_EQUAL(0, p->bitrate());
CPPUNIT_ASSERT_EQUAL(0, p->sampleRate());
CPPUNIT_ASSERT_EQUAL(8, p->channels());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->version());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0 , p->restartPosition());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->instrumentCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->flags());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 6, p->tempo());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort)125, p->bpmSpeed());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0, p->version());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0 , p->restartPosition());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0, p->instrumentCount());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->flags());
CPPUNIT_ASSERT_EQUAL((unsigned short) 6, p->tempo());
CPPUNIT_ASSERT_EQUAL((unsigned short)125, p->bpmSpeed());
CPPUNIT_ASSERT_EQUAL(titleBefore, t->title());
CPPUNIT_ASSERT_EQUAL(String(), t->artist());
CPPUNIT_ASSERT_EQUAL(String(), t->album());
@ -176,14 +176,14 @@ private:
CPPUNIT_ASSERT_EQUAL(0, p->bitrate());
CPPUNIT_ASSERT_EQUAL(0, p->sampleRate());
CPPUNIT_ASSERT_EQUAL(8, p->channels());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort)260, p->version());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->restartPosition());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort)128, p->instrumentCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->flags());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 6, p->tempo());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort)125, p->bpmSpeed());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL((unsigned short)260, p->version());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0, p->restartPosition());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((unsigned short)128, p->instrumentCount());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->flags());
CPPUNIT_ASSERT_EQUAL((unsigned short) 6, p->tempo());
CPPUNIT_ASSERT_EQUAL((unsigned short)125, p->bpmSpeed());
CPPUNIT_ASSERT_EQUAL(title, t->title());
CPPUNIT_ASSERT_EQUAL(String(), t->artist());
CPPUNIT_ASSERT_EQUAL(String(), t->album());