Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compiling tests under 32-bit arch

This commit is contained in:
Martchus 2017-05-30 23:59:23 +02:00
parent 79845b96dc
commit b88672e32f
4 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -177,7 +177,7 @@ set(META_NO_TIDY ON)
set(META_REQUIRED_CPP_UNIT_VERSION 1.14.0)
# find c++utilities
find_package(c++utilities 4.7.0 REQUIRED)
find_package(c++utilities 4.8.0 REQUIRED)
use_cpp_utilities()
# find 3rd party libraries

1
tests/overall.h
View File

@ -17,6 +17,7 @@ using namespace std;
using namespace ConversionUtilities;
using namespace IoUtilities;
using namespace TestUtilities;
using namespace TestUtilities::Literals;
using namespace Media;
using namespace CPPUNIT_NS;

20
tests/overallmkv.cpp
View File

@ -362,7 +362,7 @@ void OverallTests::checkMkvTestfileHandbrakeChapters()
{
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::Matroska);
const auto tracks = m_fileInfo.tracks();
CPPUNIT_ASSERT_EQUAL(2ul, tracks.size());
CPPUNIT_ASSERT_EQUAL(2_st, tracks.size());
for(const auto &track : tracks) {
switch(track->id()) {
case 1:
@ -384,7 +384,7 @@ void OverallTests::checkMkvTestfileHandbrakeChapters()
}
}
const auto chapters = m_fileInfo.chapters();
CPPUNIT_ASSERT_EQUAL(2ul, chapters.size());
CPPUNIT_ASSERT_EQUAL(2_st, chapters.size());
for(const auto &chapter : chapters) {
switch(chapter->id()) {
case 1:
@ -404,11 +404,11 @@ void OverallTests::checkMkvTestfileHandbrakeChapters()
const auto tags = m_fileInfo.tags();
switch(m_tagStatus) {
case TagStatus::Original:
CPPUNIT_ASSERT_EQUAL(2ul, tags.size());
CPPUNIT_ASSERT_EQUAL(2_st, tags.size());
CPPUNIT_ASSERT(tags[0]->target().isEmpty());
CPPUNIT_ASSERT_EQUAL(""s, static_cast<MatroskaTag *>(tags[0])->value("CREATION_TIME").toString());
CPPUNIT_ASSERT_EQUAL("Lavf55.12.0"s, tags[0]->value(KnownField::Encoder).toString());
CPPUNIT_ASSERT_EQUAL(2ul, tags[1]->target().tracks().at(0));
CPPUNIT_ASSERT_EQUAL(2_st, tags[1]->target().tracks().at(0));
CPPUNIT_ASSERT_EQUAL("eng"s, tags[1]->value(KnownField::Language).toString());
break;
case TagStatus::TestMetaDataPresent:
@ -430,7 +430,7 @@ void OverallTests::checkMkvTestfileNestedTags()
switch(m_tagStatus) {
case TagStatus::Original:
case TagStatus::TestMetaDataPresent:
CPPUNIT_ASSERT_EQUAL(5ul, tags.size());
CPPUNIT_ASSERT_EQUAL(5_st, tags.size());
for(const Tag *tag : tags) {
CPPUNIT_ASSERT(tag->type() == TagType::MatroskaTag);
const auto *mkvTag = static_cast<const MatroskaTag *>(tag);
@ -443,7 +443,7 @@ void OverallTests::checkMkvTestfileNestedTags()
CPPUNIT_ASSERT(artistField != fields.end());
CPPUNIT_ASSERT_EQUAL("Test artist"s, artistField->second.value().toString());
const auto &nestedFields = artistField->second.nestedFields();
CPPUNIT_ASSERT_EQUAL(1ul, nestedFields.size());
CPPUNIT_ASSERT_EQUAL(1_st, nestedFields.size());
CPPUNIT_ASSERT_EQUAL("ADDRESS"s, nestedFields[0].idToString());
CPPUNIT_ASSERT_EQUAL("Test address"s, nestedFields[0].value().toString());
}
@ -463,11 +463,11 @@ void OverallTests::checkMkvTestMetaData()
// check tags
const auto tags = m_fileInfo.tags();
const auto tracks = m_fileInfo.tracks();
CPPUNIT_ASSERT_EQUAL(2ul, tags.size());
CPPUNIT_ASSERT_EQUAL(2_st, tags.size());
CPPUNIT_ASSERT_EQUAL(m_testTitle.toString(), tags.front()->value(KnownField::Title).toString());
CPPUNIT_ASSERT(tags.front()->value(KnownField::Artist).isEmpty());
CPPUNIT_ASSERT_EQUAL(m_testComment.toString(), tags.front()->value(KnownField::Comment).toString());
CPPUNIT_ASSERT_EQUAL(30ul, tags[1]->target().level());
CPPUNIT_ASSERT_EQUAL(30_st, tags[1]->target().level());
CPPUNIT_ASSERT_EQUAL(tracks.at(0)->id(), tags[1]->target().tracks().at(0));
CPPUNIT_ASSERT_EQUAL(m_testAlbum.toString(), tags[1]->value(KnownField::Album).toString());
CPPUNIT_ASSERT_EQUAL(m_testPartNumber.toInteger(), tags[1]->value(KnownField::PartNumber).toInteger());
@ -475,7 +475,7 @@ void OverallTests::checkMkvTestMetaData()
// check attachments
const auto attachments = m_fileInfo.attachments();
CPPUNIT_ASSERT_EQUAL(1ul, attachments.size());
CPPUNIT_ASSERT_EQUAL(1_st, attachments.size());
CPPUNIT_ASSERT(attachments[0]->mimeType() == "image/png");
CPPUNIT_ASSERT(attachments[0]->name() == "cover.jpg");
const StreamDataBlock *attachmentData = attachments[0]->data();
@ -501,7 +501,7 @@ void OverallTests::checkMkvConstraints()
CPPUNIT_ASSERT(m_fileInfo.container());
if(m_mode & PaddingConstraints) {
if(m_mode & ForceRewring) {
CPPUNIT_ASSERT_EQUAL(4096ul, m_fileInfo.paddingSize());
CPPUNIT_ASSERT_EQUAL(4096_st, m_fileInfo.paddingSize());
} else {
CPPUNIT_ASSERT(m_fileInfo.paddingSize() >= 1024);
CPPUNIT_ASSERT(m_fileInfo.paddingSize() <= (4096 + 1024));

10
tests/overallmp4.cpp
View File

@ -64,7 +64,7 @@ void OverallTests::checkMp4Testfile2()
{
CPPUNIT_ASSERT(m_fileInfo.containerFormat() == ContainerFormat::Mp4);
const auto tracks = m_fileInfo.tracks();
CPPUNIT_ASSERT_EQUAL(5ul, tracks.size());
CPPUNIT_ASSERT_EQUAL(5_st, tracks.size());
for(const auto &track : tracks) {
switch(track->id()) {
case 1:
@ -110,13 +110,13 @@ void OverallTests::checkMp4Testfile2()
const auto tags = m_fileInfo.tags();
switch(m_tagStatus) {
case TagStatus::Original:
CPPUNIT_ASSERT_EQUAL(0ul, tags.size());
CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
break;
case TagStatus::TestMetaDataPresent:
checkMp4TestMetaData();
break;
case TagStatus::Removed:
CPPUNIT_ASSERT_EQUAL(0ul, tags.size());
CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
}
}
@ -353,7 +353,7 @@ void OverallTests::checkMp4Constraints()
CPPUNIT_ASSERT(m_fileInfo.container());
if(m_mode & PaddingConstraints) {
if(m_mode & ForceRewring) {
CPPUNIT_ASSERT_EQUAL(4096ul, m_fileInfo.paddingSize());
CPPUNIT_ASSERT_EQUAL(4096_st, m_fileInfo.paddingSize());
} else {
CPPUNIT_ASSERT(m_fileInfo.paddingSize() >= 1024);
CPPUNIT_ASSERT(m_fileInfo.paddingSize() <= (4096 + 1024));
@ -397,7 +397,7 @@ void OverallTests::addMp4Track()
CPPUNIT_ASSERT_EQUAL(ContainerFormat::Mp4, m_additionalFileInfo.containerFormat());
CPPUNIT_ASSERT_EQUAL(ContainerFormat::Mp4, m_fileInfo.containerFormat());
const auto &tracks = m_additionalFileInfo.tracks();
CPPUNIT_ASSERT_EQUAL(1ul, tracks.size());
CPPUNIT_ASSERT_EQUAL(1_st, tracks.size());
CPPUNIT_ASSERT_EQUAL(TrackType::Mp4Track, tracks[0]->type());
auto *track = static_cast<Mp4Track *>(tracks[0]);
CPPUNIT_ASSERT(static_cast<Mp4Container *>(m_additionalFileInfo.container())->removeTrack(track));