diff --git a/kdecore/tests/kdesktopfiletest.cpp b/kdecore/tests/kdesktopfiletest.cpp index 671cecb7..dedc1db3 100644 --- a/kdecore/tests/kdesktopfiletest.cpp +++ b/kdecore/tests/kdesktopfiletest.cpp @@ -106,15 +106,15 @@ void KDesktopFileTest::testActionGroup() void KDesktopFileTest::testIsAuthorizedDesktopFile() { - const QString fileName = QFile::decodeName(KDESRCDIR "../../kfile/kfilemodule.desktop"); + const QString fileName = QFile::decodeName(KDESRCDIR "../../kio/metadata/kfilemetadata_epub.desktop"); QVERIFY(QFile::exists(fileName)); QVERIFY(!KDesktopFile::isAuthorizedDesktopFile(fileName)); - const QString installedFile = KGlobal::dirs()->locate("services", "kfilemodule.desktop"); + const QString installedFile = KGlobal::dirs()->locate("services", "kfilemetadata_epub.desktop"); if (!installedFile.isEmpty()) { QVERIFY(KDesktopFile::isAuthorizedDesktopFile(installedFile)); } else { - qWarning("Skipping test for kfilemodule.desktop, not found. kdelibs not installed?"); + qWarning("Skipping test for kfilemetadata_epub.desktop, not found. kdelibs not installed?"); } const QString autostartFile = KStandardDirs::locate("autostart", "plasma-desktop.desktop"); diff --git a/kdecore/tests/kservicetest.cpp b/kdecore/tests/kservicetest.cpp index 93f61e10..dcd5b459 100644 --- a/kdecore/tests/kservicetest.cpp +++ b/kdecore/tests/kservicetest.cpp @@ -130,9 +130,12 @@ void KServiceTest::testByName() QVERIFY( s0 ); QCOMPARE( s0->name(), QString::fromLatin1("KParts/ReadOnlyPart") ); - KService::Ptr kfilemodule = KService::serviceByDesktopPath("kfilemodule.desktop"); - QVERIFY(kfilemodule); - QCOMPARE( kfilemodule->name(), QString::fromLatin1("KFileModule")); + KService::Ptr kfilemetadataplugin = KService::serviceByDesktopPath("kfilemetadata_epub.desktop"); + if (kfilemetadataplugin) { + QCOMPARE( kfilemetadataplugin->name(), QString::fromLatin1("KFileMetaDataEPubPlugin")); + } else { + qWarning("Skipping test for kfilemetadata_epub.desktop, not found. kdelibs not installed?"); + } } void KServiceTest::testProperty()