diff options
author | David Faure <david.faure@kdab.com> | 2015-08-13 23:51:34 +0200 |
---|---|---|
committer | David Faure <david.faure@kdab.com> | 2015-08-16 13:33:21 +0000 |
commit | 4ccf5c6f4a411d367749565323f7c7fd469b025e (patch) | |
tree | fc92ddcd81209c9523d9dd9908761145f7bf9243 /tests/auto/corelib | |
parent | 1ff66a79626d40a8379a639a0fae3696fc7a06c0 (diff) |
QMimeDatabase: adapt to changes in shared-mime-info 1.3
The generated xml file is now lowercase.
This was changed in shared-mime-info 3805d0bcf2.
It led to runtime warnings "No file found for ...", which helped notice the bug.
Change-Id: I31f0fc7f0fe8a098c3f79c0bcbeeb1909d2cc05a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 5 | ||||
-rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/yast2-metapackage-handler-mimetypes.xml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index a7ec12b758..8bc90d917e 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -897,7 +897,7 @@ void tst_QMimeDatabase::installNewGlobalMimeType() QSKIP("shared-mime-info not found, skipping mime.cache test"); QCOMPARE(db.mimeTypeForFile(QLatin1String("foo.ymu"), QMimeDatabase::MatchExtension).name(), - QString::fromLatin1("text/x-suse-ymu")); + QString::fromLatin1("text/x-SuSE-ymu")); QVERIFY(db.mimeTypeForName(QLatin1String("text/x-suse-ymp")).isValid()); checkHasMimeType("text/x-suse-ymp"); @@ -954,8 +954,9 @@ void tst_QMimeDatabase::installNewLocalMimeType() } QCOMPARE(db.mimeTypeForFile(QLatin1String("foo.ymu"), QMimeDatabase::MatchExtension).name(), - QString::fromLatin1("text/x-suse-ymu")); + QString::fromLatin1("text/x-SuSE-ymu")); QVERIFY(db.mimeTypeForName(QLatin1String("text/x-suse-ymp")).isValid()); + QCOMPARE(db.mimeTypeForName(QLatin1String("text/x-SuSE-ymu")).comment(), QString("URL of a YaST Meta Package")); checkHasMimeType("text/x-suse-ymp"); // Test that a double-definition of a mimetype doesn't lead to sniffing ("conflicting globs"). diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/yast2-metapackage-handler-mimetypes.xml b/tests/auto/corelib/mimetypes/qmimedatabase/yast2-metapackage-handler-mimetypes.xml index ef3035ef4a..bb352b7ba2 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/yast2-metapackage-handler-mimetypes.xml +++ b/tests/auto/corelib/mimetypes/qmimedatabase/yast2-metapackage-handler-mimetypes.xml @@ -7,7 +7,7 @@ <glob pattern="*.ymp"/> </mime-type> - <mime-type type="text/x-suse-ymu"> + <mime-type type="text/x-SuSE-ymu"> <comment>URL of a YaST Meta Package</comment> <glob pattern="*.ymu"/> </mime-type> |