Use CPPUNIT_ASSERT_EQUAL in tests where possible

This commit is contained in:
Martchus 2018-04-30 19:00:22 +02:00
parent e29f9bd4f8
commit b58eac9302
4 changed files with 122 additions and 119 deletions

View File

@ -9,33 +9,33 @@
*/
void OverallTests::checkFlacTestfile1()
{
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::Flac);
CPPUNIT_ASSERT_EQUAL(ContainerFormat::Flac, m_fileInfo.containerFormat());
const auto tracks = m_fileInfo.tracks();
CPPUNIT_ASSERT(tracks.size() == 1);
CPPUNIT_ASSERT_EQUAL(1_st, tracks.size());
for (const auto &track : tracks) {
CPPUNIT_ASSERT(track->mediaType() == MediaType::Audio);
CPPUNIT_ASSERT(track->format() == GeneralMediaFormat::Flac);
CPPUNIT_ASSERT(track->channelCount() == 2);
CPPUNIT_ASSERT(track->samplingFrequency() == 44100);
CPPUNIT_ASSERT(track->bitsPerSample() == 16);
CPPUNIT_ASSERT(track->duration().minutes() == 4);
CPPUNIT_ASSERT_EQUAL(MediaType::Audio, track->mediaType());
CPPUNIT_ASSERT_EQUAL(GeneralMediaFormat::Flac, track->format().general);
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(2), track->channelCount());
CPPUNIT_ASSERT_EQUAL(44100u, track->samplingFrequency());
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(16), track->bitsPerSample());
CPPUNIT_ASSERT_EQUAL(4, track->duration().minutes());
}
const auto tags = m_fileInfo.tags();
switch (m_tagStatus) {
case TagStatus::Original:
// ffmpeg is able to set some tags from the original file (mtx-test-data/alac/othertest-itunes.m4a)
CPPUNIT_ASSERT(tags.size() == 1);
CPPUNIT_ASSERT(tags.front()->value(KnownField::Title).toString() == "Sad Song");
CPPUNIT_ASSERT(tags.front()->value(KnownField::Artist).toString() == "Oasis");
CPPUNIT_ASSERT(tags.front()->value(KnownField::Album).toString() == "Don't Go Away (Apple Lossless)");
CPPUNIT_ASSERT(tags.front()->value(KnownField::Genre).toString() == "Alternative & Punk");
CPPUNIT_ASSERT(tags.front()->value(KnownField::Encoder).toString() == "Lavf57.25.100");
CPPUNIT_ASSERT(tags.front()->value(KnownField::Year).toString() == "1998");
CPPUNIT_ASSERT_EQUAL(1_st, tags.size());
CPPUNIT_ASSERT_EQUAL("Sad Song"s, tags.front()->value(KnownField::Title).toString());
CPPUNIT_ASSERT_EQUAL("Oasis"s, tags.front()->value(KnownField::Artist).toString());
CPPUNIT_ASSERT_EQUAL("Don't Go Away (Apple Lossless)"s, tags.front()->value(KnownField::Album).toString());
CPPUNIT_ASSERT_EQUAL("Alternative & Punk"s, tags.front()->value(KnownField::Genre).toString());
CPPUNIT_ASSERT_EQUAL("Lavf57.25.100"s, tags.front()->value(KnownField::Encoder).toString());
CPPUNIT_ASSERT_EQUAL("1998"s, tags.front()->value(KnownField::Year).toString());
CPPUNIT_ASSERT(tags.front()->value(KnownField::Comment).isEmpty());
//CPPUNIT_ASSERT(tags.front()->value(KnownField::Cover).dataSize() == 0x58f3);
//CPPUNIT_ASSERT(BE::toUInt64(tags.front()->value(KnownField::Cover).dataPointer()) == 0xFFD8FFE000104A46);
CPPUNIT_ASSERT(tags.front()->value(KnownField::TrackPosition).toPositionInSet() == PositionInSet(3, 4));
CPPUNIT_ASSERT(tags.front()->value(KnownField::DiskPosition).toPositionInSet() == PositionInSet(1, 1));
CPPUNIT_ASSERT_EQUAL(PositionInSet(3, 4), tags.front()->value(KnownField::TrackPosition).toPositionInSet());
CPPUNIT_ASSERT_EQUAL(PositionInSet(1, 1), tags.front()->value(KnownField::DiskPosition).toPositionInSet());
break;
case TagStatus::TestMetaDataPresent:
checkOggTestMetaData();
@ -53,21 +53,21 @@ void OverallTests::checkFlacTestfile1()
*/
void OverallTests::checkFlacTestfile2()
{
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::Ogg);
CPPUNIT_ASSERT_EQUAL(ContainerFormat::Ogg, m_fileInfo.containerFormat());
const auto tracks = m_fileInfo.tracks();
CPPUNIT_ASSERT(tracks.size() == 1);
CPPUNIT_ASSERT_EQUAL(1_st, tracks.size());
for (const auto &track : tracks) {
CPPUNIT_ASSERT(track->mediaType() == MediaType::Audio);
CPPUNIT_ASSERT(track->format() == GeneralMediaFormat::Flac);
CPPUNIT_ASSERT(track->channelCount() == 2);
CPPUNIT_ASSERT(track->samplingFrequency() == 44100);
CPPUNIT_ASSERT(track->bitsPerSample() == 16);
CPPUNIT_ASSERT(track->duration().minutes() == 4);
CPPUNIT_ASSERT_EQUAL(MediaType::Audio, track->mediaType());
CPPUNIT_ASSERT_EQUAL(GeneralMediaFormat::Flac, track->format().general);
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(2), track->channelCount());
CPPUNIT_ASSERT_EQUAL(44100u, track->samplingFrequency());
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(16), track->bitsPerSample());
CPPUNIT_ASSERT_EQUAL(4, track->duration().minutes());
}
const auto tags = m_fileInfo.tags();
switch (m_tagStatus) {
case TagStatus::Original:
CPPUNIT_ASSERT(tags.size() == 1);
CPPUNIT_ASSERT_EQUAL(1_st, tags.size());
break;
case TagStatus::TestMetaDataPresent:
checkOggTestMetaData();

View File

@ -22,48 +22,48 @@ enum TestFlag {
*/
void OverallTests::checkMp3Testfile1()
{
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::MpegAudioFrames);
CPPUNIT_ASSERT_EQUAL(ContainerFormat::MpegAudioFrames, m_fileInfo.containerFormat());
const auto tracks = m_fileInfo.tracks();
CPPUNIT_ASSERT(tracks.size() == 1);
CPPUNIT_ASSERT_EQUAL(1_st, tracks.size());
for (const auto &track : tracks) {
CPPUNIT_ASSERT(track->mediaType() == MediaType::Audio);
CPPUNIT_ASSERT(track->format() == GeneralMediaFormat::Mpeg1Audio);
CPPUNIT_ASSERT(track->format().sub == SubFormats::Mpeg1Layer3);
CPPUNIT_ASSERT(track->channelCount() == 2);
CPPUNIT_ASSERT(track->channelConfig() == static_cast<byte>(MpegChannelMode::JointStereo));
CPPUNIT_ASSERT(track->samplingFrequency() == 44100);
CPPUNIT_ASSERT(track->duration().seconds() == 3);
CPPUNIT_ASSERT_EQUAL(MediaType::Audio, track->mediaType());
CPPUNIT_ASSERT_EQUAL(GeneralMediaFormat::Mpeg1Audio, track->format().general);
CPPUNIT_ASSERT_EQUAL(static_cast<unsigned char>(SubFormats::Mpeg1Layer3), track->format().sub);
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(2), track->channelCount());
CPPUNIT_ASSERT_EQUAL(static_cast<byte>(MpegChannelMode::JointStereo), track->channelConfig());
CPPUNIT_ASSERT_EQUAL(44100u, track->samplingFrequency());
CPPUNIT_ASSERT_EQUAL(3, track->duration().seconds());
}
const auto tags = m_fileInfo.tags();
switch (m_tagStatus) {
case TagStatus::Original:
CPPUNIT_ASSERT(m_fileInfo.id3v1Tag());
CPPUNIT_ASSERT(m_fileInfo.id3v2Tags().size() == 1);
CPPUNIT_ASSERT(tags.size() == 2);
CPPUNIT_ASSERT_EQUAL(1_st, m_fileInfo.id3v2Tags().size());
CPPUNIT_ASSERT_EQUAL(2_st, tags.size());
for (const auto &tag : tags) {
CPPUNIT_ASSERT(tag->value(KnownField::TrackPosition).toPositionInSet().position() == 4);
CPPUNIT_ASSERT(tag->value(KnownField::Year).toString() == "1984");
CPPUNIT_ASSERT_EQUAL(4, tag->value(KnownField::TrackPosition).toPositionInSet().position());
CPPUNIT_ASSERT_EQUAL("1984"s, tag->value(KnownField::Year).toString());
switch (tag->type()) {
case TagType::Id3v1Tag:
CPPUNIT_ASSERT(tag->value(KnownField::Title).toString() == "Cohesion");
CPPUNIT_ASSERT(tag->value(KnownField::Artist).toString() == "Minutemen");
CPPUNIT_ASSERT(tag->value(KnownField::Album).toString() == "Double Nickels On The Dime");
CPPUNIT_ASSERT(tag->value(KnownField::Genre).toString() == "Punk Rock");
CPPUNIT_ASSERT(tag->value(KnownField::Comment).toString() == "ExactAudioCopy v0.95b4");
CPPUNIT_ASSERT_EQUAL("Cohesion"s, tag->value(KnownField::Title).toString());
CPPUNIT_ASSERT_EQUAL("Minutemen"s, tag->value(KnownField::Artist).toString());
CPPUNIT_ASSERT_EQUAL("Double Nickels On The Dime"s, tag->value(KnownField::Album).toString());
CPPUNIT_ASSERT_EQUAL("Punk Rock"s, tag->value(KnownField::Genre).toString());
CPPUNIT_ASSERT_EQUAL("ExactAudioCopy v0.95b4"s, tag->value(KnownField::Comment).toString());
break;
case TagType::Id3v2Tag:
CPPUNIT_ASSERT(tag->value(KnownField::Title).dataEncoding() == TagTextEncoding::Utf16LittleEndian);
CPPUNIT_ASSERT(tag->value(KnownField::Title).toWString() == u"Cohesion");
CPPUNIT_ASSERT(tag->value(KnownField::Title).toString(TagTextEncoding::Utf8) == "Cohesion");
CPPUNIT_ASSERT(tag->value(KnownField::Artist).toWString() == u"Minutemen");
CPPUNIT_ASSERT(tag->value(KnownField::Artist).toString(TagTextEncoding::Utf8) == "Minutemen");
CPPUNIT_ASSERT(tag->value(KnownField::Album).toWString() == u"Double Nickels On The Dime");
CPPUNIT_ASSERT(tag->value(KnownField::Album).toString(TagTextEncoding::Utf8) == "Double Nickels On The Dime");
CPPUNIT_ASSERT(tag->value(KnownField::Genre).toWString() == u"Punk Rock");
CPPUNIT_ASSERT(tag->value(KnownField::Genre).toString(TagTextEncoding::Utf8) == "Punk Rock");
CPPUNIT_ASSERT(tag->value(KnownField::Comment).toWString() == u"ExactAudioCopy v0.95b4");
CPPUNIT_ASSERT(tag->value(KnownField::Comment).toString(TagTextEncoding::Utf8) == "ExactAudioCopy v0.95b4");
CPPUNIT_ASSERT(tag->value(KnownField::TrackPosition).toPositionInSet().total() == 43);
CPPUNIT_ASSERT_EQUAL(TagTextEncoding::Utf16LittleEndian, tag->value(KnownField::Title).dataEncoding());
CPPUNIT_ASSERT_EQUAL(u"Cohesion"s, tag->value(KnownField::Title).toWString());
CPPUNIT_ASSERT_EQUAL("Cohesion"s, tag->value(KnownField::Title).toString(TagTextEncoding::Utf8));
CPPUNIT_ASSERT_EQUAL(u"Minutemen"s, tag->value(KnownField::Artist).toWString());
CPPUNIT_ASSERT_EQUAL("Minutemen"s, tag->value(KnownField::Artist).toString(TagTextEncoding::Utf8));
CPPUNIT_ASSERT_EQUAL(u"Double Nickels On The Dime"s, tag->value(KnownField::Album).toWString());
CPPUNIT_ASSERT_EQUAL("Double Nickels On The Dime"s, tag->value(KnownField::Album).toString(TagTextEncoding::Utf8));
CPPUNIT_ASSERT_EQUAL(u"Punk Rock"s, tag->value(KnownField::Genre).toWString());
CPPUNIT_ASSERT_EQUAL("Punk Rock"s, tag->value(KnownField::Genre).toString(TagTextEncoding::Utf8));
CPPUNIT_ASSERT_EQUAL(u"ExactAudioCopy v0.95b4"s, tag->value(KnownField::Comment).toWString());
CPPUNIT_ASSERT_EQUAL("ExactAudioCopy v0.95b4"s, tag->value(KnownField::Comment).toString(TagTextEncoding::Utf8));
CPPUNIT_ASSERT_EQUAL(43, tag->value(KnownField::TrackPosition).toPositionInSet().total());
CPPUNIT_ASSERT(tag->value(KnownField::Length).toTimeSpan().isNull());
CPPUNIT_ASSERT(tag->value(KnownField::Lyricist).isEmpty());
break;
@ -138,12 +138,12 @@ void OverallTests::checkMp3TestMetaData()
// test ID3v1 specific test meta data
if (id3v1Tag) {
CPPUNIT_ASSERT(id3v1Tag->value(KnownField::TrackPosition).toPositionInSet().position() == m_testPosition.toPositionInSet().position());
CPPUNIT_ASSERT_EQUAL(m_testPosition.toPositionInSet().position(), id3v1Tag->value(KnownField::TrackPosition).toPositionInSet().position());
}
// test ID3v2 specific test meta data
if (id3v2Tag) {
CPPUNIT_ASSERT(id3v2Tag->value(KnownField::TrackPosition) == m_testPosition);
CPPUNIT_ASSERT(id3v2Tag->value(KnownField::DiskPosition) == m_testPosition);
CPPUNIT_ASSERT_EQUAL(m_testPosition, id3v2Tag->value(KnownField::TrackPosition));
CPPUNIT_ASSERT_EQUAL(m_testPosition, id3v2Tag->value(KnownField::DiskPosition));
}
}
@ -157,7 +157,7 @@ void OverallTests::checkMp3PaddingConstraints()
if (!(m_mode & Id3v1Only)) {
if (m_mode & PaddingConstraints) {
if (m_mode & ForceRewring) {
CPPUNIT_ASSERT(m_fileInfo.paddingSize() == 4096);
CPPUNIT_ASSERT_EQUAL(static_cast<uint64>(4096), m_fileInfo.paddingSize());
} else {
CPPUNIT_ASSERT(m_fileInfo.paddingSize() >= 1024);
CPPUNIT_ASSERT(m_fileInfo.paddingSize() <= (4096 + 1024));

View File

@ -22,9 +22,9 @@ enum TestFlag {
*/
void OverallTests::checkMp4Testfile1()
{
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::Mp4);
CPPUNIT_ASSERT_EQUAL(ContainerFormat::Mp4, m_fileInfo.containerFormat());
const auto tracks = m_fileInfo.tracks();
CPPUNIT_ASSERT(tracks.size() == 1);
CPPUNIT_ASSERT_EQUAL(1_st, tracks.size());
for (const auto &track : tracks) {
switch (track->id()) {
case 1:
@ -63,7 +63,7 @@ void OverallTests::checkMp4Testfile1()
*/
void OverallTests::checkMp4Testfile2()
{
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::Mp4);
CPPUNIT_ASSERT_EQUAL(ContainerFormat::Mp4, m_fileInfo.containerFormat());
const auto tracks = m_fileInfo.tracks();
CPPUNIT_ASSERT_EQUAL(5_st, tracks.size());
for (const auto &track : tracks) {
@ -127,20 +127,21 @@ void OverallTests::checkMp4Testfile2()
*/
void OverallTests::checkMp4Testfile3()
{
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::Mp4);
CPPUNIT_ASSERT(m_fileInfo.container() && m_fileInfo.container()->documentType() == "dash");
CPPUNIT_ASSERT_EQUAL(ContainerFormat::Mp4, m_fileInfo.containerFormat());
CPPUNIT_ASSERT(m_fileInfo.container() != nullptr);
CPPUNIT_ASSERT_EQUAL("dash"s, m_fileInfo.container()->documentType());
const auto tracks = m_fileInfo.tracks();
CPPUNIT_ASSERT(tracks.size() == 1);
CPPUNIT_ASSERT_EQUAL(1_st, tracks.size());
for (const auto &track : tracks) {
switch (track->id()) {
case 1:
CPPUNIT_ASSERT(track->mediaType() == MediaType::Video);
CPPUNIT_ASSERT(track->format() == GeneralMediaFormat::Avc);
CPPUNIT_ASSERT(track->format().sub == SubFormats::AvcMainProfile);
CPPUNIT_ASSERT(track->version() == 3.1);
CPPUNIT_ASSERT(track->creationTime().year() == 2014);
CPPUNIT_ASSERT(track->pixelSize() == Size(854, 480));
CPPUNIT_ASSERT(!strcmp(track->chromaFormat(), "YUV 4:2:0"));
CPPUNIT_ASSERT_EQUAL(MediaType::Video, track->mediaType());
CPPUNIT_ASSERT_EQUAL(GeneralMediaFormat::Avc, track->format().general);
CPPUNIT_ASSERT_EQUAL(static_cast<unsigned char>(SubFormats::AvcMainProfile), track->format().sub);
CPPUNIT_ASSERT_EQUAL(3.1, track->version());
CPPUNIT_ASSERT_EQUAL(2014, track->creationTime().year());
CPPUNIT_ASSERT_EQUAL(Size(854, 480), track->pixelSize());
CPPUNIT_ASSERT_EQUAL("YUV 4:2:0"s, string(track->chromaFormat()));
break;
default:
CPPUNIT_FAIL("unknown track ID");
@ -176,18 +177,19 @@ void OverallTests::checkMp4Testfile3()
*/
void OverallTests::checkMp4Testfile4()
{
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::Mp4);
CPPUNIT_ASSERT(m_fileInfo.container() && m_fileInfo.container()->documentType() == "M4A ");
CPPUNIT_ASSERT_EQUAL(ContainerFormat::Mp4, m_fileInfo.containerFormat());
CPPUNIT_ASSERT(m_fileInfo.container() != nullptr);
CPPUNIT_ASSERT_EQUAL("M4A "s, m_fileInfo.container()->documentType());
const auto tracks = m_fileInfo.tracks();
CPPUNIT_ASSERT(tracks.size() == 1);
CPPUNIT_ASSERT_EQUAL(1_st, tracks.size());
for (const auto &track : tracks) {
switch (track->id()) {
case 1:
CPPUNIT_ASSERT_EQUAL(MediaType::Audio, track->mediaType());
CPPUNIT_ASSERT_EQUAL(GeneralMediaFormat::Alac, track->format().general);
CPPUNIT_ASSERT(track->creationTime().year() == 2008);
CPPUNIT_ASSERT(track->channelCount() == 2);
CPPUNIT_ASSERT(track->bitsPerSample() == 16);
CPPUNIT_ASSERT_EQUAL(2008, track->creationTime().year());
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(2), track->channelCount());
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(16), track->bitsPerSample());
break;
default:
CPPUNIT_FAIL("unknown track ID");
@ -197,17 +199,17 @@ void OverallTests::checkMp4Testfile4()
switch (m_tagStatus) {
case TagStatus::Original:
CPPUNIT_ASSERT_EQUAL(1_st, tags.size());
CPPUNIT_ASSERT(tags.front()->value(KnownField::Title).toString() == "Sad Song");
CPPUNIT_ASSERT(tags.front()->value(KnownField::Artist).toString() == "Oasis");
CPPUNIT_ASSERT(tags.front()->value(KnownField::Album).toString() == "Don't Go Away (Apple Lossless)");
CPPUNIT_ASSERT(tags.front()->value(KnownField::Genre).toString() == "Alternative & Punk");
CPPUNIT_ASSERT(tags.front()->value(KnownField::Encoder).toString() == "iTunes v7.5.0.20");
CPPUNIT_ASSERT(tags.front()->value(KnownField::Year).toString() == "1998");
CPPUNIT_ASSERT_EQUAL("Sad Song"s, tags.front()->value(KnownField::Title).toString());
CPPUNIT_ASSERT_EQUAL("Oasis"s, tags.front()->value(KnownField::Artist).toString());
CPPUNIT_ASSERT_EQUAL("Don't Go Away (Apple Lossless)"s, tags.front()->value(KnownField::Album).toString());
CPPUNIT_ASSERT_EQUAL("Alternative & Punk"s, tags.front()->value(KnownField::Genre).toString());
CPPUNIT_ASSERT_EQUAL("iTunes v7.5.0.20"s, tags.front()->value(KnownField::Encoder).toString());
CPPUNIT_ASSERT_EQUAL("1998"s, tags.front()->value(KnownField::Year).toString());
CPPUNIT_ASSERT(tags.front()->value(KnownField::Comment).isEmpty());
CPPUNIT_ASSERT(tags.front()->value(KnownField::Cover).dataSize() == 0x58f3);
CPPUNIT_ASSERT(BE::toUInt64(tags.front()->value(KnownField::Cover).dataPointer()) == 0xFFD8FFE000104A46);
CPPUNIT_ASSERT(tags.front()->value(KnownField::TrackPosition).toPositionInSet() == PositionInSet(3, 4));
CPPUNIT_ASSERT(tags.front()->value(KnownField::DiskPosition).toPositionInSet() == PositionInSet(1, 1));
CPPUNIT_ASSERT_EQUAL(0x58f3_st, tags.front()->value(KnownField::Cover).dataSize());
CPPUNIT_ASSERT_EQUAL(0xFFD8FFE000104A46ul, BE::toUInt64(tags.front()->value(KnownField::Cover).dataPointer()));
CPPUNIT_ASSERT_EQUAL(PositionInSet(3, 4), tags.front()->value(KnownField::TrackPosition).toPositionInSet());
CPPUNIT_ASSERT_EQUAL(PositionInSet(1, 1), tags.front()->value(KnownField::DiskPosition).toPositionInSet());
break;
case TagStatus::TestMetaDataPresent:
checkMp4TestMetaData();
@ -223,10 +225,11 @@ void OverallTests::checkMp4Testfile4()
*/
void OverallTests::checkMp4Testfile5()
{
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::Mp4);
CPPUNIT_ASSERT(m_fileInfo.container() && m_fileInfo.container()->documentType() == "mp42");
CPPUNIT_ASSERT_EQUAL(ContainerFormat::Mp4, m_fileInfo.containerFormat());
CPPUNIT_ASSERT(m_fileInfo.container() != nullptr);
CPPUNIT_ASSERT_EQUAL("mp42"s, m_fileInfo.container()->documentType());
const auto tracks = m_fileInfo.tracks();
CPPUNIT_ASSERT(tracks.size() == 1);
CPPUNIT_ASSERT_EQUAL(1_st, tracks.size());
for (const auto &track : tracks) {
switch (track->id()) {
case 1:
@ -235,13 +238,13 @@ void OverallTests::checkMp4Testfile5()
CPPUNIT_ASSERT_EQUAL(static_cast<unsigned char>(SubFormats::AacMpeg4LowComplexityProfile), track->format().sub);
CPPUNIT_ASSERT(track->format().extension & ExtensionFormats::SpectralBandReplication);
CPPUNIT_ASSERT(track->format().extension & ExtensionFormats::ParametricStereo);
CPPUNIT_ASSERT(track->creationTime().year() == 2014);
CPPUNIT_ASSERT(track->channelCount() == 2);
CPPUNIT_ASSERT(track->channelConfig() == Mpeg4ChannelConfigs::FrontCenter);
CPPUNIT_ASSERT(track->extensionChannelConfig() == Mpeg4ChannelConfigs::FrontLeftFrontRight);
CPPUNIT_ASSERT(track->samplingFrequency() == 24000);
CPPUNIT_ASSERT(track->extensionSamplingFrequency() == 48000);
CPPUNIT_ASSERT(track->bitsPerSample() == 16);
CPPUNIT_ASSERT_EQUAL(2014, track->creationTime().year());
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(2), track->channelCount());
CPPUNIT_ASSERT_EQUAL(static_cast<byte>(Mpeg4ChannelConfigs::FrontCenter), track->channelConfig());
CPPUNIT_ASSERT_EQUAL(static_cast<byte>(Mpeg4ChannelConfigs::FrontLeftFrontRight), track->extensionChannelConfig());
CPPUNIT_ASSERT_EQUAL(24000u, track->samplingFrequency());
CPPUNIT_ASSERT_EQUAL(48000u, track->extensionSamplingFrequency());
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(16), track->bitsPerSample());
break;
default:
CPPUNIT_FAIL("unknown track ID");
@ -266,7 +269,7 @@ void OverallTests::checkMp4Testfile5()
*/
void OverallTests::checkMp4Testfile6()
{
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::Mp4);
CPPUNIT_ASSERT_EQUAL(ContainerFormat::Mp4, m_fileInfo.containerFormat());
const auto tracks = m_fileInfo.tracks();
if (m_mode & Mp4TestFlags::RemoveTagOrTrack) {
CPPUNIT_ASSERT_EQUAL(4_st, tracks.size());
@ -282,7 +285,7 @@ void OverallTests::checkMp4Testfile6()
CPPUNIT_ASSERT_EQUAL(static_cast<unsigned char>(SubFormats::AvcHighProfile), track->format().sub);
CPPUNIT_ASSERT_EQUAL(4.0, track->version());
CPPUNIT_ASSERT_EQUAL(2013, track->creationTime().year());
CPPUNIT_ASSERT(track->pixelSize() == Size(1920, 750));
CPPUNIT_ASSERT_EQUAL(Size(1920, 750), track->pixelSize());
break;
case 2:
CPPUNIT_ASSERT(track2Present = !track2Present);

View File

@ -10,21 +10,21 @@
*/
void OverallTests::checkOggTestfile1()
{
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::Ogg);
CPPUNIT_ASSERT_EQUAL(ContainerFormat::Ogg, m_fileInfo.containerFormat());
const auto tracks = m_fileInfo.tracks();
CPPUNIT_ASSERT(tracks.size() == 2);
CPPUNIT_ASSERT_EQUAL(2_st, tracks.size());
for (const auto &track : tracks) {
switch (track->id()) {
case 897658443:
CPPUNIT_ASSERT(track->mediaType() == MediaType::Video);
CPPUNIT_ASSERT(track->format() == GeneralMediaFormat::Theora);
CPPUNIT_ASSERT_EQUAL(MediaType::Video, track->mediaType());
CPPUNIT_ASSERT_EQUAL(GeneralMediaFormat::Theora, track->format().general);
break;
case 1755441791:
CPPUNIT_ASSERT(track->mediaType() == MediaType::Audio);
CPPUNIT_ASSERT(track->format() == GeneralMediaFormat::Vorbis);
CPPUNIT_ASSERT(track->channelCount() == 2);
CPPUNIT_ASSERT(track->samplingFrequency() == 44100);
CPPUNIT_ASSERT(track->duration().minutes() == 4);
CPPUNIT_ASSERT_EQUAL(MediaType::Audio, track->mediaType());
CPPUNIT_ASSERT_EQUAL(GeneralMediaFormat::Vorbis, track->format().general);
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(2), track->channelCount());
CPPUNIT_ASSERT_EQUAL(44100u, track->samplingFrequency());
CPPUNIT_ASSERT_EQUAL(4, track->duration().minutes());
break;
default:
CPPUNIT_FAIL("unknown track ID");
@ -54,17 +54,17 @@ void OverallTests::checkOggTestfile1()
*/
void OverallTests::checkOggTestfile2()
{
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::Ogg);
CPPUNIT_ASSERT_EQUAL(ContainerFormat::Ogg, m_fileInfo.containerFormat());
const auto tracks = m_fileInfo.tracks();
CPPUNIT_ASSERT(tracks.size() == 1);
CPPUNIT_ASSERT_EQUAL(1_st, tracks.size());
for (const auto &track : tracks) {
switch (track->id()) {
case 1375632254:
CPPUNIT_ASSERT(track->mediaType() == MediaType::Audio);
CPPUNIT_ASSERT(track->format() == GeneralMediaFormat::Opus);
CPPUNIT_ASSERT(track->channelCount() == 2);
CPPUNIT_ASSERT(track->samplingFrequency() == 48000);
CPPUNIT_ASSERT(track->duration().minutes() == 1);
CPPUNIT_ASSERT_EQUAL(MediaType::Audio, track->mediaType());
CPPUNIT_ASSERT_EQUAL(GeneralMediaFormat::Opus, track->format().general);
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(2), track->channelCount());
CPPUNIT_ASSERT_EQUAL(48000u, track->samplingFrequency());
CPPUNIT_ASSERT_EQUAL(1, track->duration().minutes());
break;
default:
CPPUNIT_FAIL("unknown track ID");
@ -94,7 +94,7 @@ void OverallTests::checkOggTestMetaData()
{
// check whether a tag is assigned
const auto tags = m_fileInfo.tags();
VorbisComment *tag = m_fileInfo.vorbisComment();
const auto *const tag = m_fileInfo.vorbisComment();
CPPUNIT_ASSERT_EQUAL(1_st, tags.size());
CPPUNIT_ASSERT(tag != nullptr);
@ -112,7 +112,7 @@ void OverallTests::checkOggTestMetaData()
void OverallTests::setOggTestMetaData()
{
// ensure a tag exists
VorbisComment *tag = m_fileInfo.createVorbisComment();
auto *const tag = m_fileInfo.createVorbisComment();
// assign test meta data
tag->setValue(KnownField::Title, m_testTitle);