Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 10:52:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: fix and adjust some tests

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-04-11 02:03:54 +03:00
parent fba93fc80f
commit b4f3b51382
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kdecore/tests/kdesktopfiletest.cpp
View file

@ -105,15 +105,15 @@ void KDesktopFileTest::testActionGroup()
void KDesktopFileTest::testIsAuthorizedDesktopFile() void KDesktopFileTest::testIsAuthorizedDesktopFile()
{ {
const QString fileName = QFile::decodeName(KDESRCDIR "../../kioslave/http/http_cache_cleaner.desktop"); const QString fileName = QFile::decodeName(KDESRCDIR "../../kfile/kfilemodule.desktop");
QVERIFY(QFile::exists(fileName)); QVERIFY(QFile::exists(fileName));
QVERIFY(!KDesktopFile::isAuthorizedDesktopFile(fileName)); QVERIFY(!KDesktopFile::isAuthorizedDesktopFile(fileName));
const QString installedFile = KGlobal::dirs()->locate("services", "http_cache_cleaner.desktop"); const QString installedFile = KGlobal::dirs()->locate("services", "kfilemodule.desktop");
if (!installedFile.isEmpty()) { if (!installedFile.isEmpty()) {
QVERIFY(KDesktopFile::isAuthorizedDesktopFile(installedFile)); QVERIFY(KDesktopFile::isAuthorizedDesktopFile(installedFile));
} else { } else {
qWarning("Skipping test for http_cache_cleaner.desktop, not found. kdelibs not installed?"); qWarning("Skipping test for kfilemodule.desktop, not found. kdelibs not installed?");
} }
const QString autostartFile = KStandardDirs::locate("autostart", "plasma-desktop.desktop"); const QString autostartFile = KStandardDirs::locate("autostart", "plasma-desktop.desktop");

6
kded/tests/kmimeassociationstest.cpp
View file

@ -386,13 +386,13 @@ private Q_SLOTS:
void testRemovedImplicitAssociation178560() void testRemovedImplicitAssociation178560()
{ {
// #178560: Removing ark from interface/x-winamp-skin didn't work // #178560: Removing ark from interface/x-winamp-skin didn't work
// Using application/x-kns (another zip-derived mimetype) nowadays. // Using application/vnd.comicbook+zip (another zip-derived mimetype) nowadays.
const QString mime = "application/x-kns"; const QString mime = "application/vnd.comicbook+zip";
KService::List offers = KMimeTypeTrader::self()->query(mime); KService::List offers = KMimeTypeTrader::self()->query(mime);
QVERIFY(offerListHasService(offers, fakeArkApplication, true)); QVERIFY(offerListHasService(offers, fakeArkApplication, true));
writeToMimeApps(QByteArray("[Removed Associations]\n" writeToMimeApps(QByteArray("[Removed Associations]\n"
"application/x-kns=fakearkapplication.desktop;\n")); "application/vnd.comicbook+zip=fakearkapplication.desktop;\n"));
offers = KMimeTypeTrader::self()->query(mime); offers = KMimeTypeTrader::self()->query(mime);
QVERIFY(!offerListHasService(offers, fakeArkApplication, false)); QVERIFY(!offerListHasService(offers, fakeArkApplication, false));

2
kfile/tests/CMakeLists.txt
View file

@ -27,7 +27,7 @@ KFILE_EXECUTABLE_TESTS(
) )
add_definitions( add_definitions(
-DTEST_DATA="\\"${CMAKE_SOURCE_DIR}/solid/solid/backends/fakehw/fakecomputer.xml\\"" -DTEST_DATA="${CMAKE_SOURCE_DIR}/solid/solid/backends/fakehw/fakecomputer.xml"
) )
KFILE_UNIT_TESTS( KFILE_UNIT_TESTS(