diff --git a/autotests/epubextractortest.cpp b/autotests/epubextractortest.cpp --- a/autotests/epubextractortest.cpp +++ b/autotests/epubextractortest.cpp @@ -22,10 +22,12 @@ #include "simpleextractionresult.h" #include "indexerextractortestsconfig.h" #include "extractors/epubextractor.h" +#include "mimeutils.h" #include #include #include +#include using namespace KFileMetaData; @@ -38,7 +40,12 @@ { EPubExtractor plugin{this}; - SimpleExtractionResult result(testFilePath("test.epub"), "application/epub+zip"); + QString fileName = testFilePath(QStringLiteral("test.epub")); + QMimeDatabase mimeDb; + QString mimeType = MimeUtils::strictMimeType(fileName, mimeDb).name(); + QVERIFY(plugin.mimetypes().contains(mimeType)); + + SimpleExtractionResult result(fileName, mimeType); plugin.extract(&result); QCOMPARE(result.types().size(), 1); diff --git a/autotests/exiv2extractortest.cpp b/autotests/exiv2extractortest.cpp --- a/autotests/exiv2extractortest.cpp +++ b/autotests/exiv2extractortest.cpp @@ -22,10 +22,12 @@ #include "simpleextractionresult.h" #include "indexerextractortestsconfig.h" #include "extractors/exiv2extractor.h" +#include "mimeutils.h" #include #include #include +#include using namespace KFileMetaData; using namespace KFileMetaData::Property; @@ -39,7 +41,12 @@ { Exiv2Extractor plugin{this}; - SimpleExtractionResult result(testFilePath("test.jpg"), "image/jpeg"); + QString fileName = testFilePath(QStringLiteral("test.jpg")); + QMimeDatabase mimeDb; + QString mimeType = MimeUtils::strictMimeType(fileName, mimeDb).name(); + QVERIFY(plugin.mimetypes().contains(mimeType)); + + SimpleExtractionResult result(fileName, mimeType); plugin.extract(&result); QCOMPARE(result.types().size(), 1); diff --git a/autotests/odfextractortest.h b/autotests/odfextractortest.h --- a/autotests/odfextractortest.h +++ b/autotests/odfextractortest.h @@ -23,6 +23,7 @@ #define ODFEXTRACTORTEST_H #include +#include class OdfExtractorTest : public QObject { @@ -38,6 +39,9 @@ void testTextMissingMetaNoCrash(); void testTextMissingContentNoCrash(); + +private: + QMimeDatabase mimeDb; }; #endif // ODFEXTRACTORTEST_H diff --git a/autotests/odfextractortest.cpp b/autotests/odfextractortest.cpp --- a/autotests/odfextractortest.cpp +++ b/autotests/odfextractortest.cpp @@ -28,6 +28,7 @@ #include "simpleextractionresult.h" #include "indexerextractortestsconfig.h" #include "extractors/odfextractor.h" +#include "mimeutils.h" using namespace KFileMetaData; @@ -40,7 +41,11 @@ { OdfExtractor plugin{this}; - SimpleExtractionResult result(testFilePath(QStringLiteral("test.odt")), QStringLiteral("application/vnd.oasis.opendocument.text")); + QString fileName = testFilePath(QStringLiteral("test.odt")); + QString mimeType = MimeUtils::strictMimeType(fileName, mimeDb).name(); + QVERIFY(plugin.mimetypes().contains(mimeType)); + + SimpleExtractionResult result(fileName, mimeType); plugin.extract(&result); QCOMPARE(result.types().size(), 1); @@ -77,7 +82,11 @@ { OdfExtractor plugin{this}; - SimpleExtractionResult result(testFilePath(QStringLiteral("test.odp")), QStringLiteral("application/vnd.oasis.opendocument.presentation")); + QString fileName = testFilePath(QStringLiteral("test.odp")); + QString mimeType = MimeUtils::strictMimeType(fileName, mimeDb).name(); + QVERIFY(plugin.mimetypes().contains(mimeType)); + + SimpleExtractionResult result(fileName, mimeType); plugin.extract(&result); QCOMPARE(result.types().size(), 2); diff --git a/autotests/office2007extractortest.cpp b/autotests/office2007extractortest.cpp --- a/autotests/office2007extractortest.cpp +++ b/autotests/office2007extractortest.cpp @@ -22,10 +22,12 @@ #include "simpleextractionresult.h" #include "indexerextractortestsconfig.h" #include "extractors/office2007extractor.h" +#include "mimeutils.h" #include #include #include +#include using namespace KFileMetaData; @@ -38,7 +40,12 @@ { Office2007Extractor plugin{this}; - SimpleExtractionResult result(testFilePath(QStringLiteral("test_libreoffice.docx")), QStringLiteral("application/vnd.openxmlformats-officedocument.wordprocessingml.document")); + QString fileName = testFilePath(QStringLiteral("test_libreoffice.docx")); + QMimeDatabase mimeDb; + QString mimeType = MimeUtils::strictMimeType(fileName, mimeDb).name(); + QVERIFY(plugin.mimetypes().contains(mimeType)); + + SimpleExtractionResult result(fileName, mimeType); plugin.extract(&result); QCOMPARE(result.types().size(), 1); diff --git a/autotests/popplerextractortest.cpp b/autotests/popplerextractortest.cpp --- a/autotests/popplerextractortest.cpp +++ b/autotests/popplerextractortest.cpp @@ -22,10 +22,12 @@ #include "simpleextractionresult.h" #include "indexerextractortestsconfig.h" #include "extractors/popplerextractor.h" +#include "mimeutils.h" #include #include #include +#include using namespace KFileMetaData; @@ -38,7 +40,12 @@ { PopplerExtractor plugin{this}; - SimpleExtractionResult result(testFilePath("test.pdf"), "application/pdf"); + QString fileName = testFilePath(QStringLiteral("test.pdf")); + QMimeDatabase mimeDb; + QString mimeType = MimeUtils::strictMimeType(fileName, mimeDb).name(); + QVERIFY(plugin.mimetypes().contains(mimeType)); + + SimpleExtractionResult result(fileName, mimeType); plugin.extract(&result); QCOMPARE(result.types().size(), 1); diff --git a/autotests/postscriptdscextractortest.h b/autotests/postscriptdscextractortest.h --- a/autotests/postscriptdscextractortest.h +++ b/autotests/postscriptdscextractortest.h @@ -21,6 +21,7 @@ #define POSTSCRIPTDSCEXTRACTORTEST_H #include +#include class PostscriptDscExtractorTest : public QObject { @@ -31,6 +32,8 @@ private Q_SLOTS: void testPS(); void testEPS(); +private: + QMimeDatabase mimeDb; }; #endif // POSTSCRIPTDSCEXTRACTORTEST_H diff --git a/autotests/postscriptdscextractortest.cpp b/autotests/postscriptdscextractortest.cpp --- a/autotests/postscriptdscextractortest.cpp +++ b/autotests/postscriptdscextractortest.cpp @@ -21,6 +21,7 @@ #include "simpleextractionresult.h" #include "indexerextractortestsconfig.h" #include "extractors/postscriptdscextractor.h" +#include "mimeutils.h" #include @@ -35,7 +36,11 @@ { DscExtractor plugin{this}; - SimpleExtractionResult result(testFilePath("test.ps"), "application/postscript"); + QString fileName = testFilePath(QStringLiteral("test.ps")); + QString mimeType = MimeUtils::strictMimeType(fileName, mimeDb).name(); + QVERIFY(plugin.mimetypes().contains(mimeType)); + + SimpleExtractionResult result(fileName, mimeType); plugin.extract(&result); QCOMPARE(result.types().size(), 1); @@ -55,7 +60,11 @@ { DscExtractor plugin{this}; - SimpleExtractionResult result(testFilePath("test.eps"), "image/x-eps"); + QString fileName = testFilePath(QStringLiteral("test.eps")); + QString mimeType = MimeUtils::strictMimeType(fileName, mimeDb).name(); + QVERIFY(plugin.mimetypes().contains(mimeType)); + + SimpleExtractionResult result(fileName, mimeType); plugin.extract(&result); QCOMPARE(result.types().size(), 1); diff --git a/autotests/xmlextractortest.cpp b/autotests/xmlextractortest.cpp --- a/autotests/xmlextractortest.cpp +++ b/autotests/xmlextractortest.cpp @@ -21,10 +21,12 @@ #include "xmlextractortest.h" #include +#include #include "simpleextractionresult.h" #include "indexerextractortestsconfig.h" #include "extractors/xmlextractor.h" +#include "mimeutils.h" using namespace KFileMetaData; @@ -78,8 +80,12 @@ { XmlExtractor plugin{this}; - SimpleExtractionResult result(testFilePath(QStringLiteral("test_with_metadata.svg")), - QStringLiteral("image/svg"), + QString fileName = testFilePath(QStringLiteral("test_with_metadata.svg")); + QMimeDatabase mimeDb; + QString mimeType = MimeUtils::strictMimeType(fileName, mimeDb).name(); + QVERIFY(plugin.mimetypes().contains(mimeType)); + + SimpleExtractionResult result(fileName, mimeType, ExtractionResult::ExtractEverything); plugin.extract(&result);