Fix tests

This commit is contained in:
Martchus 2017-06-19 13:54:23 +02:00
parent 99b177a9ff
commit c120b117c0
4 changed files with 9 additions and 9 deletions

View File

@ -41,7 +41,7 @@ void OverallTests::checkFlacTestfile1()
checkOggTestMetaData(); checkOggTestMetaData();
break; break;
case TagStatus::Removed: case TagStatus::Removed:
CPPUNIT_ASSERT_EQUAL(0_st, tracks.size()); CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
} }
} }
@ -71,7 +71,7 @@ void OverallTests::checkFlacTestfile2()
checkOggTestMetaData(); checkOggTestMetaData();
break; break;
case TagStatus::Removed: case TagStatus::Removed:
CPPUNIT_ASSERT_EQUAL(0_st, tracks.size()); CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
} }
} }

View File

@ -147,13 +147,13 @@ void OverallTests::checkMp4Testfile3()
const auto tags = m_fileInfo.tags(); const auto tags = m_fileInfo.tags();
switch(m_tagStatus) { switch(m_tagStatus) {
case TagStatus::Original: case TagStatus::Original:
CPPUNIT_ASSERT_EQUAL(0_st, tracks.size()); CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
break; break;
case TagStatus::TestMetaDataPresent: case TagStatus::TestMetaDataPresent:
checkMp4TestMetaData(); checkMp4TestMetaData();
break; break;
case TagStatus::Removed: case TagStatus::Removed:
CPPUNIT_ASSERT_EQUAL(0_st, tracks.size()); CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
} }
} }
@ -235,13 +235,13 @@ void OverallTests::checkMp4Testfile5()
const auto tags = m_fileInfo.tags(); const auto tags = m_fileInfo.tags();
switch(m_tagStatus) { switch(m_tagStatus) {
case TagStatus::Original: case TagStatus::Original:
CPPUNIT_ASSERT_EQUAL(0_st, tracks.size()); CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
break; break;
case TagStatus::TestMetaDataPresent: case TagStatus::TestMetaDataPresent:
checkMp4TestMetaData(); checkMp4TestMetaData();
break; break;
case TagStatus::Removed: case TagStatus::Removed:
CPPUNIT_ASSERT_EQUAL(0_st, tracks.size()); CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
} }
} }

View File

@ -42,7 +42,7 @@ void OverallTests::checkOggTestfile1()
checkOggTestMetaData(); checkOggTestMetaData();
break; break;
case TagStatus::Removed: case TagStatus::Removed:
CPPUNIT_ASSERT_EQUAL(0_st, tracks.size()); CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
} }
} }
@ -77,7 +77,7 @@ void OverallTests::checkOggTestfile2()
checkOggTestMetaData(); checkOggTestMetaData();
break; break;
case TagStatus::Removed: case TagStatus::Removed:
CPPUNIT_ASSERT_EQUAL(0_st, tracks.size()); CPPUNIT_ASSERT_EQUAL(0_st, tags.size());
} }
} }

View File

@ -62,7 +62,7 @@ void TagValueTests::testBinary()
{ {
const TagValue binary("123", 3, TagDataType::Binary); const TagValue binary("123", 3, TagDataType::Binary);
CPPUNIT_ASSERT_EQUAL(TagDataType::Binary, binary.type()); CPPUNIT_ASSERT_EQUAL(TagDataType::Binary, binary.type());
CPPUNIT_ASSERT_EQUAL("123"s, string(binary.dataPointer())); CPPUNIT_ASSERT_EQUAL("123"s, string(binary.dataPointer(), binary.dataSize()));
CPPUNIT_ASSERT_THROW(binary.toString(), ConversionException); CPPUNIT_ASSERT_THROW(binary.toString(), ConversionException);
CPPUNIT_ASSERT_THROW(binary.toInteger(), ConversionException); CPPUNIT_ASSERT_THROW(binary.toInteger(), ConversionException);
CPPUNIT_ASSERT_THROW(binary.toPositionInSet(), ConversionException); CPPUNIT_ASSERT_THROW(binary.toPositionInSet(), ConversionException);