diff options
| author | Wolf-Michael Bolle <wolf-michael.bolle@nokia.com> | 2012-01-25 16:13:07 +0100 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2012-01-26 14:22:21 +0100 |
| commit | 41cdf21b9914485153711e26f6c88c766d6797dc (patch) | |
| tree | a0e93d67cfe712648eee7f91a0ebd16f460963f7 | |
| parent | 37e1983b07d892d2bcfd8a60bc2d50c78afc21cc (diff) | |
Complete the renaming efforts.
Change-Id: I590a73a9a40a1ef4647c1bd1a5176394e31a0431
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Faure <faure@kde.org>
| -rw-r--r-- | tests/auto/qmimedatabase/tst_qmimedatabase.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/qmimedatabase/tst_qmimedatabase.cpp index 00a5838..041a5b2 100644 --- a/tests/auto/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/qmimedatabase/tst_qmimedatabase.cpp @@ -724,14 +724,14 @@ void tst_qmimedatabase::installNewGlobalMimeType() QVERIFY(QFile::copy(srcFile, destFile)); waitAndRunUpdateMimeDatabase(mimeDir); - QCOMPARE(db.findByName(QLatin1String("foo.ymu")).name(), QString::fromLatin1("text/x-suse-ymu")); + QCOMPARE(db.findByFileName(QLatin1String("foo.ymu")).name(), QString::fromLatin1("text/x-suse-ymu")); QVERIFY(db.mimeTypeForName(QLatin1String("text/x-suse-ymp")).isValid()); checkHasMimeType("text/x-suse-ymp"); // Now test removing it again QFile::remove(destFile); waitAndRunUpdateMimeDatabase(mimeDir); - QCOMPARE(db.findByName(QLatin1String("foo.ymu")).name(), QString::fromLatin1("application/octet-stream")); + QCOMPARE(db.findByFileName(QLatin1String("foo.ymu")).name(), QString::fromLatin1("application/octet-stream")); QVERIFY(!db.mimeTypeForName(QLatin1String("text/x-suse-ymp")).isValid()); } @@ -752,19 +752,19 @@ void tst_qmimedatabase::installNewLocalMimeType() QVERIFY(QFile::copy(srcFile, destFile)); runUpdateMimeDatabase(mimeDir); - QCOMPARE(db.findByName(QLatin1String("foo.ymu")).name(), QString::fromLatin1("text/x-suse-ymu")); + QCOMPARE(db.findByFileName(QLatin1String("foo.ymu")).name(), QString::fromLatin1("text/x-suse-ymu")); QVERIFY(db.mimeTypeForName(QLatin1String("text/x-suse-ymp")).isValid()); checkHasMimeType("text/x-suse-ymp"); // Now test removing it again (note, this leaves a mostly-empty mime.cache file) QFile::remove(destFile); waitAndRunUpdateMimeDatabase(mimeDir); - QCOMPARE(db.findByName(QLatin1String("foo.ymu")).name(), QString::fromLatin1("application/octet-stream")); + QCOMPARE(db.findByFileName(QLatin1String("foo.ymu")).name(), QString::fromLatin1("application/octet-stream")); QVERIFY(!db.mimeTypeForName(QLatin1String("text/x-suse-ymp")).isValid()); // And now the user goes wild and uses rm -rf QFile::remove(mimeDir + QString::fromLatin1("/mime.cache")); - QCOMPARE(db.findByName(QLatin1String("foo.ymu")).name(), QString::fromLatin1("application/octet-stream")); + QCOMPARE(db.findByFileName(QLatin1String("foo.ymu")).name(), QString::fromLatin1("application/octet-stream")); QVERIFY(!db.mimeTypeForName(QLatin1String("text/x-suse-ymp")).isValid()); } |