From 74d79fcf1a6d85f5949bfaf2defa9403494124a9 Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 23 Mar 2017 13:23:05 +0100 Subject: QMimeDatabase: update freedesktop.org.xml to shared-mime-info 1.8 ... and update the unittest accordingly. Compared to the 1.8 release there is one change in freedesktop.org.xml, the magic for application/x-java-keystore was changed from host32 to big32, as done upstream, see https://bugs.freedesktop.org/show_bug.cgi?id=99328 Task-number: QTBUG-60608 Change-Id: I47de71c9396cfc3eabc884d5679c73a3e4850a17 Reviewed-by: Thiago Macieira --- .../mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'tests/auto/corelib/mimetypes') diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index 280e3f77a4..8a46bc1c55 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -72,12 +72,12 @@ static inline QString testSuiteWarning() str << "\nCannot find the shared-mime-info test suite\nstarting from: " << QDir::toNativeSeparators(QDir::currentPath()) << "\n" "cd " << QDir::toNativeSeparators(QStringLiteral("tests/auto/corelib/mimetypes/qmimedatabase")) << "\n" - "wget http://cgit.freedesktop.org/xdg/shared-mime-info/snapshot/Release-1-0.zip\n" - "unzip Release-1-0.zip\n"; + "wget http://cgit.freedesktop.org/xdg/shared-mime-info/snapshot/Release-1-8.zip\n" + "unzip Release-1-8.zip\n"; #ifdef Q_OS_WIN - str << "mkdir testfiles\nxcopy /s Release-1-0\\tests testfiles\n"; + str << "mkdir testfiles\nxcopy /s Release-1-8 s-m-i\n"; #else - str << "ln -s Release-1-0/tests testfiles\n"; + str << "ln -s Release-1-8 s-m-i\n"; #endif return result; } @@ -154,7 +154,7 @@ void tst_QMimeDatabase::initTestCase() QVERIFY2(copyResourceFile(xmlFileName, xmlTargetFileName, &errorMessage), qPrintable(errorMessage)); #endif - m_testSuite = QFINDTESTDATA("testfiles"); + m_testSuite = QFINDTESTDATA("s-m-i/tests"); if (m_testSuite.isEmpty()) qWarning("%s", qPrintable(testSuiteWarning())); @@ -438,7 +438,7 @@ void tst_QMimeDatabase::icons() QMimeType directory = db.mimeTypeForFile(QString::fromLatin1("/")); QCOMPARE(directory.name(), QString::fromLatin1("inode/directory")); QCOMPARE(directory.iconName(), QString::fromLatin1("inode-directory")); - QCOMPARE(directory.genericIconName(), QString::fromLatin1("inode-x-generic")); + QCOMPARE(directory.genericIconName(), QString::fromLatin1("folder")); QMimeType pub = db.mimeTypeForFile(QString::fromLatin1("foo.epub"), QMimeDatabase::MatchExtension); QCOMPARE(pub.name(), QString::fromLatin1("application/epub+zip")); @@ -510,7 +510,7 @@ void tst_QMimeDatabase::mimeTypeForFileWithContent() mime = db.mimeTypeForFile(txtTempFileName); QCOMPARE(mime.name(), QString::fromLatin1("text/plain")); mime = db.mimeTypeForFile(txtTempFileName, QMimeDatabase::MatchContent); - QCOMPARE(mime.name(), QString::fromLatin1("application/smil")); + QCOMPARE(mime.name(), QString::fromLatin1("application/smil+xml")); } // Test what happens with an incorrect path @@ -607,7 +607,7 @@ void tst_QMimeDatabase::allMimeTypes() QVERIFY(!lst.isEmpty()); // Hardcoding this is the only way to check both providers find the same number of mimetypes. - QCOMPARE(lst.count(), 661); + QCOMPARE(lst.count(), 749); foreach (const QMimeType &mime, lst) { const QString name = mime.name(); @@ -802,7 +802,7 @@ void tst_QMimeDatabase::findByData() // Expected to fail QVERIFY2(resultMimeTypeName != mimeTypeName, qPrintable(resultMimeTypeName)); } else { - QCOMPARE(resultMimeTypeName, mimeTypeName); + QCOMPARE(resultMimeTypeName.toLower(), mimeTypeName.toLower()); } QFileInfo info(filePath); @@ -833,7 +833,7 @@ void tst_QMimeDatabase::findByFile() // Expected to fail QVERIFY2(resultMimeTypeName != mimeTypeName, qPrintable(resultMimeTypeName)); } else { - QCOMPARE(resultMimeTypeName, mimeTypeName); + QCOMPARE(resultMimeTypeName.toLower(), mimeTypeName.toLower()); } // Test QFileInfo overload -- cgit v1.2.3