diff options
author | David Faure <david.faure@kdab.com> | 2018-02-27 15:48:07 +0100 |
---|---|---|
committer | David Faure <david.faure@kdab.com> | 2018-02-28 22:17:58 +0000 |
commit | f2eb7b0204bfd6474fb755d225d47dd2597af35a (patch) | |
tree | f94ac63d9eb4abc5819fd251341f3c365a029b42 /tests/auto/corelib/mimetypes | |
parent | 592b0a37f5daa236f8848608350328230f491e16 (diff) |
QMimeDatabase: fix regression in alias resolving
The refactoring to support multiple providers broke alias resolving
(e.g. "text/directory" would be an invalid mimetype, instead of being
resolved to "text/vcard"). The unittest didn't catch it because most of
it was running with a single mime directory (and therefore a single provider,
in the new model). Fixed by re-running a number of test methods once we
have a second mime directory.
Change-Id: Ib5da89ba79c11ed41813b2aff4bc71c30afcde7d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/mimetypes')
-rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index 995fbc13c0..abc06bfe85 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -1045,6 +1045,31 @@ void tst_QMimeDatabase::installNewLocalMimeType() QCOMPARE(db.mimeTypeForFile(qmlTestFile).name(), QString::fromLatin1("text/x-qml")); + // Now that we have two directories with mime definitions, check that everything still works + inheritance(); + if (QTest::currentTestFailed()) + return; + + aliases(); + if (QTest::currentTestFailed()) + return; + + icons(); + if (QTest::currentTestFailed()) + return; + + comment(); + if (QTest::currentTestFailed()) + return; + + mimeTypeForFileWithContent(); + if (QTest::currentTestFailed()) + return; + + mimeTypeForName(); + if (QTest::currentTestFailed()) + return; + // Now test removing local mimetypes for (int i = 1 ; i <= 3 ; ++i) QFile::remove(destDir + QStringLiteral("invalid-magic%1.xml").arg(i)); |