Enable all tests under Windows
Since workingCopyPath() has now been implemented under Windows it is possible to enable the entire testsuite.
This commit is contained in:
parent
dff3c0ec70
commit
13bccb12f0
|
@ -48,14 +48,12 @@ class OverallTests : public TestFixture {
|
||||||
CPPUNIT_TEST(testOggParsing);
|
CPPUNIT_TEST(testOggParsing);
|
||||||
CPPUNIT_TEST(testFlacParsing);
|
CPPUNIT_TEST(testFlacParsing);
|
||||||
CPPUNIT_TEST(testMkvParsing);
|
CPPUNIT_TEST(testMkvParsing);
|
||||||
#ifdef PLATFORM_UNIX
|
|
||||||
CPPUNIT_TEST(testMp4Making);
|
CPPUNIT_TEST(testMp4Making);
|
||||||
CPPUNIT_TEST(testMp3Making);
|
CPPUNIT_TEST(testMp3Making);
|
||||||
CPPUNIT_TEST(testOggMaking);
|
CPPUNIT_TEST(testOggMaking);
|
||||||
CPPUNIT_TEST(testFlacMaking);
|
CPPUNIT_TEST(testFlacMaking);
|
||||||
CPPUNIT_TEST(testMkvMakingWithDifferentSettings);
|
CPPUNIT_TEST(testMkvMakingWithDifferentSettings);
|
||||||
CPPUNIT_TEST(testMkvMakingNestedTags);
|
CPPUNIT_TEST(testMkvMakingNestedTags);
|
||||||
#endif
|
|
||||||
CPPUNIT_TEST_SUITE_END();
|
CPPUNIT_TEST_SUITE_END();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -119,14 +117,12 @@ public:
|
||||||
void testMp3Parsing();
|
void testMp3Parsing();
|
||||||
void testOggParsing();
|
void testOggParsing();
|
||||||
void testFlacParsing();
|
void testFlacParsing();
|
||||||
#ifdef PLATFORM_UNIX
|
|
||||||
void testMkvMakingWithDifferentSettings();
|
void testMkvMakingWithDifferentSettings();
|
||||||
void testMkvMakingNestedTags();
|
void testMkvMakingNestedTags();
|
||||||
void testMp4Making();
|
void testMp4Making();
|
||||||
void testMp3Making();
|
void testMp3Making();
|
||||||
void testOggMaking();
|
void testOggMaking();
|
||||||
void testFlacMaking();
|
void testFlacMaking();
|
||||||
#endif
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
MediaFileInfo m_fileInfo;
|
MediaFileInfo m_fileInfo;
|
||||||
|
|
|
@ -107,7 +107,6 @@ void OverallTests::testFlacParsing()
|
||||||
parseFile(TestUtilities::testFilePath("flac/test.ogg"), &OverallTests::checkFlacTestfile2);
|
parseFile(TestUtilities::testFilePath("flac/test.ogg"), &OverallTests::checkFlacTestfile2);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PLATFORM_UNIX
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Tests the FLAC maker via MediaFileInfo.
|
* \brief Tests the FLAC maker via MediaFileInfo.
|
||||||
* \remarks Relies on the parser to check results.
|
* \remarks Relies on the parser to check results.
|
||||||
|
@ -139,4 +138,3 @@ void OverallTests::testFlacMaking()
|
||||||
makeFile(TestUtilities::workingCopyPath("flac/test.ogg"), modifyRoutine, &OverallTests::checkFlacTestfile2);
|
makeFile(TestUtilities::workingCopyPath("flac/test.ogg"), modifyRoutine, &OverallTests::checkFlacTestfile2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
|
@ -647,7 +647,6 @@ void OverallTests::testMkvParsing()
|
||||||
parseFile(testFilePath("mkv/nested-tags.mkv"), &OverallTests::checkMkvTestfileNestedTags);
|
parseFile(testFilePath("mkv/nested-tags.mkv"), &OverallTests::checkMkvTestfileNestedTags);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PLATFORM_UNIX
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Tests the Matroska maker via MediaFileInfo.
|
* \brief Tests the Matroska maker via MediaFileInfo.
|
||||||
*
|
*
|
||||||
|
@ -748,4 +747,3 @@ void OverallTests::testMkvMakingNestedTags()
|
||||||
m_fileInfo.setIndexPosition(ElementPosition::BeforeData);
|
m_fileInfo.setIndexPosition(ElementPosition::BeforeData);
|
||||||
makeFile(workingCopyPath("mkv/nested-tags.mkv"), &OverallTests::noop, &OverallTests::checkMkvTestfileNestedTags);
|
makeFile(workingCopyPath("mkv/nested-tags.mkv"), &OverallTests::noop, &OverallTests::checkMkvTestfileNestedTags);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
|
@ -355,7 +355,6 @@ void OverallTests::testMp3Parsing()
|
||||||
parseFile(TestUtilities::testFilePath("misc/multiple_id3v2_4_values.mp3"), &OverallTests::checkMp3Testfile2);
|
parseFile(TestUtilities::testFilePath("misc/multiple_id3v2_4_values.mp3"), &OverallTests::checkMp3Testfile2);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PLATFORM_UNIX
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Tests the MP3 maker via MediaFileInfo.
|
* \brief Tests the MP3 maker via MediaFileInfo.
|
||||||
* \remarks Relies on the parser to check results.
|
* \remarks Relies on the parser to check results.
|
||||||
|
@ -416,4 +415,3 @@ void OverallTests::testMp3Making()
|
||||||
(m_mode & RemoveTag) ? &OverallTests::removeAllTags : &OverallTests::setMp3TestMetaData2, &OverallTests::checkMp3Testfile2);
|
(m_mode & RemoveTag) ? &OverallTests::removeAllTags : &OverallTests::setMp3TestMetaData2, &OverallTests::checkMp3Testfile2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
|
@ -533,7 +533,6 @@ void OverallTests::testMp4Parsing()
|
||||||
parseFile(TestUtilities::testFilePath("mp4/android-8.1-camera-recoding.mp4"), &OverallTests::checkMp4Testfile7);
|
parseFile(TestUtilities::testFilePath("mp4/android-8.1-camera-recoding.mp4"), &OverallTests::checkMp4Testfile7);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PLATFORM_UNIX
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Tests the MP4 maker via MediaFileInfo.
|
* \brief Tests the MP4 maker via MediaFileInfo.
|
||||||
* \remarks Relies on the parser to check results.
|
* \remarks Relies on the parser to check results.
|
||||||
|
@ -603,4 +602,3 @@ void OverallTests::testMp4Making()
|
||||||
makeFile(TestUtilities::workingCopyPath("mtx-test-data/mp4/1080p-DTS-HD-7.1.mp4"), modifyRoutine, &OverallTests::checkMp4Testfile6);
|
makeFile(TestUtilities::workingCopyPath("mtx-test-data/mp4/1080p-DTS-HD-7.1.mp4"), modifyRoutine, &OverallTests::checkMp4Testfile6);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
|
@ -137,7 +137,6 @@ void OverallTests::testOggParsing()
|
||||||
parseFile(TestUtilities::testFilePath("mtx-test-data/opus/v-opus.ogg"), &OverallTests::checkOggTestfile2);
|
parseFile(TestUtilities::testFilePath("mtx-test-data/opus/v-opus.ogg"), &OverallTests::checkOggTestfile2);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PLATFORM_UNIX
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Tests the Ogg maker via MediaFileInfo.
|
* \brief Tests the Ogg maker via MediaFileInfo.
|
||||||
* \remarks
|
* \remarks
|
||||||
|
@ -172,4 +171,3 @@ void OverallTests::testOggMaking()
|
||||||
makeFile(TestUtilities::workingCopyPath("mtx-test-data/opus/v-opus.ogg"), modifyRoutine, &OverallTests::checkOggTestfile2);
|
makeFile(TestUtilities::workingCopyPath("mtx-test-data/opus/v-opus.ogg"), modifyRoutine, &OverallTests::checkOggTestfile2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
|
@ -46,9 +46,7 @@ class UtilitiesTests : public TestFixture {
|
||||||
CPPUNIT_TEST(testProgressFeedback);
|
CPPUNIT_TEST(testProgressFeedback);
|
||||||
CPPUNIT_TEST(testAbortableProgressFeedback);
|
CPPUNIT_TEST(testAbortableProgressFeedback);
|
||||||
CPPUNIT_TEST(testDiagnostics);
|
CPPUNIT_TEST(testDiagnostics);
|
||||||
#ifdef PLATFORM_UNIX
|
|
||||||
CPPUNIT_TEST(testBackupFile);
|
CPPUNIT_TEST(testBackupFile);
|
||||||
#endif
|
|
||||||
CPPUNIT_TEST_SUITE_END();
|
CPPUNIT_TEST_SUITE_END();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -66,9 +64,7 @@ public:
|
||||||
void testProgressFeedback();
|
void testProgressFeedback();
|
||||||
void testAbortableProgressFeedback();
|
void testAbortableProgressFeedback();
|
||||||
void testDiagnostics();
|
void testDiagnostics();
|
||||||
#ifdef PLATFORM_UNIX
|
|
||||||
void testBackupFile();
|
void testBackupFile();
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
CPPUNIT_TEST_SUITE_REGISTRATION(UtilitiesTests);
|
CPPUNIT_TEST_SUITE_REGISTRATION(UtilitiesTests);
|
||||||
|
@ -295,7 +291,6 @@ void UtilitiesTests::testDiagnostics()
|
||||||
CPPUNIT_ASSERT(diag.has(DiagLevel::Critical));
|
CPPUNIT_ASSERT(diag.has(DiagLevel::Critical));
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PLATFORM_UNIX
|
|
||||||
void UtilitiesTests::testBackupFile()
|
void UtilitiesTests::testBackupFile()
|
||||||
{
|
{
|
||||||
using namespace BackupHelper;
|
using namespace BackupHelper;
|
||||||
|
@ -402,4 +397,3 @@ void UtilitiesTests::testBackupFile()
|
||||||
|
|
||||||
CPPUNIT_ASSERT_EQUAL(0, remove(file.path().data()));
|
CPPUNIT_ASSERT_EQUAL(0, remove(file.path().data()));
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
Loading…
Reference in New Issue