Skip to content

Commit b58eac9

Browse files
MartchusMartchus
committed
Use CPPUNIT_ASSERT_EQUAL in tests where possible
1 parent e29f9bd commit b58eac9

File tree

4 files changed

+122
-119
lines changed

4 files changed

+122
-119
lines changed

‎tests/overallflac.cpp

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,33 @@
99
*/
1010
void OverallTests::checkFlacTestfile1()
1111
{
12-
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::Flac);
12+
CPPUNIT_ASSERT_EQUAL(ContainerFormat::Flac, m_fileInfo.containerFormat());
1313
const auto tracks = m_fileInfo.tracks();
14-
CPPUNIT_ASSERT(tracks.size() == 1);
14+
CPPUNIT_ASSERT_EQUAL(1_st, tracks.size());
1515
for (const auto &track : tracks) {
16-
CPPUNIT_ASSERT(track->mediaType() == MediaType::Audio);
17-
CPPUNIT_ASSERT(track->format() == GeneralMediaFormat::Flac);
18-
CPPUNIT_ASSERT(track->channelCount() == 2);
19-
CPPUNIT_ASSERT(track->samplingFrequency() == 44100);
20-
CPPUNIT_ASSERT(track->bitsPerSample() == 16);
21-
CPPUNIT_ASSERT(track->duration().minutes() == 4);
16+
CPPUNIT_ASSERT_EQUAL(MediaType::Audio, track->mediaType());
17+
CPPUNIT_ASSERT_EQUAL(GeneralMediaFormat::Flac, track->format().general);
18+
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(2), track->channelCount());
19+
CPPUNIT_ASSERT_EQUAL(44100u, track->samplingFrequency());
20+
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(16), track->bitsPerSample());
21+
CPPUNIT_ASSERT_EQUAL(4, track->duration().minutes());
2222
}
2323
const auto tags = m_fileInfo.tags();
2424
switch (m_tagStatus) {
2525
case TagStatus::Original:
2626
// ffmpeg is able to set some tags from the original file (mtx-test-data/alac/othertest-itunes.m4a)
27-
CPPUNIT_ASSERT(tags.size() == 1);
28-
CPPUNIT_ASSERT(tags.front()->value(KnownField::Title).toString() == "Sad Song");
29-
CPPUNIT_ASSERT(tags.front()->value(KnownField::Artist).toString() == "Oasis");
30-
CPPUNIT_ASSERT(tags.front()->value(KnownField::Album).toString() == "Don't Go Away (Apple Lossless)");
31-
CPPUNIT_ASSERT(tags.front()->value(KnownField::Genre).toString() == "Alternative & Punk");
32-
CPPUNIT_ASSERT(tags.front()->value(KnownField::Encoder).toString() == "Lavf57.25.100");
33-
CPPUNIT_ASSERT(tags.front()->value(KnownField::Year).toString() == "1998");
27+
CPPUNIT_ASSERT_EQUAL(1_st, tags.size());
28+
CPPUNIT_ASSERT_EQUAL("Sad Song"s, tags.front()->value(KnownField::Title).toString());
29+
CPPUNIT_ASSERT_EQUAL("Oasis"s, tags.front()->value(KnownField::Artist).toString());
30+
CPPUNIT_ASSERT_EQUAL("Don't Go Away (Apple Lossless)"s, tags.front()->value(KnownField::Album).toString());
31+
CPPUNIT_ASSERT_EQUAL("Alternative & Punk"s, tags.front()->value(KnownField::Genre).toString());
32+
CPPUNIT_ASSERT_EQUAL("Lavf57.25.100"s, tags.front()->value(KnownField::Encoder).toString());
33+
CPPUNIT_ASSERT_EQUAL("1998"s, tags.front()->value(KnownField::Year).toString());
3434
CPPUNIT_ASSERT(tags.front()->value(KnownField::Comment).isEmpty());
3535
//CPPUNIT_ASSERT(tags.front()->value(KnownField::Cover).dataSize() == 0x58f3);
3636
//CPPUNIT_ASSERT(BE::toUInt64(tags.front()->value(KnownField::Cover).dataPointer()) == 0xFFD8FFE000104A46);
37-
CPPUNIT_ASSERT(tags.front()->value(KnownField::TrackPosition).toPositionInSet() == PositionInSet(3, 4));
38-
CPPUNIT_ASSERT(tags.front()->value(KnownField::DiskPosition).toPositionInSet() == PositionInSet(1, 1));
37+
CPPUNIT_ASSERT_EQUAL(PositionInSet(3, 4), tags.front()->value(KnownField::TrackPosition).toPositionInSet());
38+
CPPUNIT_ASSERT_EQUAL(PositionInSet(1, 1), tags.front()->value(KnownField::DiskPosition).toPositionInSet());
3939
break;
4040
case TagStatus::TestMetaDataPresent:
4141
checkOggTestMetaData();
@@ -53,21 +53,21 @@ void OverallTests::checkFlacTestfile1()
5353
*/
5454
void OverallTests::checkFlacTestfile2()
5555
{
56-
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::Ogg);
56+
CPPUNIT_ASSERT_EQUAL(ContainerFormat::Ogg, m_fileInfo.containerFormat());
5757
const auto tracks = m_fileInfo.tracks();
58-
CPPUNIT_ASSERT(tracks.size() == 1);
58+
CPPUNIT_ASSERT_EQUAL(1_st, tracks.size());
5959
for (const auto &track : tracks) {
60-
CPPUNIT_ASSERT(track->mediaType() == MediaType::Audio);
61-
CPPUNIT_ASSERT(track->format() == GeneralMediaFormat::Flac);
62-
CPPUNIT_ASSERT(track->channelCount() == 2);
63-
CPPUNIT_ASSERT(track->samplingFrequency() == 44100);
64-
CPPUNIT_ASSERT(track->bitsPerSample() == 16);
65-
CPPUNIT_ASSERT(track->duration().minutes() == 4);
60+
CPPUNIT_ASSERT_EQUAL(MediaType::Audio, track->mediaType());
61+
CPPUNIT_ASSERT_EQUAL(GeneralMediaFormat::Flac, track->format().general);
62+
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(2), track->channelCount());
63+
CPPUNIT_ASSERT_EQUAL(44100u, track->samplingFrequency());
64+
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(16), track->bitsPerSample());
65+
CPPUNIT_ASSERT_EQUAL(4, track->duration().minutes());
6666
}
6767
const auto tags = m_fileInfo.tags();
6868
switch (m_tagStatus) {
6969
case TagStatus::Original:
70-
CPPUNIT_ASSERT(tags.size() == 1);
70+
CPPUNIT_ASSERT_EQUAL(1_st, tags.size());
7171
break;
7272
case TagStatus::TestMetaDataPresent:
7373
checkOggTestMetaData();

‎tests/overallmp3.cpp

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,48 +22,48 @@ enum TestFlag {
2222
*/
2323
void OverallTests::checkMp3Testfile1()
2424
{
25-
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::MpegAudioFrames);
25+
CPPUNIT_ASSERT_EQUAL(ContainerFormat::MpegAudioFrames, m_fileInfo.containerFormat());
2626
const auto tracks = m_fileInfo.tracks();
27-
CPPUNIT_ASSERT(tracks.size() == 1);
27+
CPPUNIT_ASSERT_EQUAL(1_st, tracks.size());
2828
for (const auto &track : tracks) {
29-
CPPUNIT_ASSERT(track->mediaType() == MediaType::Audio);
30-
CPPUNIT_ASSERT(track->format() == GeneralMediaFormat::Mpeg1Audio);
31-
CPPUNIT_ASSERT(track->format().sub == SubFormats::Mpeg1Layer3);
32-
CPPUNIT_ASSERT(track->channelCount() == 2);
33-
CPPUNIT_ASSERT(track->channelConfig() == static_cast<byte>(MpegChannelMode::JointStereo));
34-
CPPUNIT_ASSERT(track->samplingFrequency() == 44100);
35-
CPPUNIT_ASSERT(track->duration().seconds() == 3);
29+
CPPUNIT_ASSERT_EQUAL(MediaType::Audio, track->mediaType());
30+
CPPUNIT_ASSERT_EQUAL(GeneralMediaFormat::Mpeg1Audio, track->format().general);
31+
CPPUNIT_ASSERT_EQUAL(static_cast<unsigned char>(SubFormats::Mpeg1Layer3), track->format().sub);
32+
CPPUNIT_ASSERT_EQUAL(static_cast<uint16>(2), track->channelCount());
33+
CPPUNIT_ASSERT_EQUAL(static_cast<byte>(MpegChannelMode::JointStereo), track->channelConfig());
34+
CPPUNIT_ASSERT_EQUAL(44100u, track->samplingFrequency());
35+
CPPUNIT_ASSERT_EQUAL(3, track->duration().seconds());
3636
}
3737
const auto tags = m_fileInfo.tags();
3838
switch (m_tagStatus) {
3939
case TagStatus::Original:
4040
CPPUNIT_ASSERT(m_fileInfo.id3v1Tag());
41-
CPPUNIT_ASSERT(m_fileInfo.id3v2Tags().size() == 1);
42-
CPPUNIT_ASSERT(tags.size() == 2);
41+
CPPUNIT_ASSERT_EQUAL(1_st, m_fileInfo.id3v2Tags().size());
42+
CPPUNIT_ASSERT_EQUAL(2_st, tags.size());
4343
for (const auto &tag : tags) {
44-
CPPUNIT_ASSERT(tag->value(KnownField::TrackPosition).toPositionInSet().position() == 4);
45-
CPPUNIT_ASSERT(tag->value(KnownField::Year).toString() == "1984");
44+
CPPUNIT_ASSERT_EQUAL(4, tag->value(KnownField::TrackPosition).toPositionInSet().position());
45+
CPPUNIT_ASSERT_EQUAL("1984"s, tag->value(KnownField::Year).toString());
4646
switch (tag->type()) {
4747
case TagType::Id3v1Tag:
48-
CPPUNIT_ASSERT(tag->value(KnownField::Title).toString() == "Cohesion");
49-
CPPUNIT_ASSERT(tag->value(KnownField::Artist).toString() == "Minutemen");
50-
CPPUNIT_ASSERT(tag->value(KnownField::Album).toString() == "Double Nickels On The Dime");
51-
CPPUNIT_ASSERT(tag->value(KnownField::Genre).toString() == "Punk Rock");
52-
CPPUNIT_ASSERT(tag->value(KnownField::Comment).toString() == "ExactAudioCopy v0.95b4");
48+
CPPUNIT_ASSERT_EQUAL("Cohesion"s, tag->value(KnownField::Title).toString());
49+
CPPUNIT_ASSERT_EQUAL("Minutemen"s, tag->value(KnownField::Artist).toString());
50+
CPPUNIT_ASSERT_EQUAL("Double Nickels On The Dime"s, tag->value(KnownField::Album).toString());
51+
CPPUNIT_ASSERT_EQUAL("Punk Rock"s, tag->value(KnownField::Genre).toString());
52+
CPPUNIT_ASSERT_EQUAL("ExactAudioCopy v0.95b4"s, tag->value(KnownField::Comment).toString());
5353
break;
5454
case TagType::Id3v2Tag:
55-
CPPUNIT_ASSERT(tag->value(KnownField::Title).dataEncoding() == TagTextEncoding::Utf16LittleEndian);
56-
CPPUNIT_ASSERT(tag->value(KnownField::Title).toWString() == u"Cohesion");
57-
CPPUNIT_ASSERT(tag->value(KnownField::Title).toString(TagTextEncoding::Utf8) == "Cohesion");
58-
CPPUNIT_ASSERT(tag->value(KnownField::Artist).toWString() == u"Minutemen");
59-
CPPUNIT_ASSERT(tag->value(KnownField::Artist).toString(TagTextEncoding::Utf8) == "Minutemen");
60-
CPPUNIT_ASSERT(tag->value(KnownField::Album).toWString() == u"Double Nickels On The Dime");
61-
CPPUNIT_ASSERT(tag->value(KnownField::Album).toString(TagTextEncoding::Utf8) == "Double Nickels On The Dime");
62-
CPPUNIT_ASSERT(tag->value(KnownField::Genre).toWString() == u"Punk Rock");
63-
CPPUNIT_ASSERT(tag->value(KnownField::Genre).toString(TagTextEncoding::Utf8) == "Punk Rock");
64-
CPPUNIT_ASSERT(tag->value(KnownField::Comment).toWString() == u"ExactAudioCopy v0.95b4");
65-
CPPUNIT_ASSERT(tag->value(KnownField::Comment).toString(TagTextEncoding::Utf8) == "ExactAudioCopy v0.95b4");
66-
CPPUNIT_ASSERT(tag->value(KnownField::TrackPosition).toPositionInSet().total() == 43);
55+
CPPUNIT_ASSERT_EQUAL(TagTextEncoding::Utf16LittleEndian, tag->value(KnownField::Title).dataEncoding());
56+
CPPUNIT_ASSERT_EQUAL(u"Cohesion"s, tag->value(KnownField::Title).toWString());
57+
CPPUNIT_ASSERT_EQUAL("Cohesion"s, tag->value(KnownField::Title).toString(TagTextEncoding::Utf8));
58+
CPPUNIT_ASSERT_EQUAL(u"Minutemen"s, tag->value(KnownField::Artist).toWString());
59+
CPPUNIT_ASSERT_EQUAL("Minutemen"s, tag->value(KnownField::Artist).toString(TagTextEncoding::Utf8));
60+
CPPUNIT_ASSERT_EQUAL(u"Double Nickels On The Dime"s, tag->value(KnownField::Album).toWString());
61+
CPPUNIT_ASSERT_EQUAL("Double Nickels On The Dime"s, tag->value(KnownField::Album).toString(TagTextEncoding::Utf8));
62+
CPPUNIT_ASSERT_EQUAL(u"Punk Rock"s, tag->value(KnownField::Genre).toWString());
63+
CPPUNIT_ASSERT_EQUAL("Punk Rock"s, tag->value(KnownField::Genre).toString(TagTextEncoding::Utf8));
64+
CPPUNIT_ASSERT_EQUAL(u"ExactAudioCopy v0.95b4"s, tag->value(KnownField::Comment).toWString());
65+
CPPUNIT_ASSERT_EQUAL("ExactAudioCopy v0.95b4"s, tag->value(KnownField::Comment).toString(TagTextEncoding::Utf8));
66+
CPPUNIT_ASSERT_EQUAL(43, tag->value(KnownField::TrackPosition).toPositionInSet().total());
6767
CPPUNIT_ASSERT(tag->value(KnownField::Length).toTimeSpan().isNull());
6868
CPPUNIT_ASSERT(tag->value(KnownField::Lyricist).isEmpty());
6969
break;
@@ -138,12 +138,12 @@ void OverallTests::checkMp3TestMetaData()
138138

139139
// test ID3v1 specific test meta data
140140
if (id3v1Tag) {
141-
CPPUNIT_ASSERT(id3v1Tag->value(KnownField::TrackPosition).toPositionInSet().position() == m_testPosition.toPositionInSet().position());
141+
CPPUNIT_ASSERT_EQUAL(m_testPosition.toPositionInSet().position(), id3v1Tag->value(KnownField::TrackPosition).toPositionInSet().position());
142142
}
143143
// test ID3v2 specific test meta data
144144
if (id3v2Tag) {
145-
CPPUNIT_ASSERT(id3v2Tag->value(KnownField::TrackPosition) == m_testPosition);
146-
CPPUNIT_ASSERT(id3v2Tag->value(KnownField::DiskPosition) == m_testPosition);
145+
CPPUNIT_ASSERT_EQUAL(m_testPosition, id3v2Tag->value(KnownField::TrackPosition));
146+
CPPUNIT_ASSERT_EQUAL(m_testPosition, id3v2Tag->value(KnownField::DiskPosition));
147147
}
148148
}
149149

@@ -157,7 +157,7 @@ void OverallTests::checkMp3PaddingConstraints()
157157
if (!(m_mode & Id3v1Only)) {
158158
if (m_mode & PaddingConstraints) {
159159
if (m_mode & ForceRewring) {
160-
CPPUNIT_ASSERT(m_fileInfo.paddingSize() == 4096);
160+
CPPUNIT_ASSERT_EQUAL(static_cast<uint64>(4096), m_fileInfo.paddingSize());
161161
} else {
162162
CPPUNIT_ASSERT(m_fileInfo.paddingSize() >= 1024);
163163
CPPUNIT_ASSERT(m_fileInfo.paddingSize() <= (4096 + 1024));

0 commit comments

Comments
 (0)