X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/0bc919bd4758a84ccc0928ff784223984ec5df88..885916b7b4:/src/tests/placesitemmodeltest.cpp diff --git a/src/tests/placesitemmodeltest.cpp b/src/tests/placesitemmodeltest.cpp index af466908c..ef8d265f9 100644 --- a/src/tests/placesitemmodeltest.cpp +++ b/src/tests/placesitemmodeltest.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include "dolphin_generalsettings.h" #include "panels/places/placesitemmodel.h" @@ -37,13 +38,6 @@ Q_DECLARE_METATYPE(KItemRangeList) Q_DECLARE_METATYPE(KItemRange) -#ifdef Q_OS_WIN -//c:\ as root for windows -#define KDE_ROOT_PATH "C:\\" -#else -#define KDE_ROOT_PATH "/" -#endif - static QString bookmarksFile() { return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/user-places.xbel"; @@ -86,7 +80,7 @@ private: PlacesItemModel* m_model; QSet m_tobeRemoved; QMap m_interfacesMap; - int m_expectedModelCount = 15; + int m_expectedModelCount = qEnvironmentVariableIsSet("KDE_FULL_SESSION") && KProtocolInfo::isKnownProtocol(QStringLiteral("recentlyused")) ? 16 : 14; bool m_hasDesktopFolder = false; bool m_hasDocumentsFolder = false; bool m_hasDownloadsFolder = false; @@ -180,10 +174,16 @@ QStringList PlacesItemModelTest::initialUrls() const urls << QDir::homePath() + QStringLiteral("/Downloads"); } - urls << QStringLiteral(KDE_ROOT_PATH) << QStringLiteral("trash:/") + urls << QStringLiteral("trash:/") << QStringLiteral("remote:/") - << QStringLiteral("/media/nfs") - << QStringLiteral("timeline:/today") << QStringLiteral("timeline:/yesterday") + << QStringLiteral("/media/nfs"); + + if (qEnvironmentVariableIsSet("KDE_FULL_SESSION") && KProtocolInfo::isKnownProtocol(QStringLiteral("recentlyused"))) { + urls << QStringLiteral("recentlyused:/files"); + urls << QStringLiteral("recentlyused:/locations"); + } + + urls << QStringLiteral("timeline:/today") << QStringLiteral("timeline:/yesterday") << QStringLiteral("search:/documents") << QStringLiteral("search:/images") << QStringLiteral("search:/audio") << QStringLiteral("search:/videos") << QStringLiteral("/foreign") << QStringLiteral("/media/floppy0") << QStringLiteral("/media/XO-Y4") << QStringLiteral("/media/cdrom"); @@ -302,7 +302,7 @@ void PlacesItemModelTest::testModelSort() void PlacesItemModelTest::testGroups() { const auto groups = m_model->groups(); - int expectedRemoteIndex = 3; + int expectedRemoteIndex = 2; if (m_hasDesktopFolder) { expectedRemoteIndex++; } @@ -322,7 +322,11 @@ void PlacesItemModelTest::testGroups() QCOMPARE(groups.at(1).second.toString(), QStringLiteral("Remote")); QCOMPARE(groups.at(2).first, expectedRemoteIndex + 2); - QCOMPARE(groups.at(2).second.toString(), QStringLiteral("Recently Saved")); + QCOMPARE(groups.at(2).second.toString(), QStringLiteral("Recent")); + + if (qEnvironmentVariableIsSet("KDE_FULL_SESSION") && KProtocolInfo::isKnownProtocol(QStringLiteral("recentlyused"))) { + expectedRemoteIndex += 2; + } QCOMPARE(groups.at(3).first, expectedRemoteIndex + 4); QCOMPARE(groups.at(3).second.toString(), QStringLiteral("Search For")); @@ -349,7 +353,7 @@ void PlacesItemModelTest::testPlaceItem_data() QTest::newRow("Baloo - Documents") << QUrl("search:/documents") << false << true << QStringLiteral("Search For") << false; // baloo - timeline - QTest::newRow("Baloo - Today") << QUrl("timeline:/today") << false << true << QStringLiteral("Recently Saved") << false; + QTest::newRow("Baloo - Today") << QUrl("timeline:/today") << false << true << QStringLiteral("Recent") << false; // devices QTest::newRow("Devices - Floppy") << QUrl("file:///media/floppy0") << false << false << QStringLiteral("Removable Devices") << false; @@ -381,7 +385,7 @@ void PlacesItemModelTest::testDeletePlace() PlacesItemModel *model = new PlacesItemModel(); - int tempDirIndex = 3; + int tempDirIndex = 2; if (m_hasDesktopFolder) { tempDirIndex++; } @@ -557,7 +561,7 @@ void PlacesItemModelTest::testHideItem() void PlacesItemModelTest::testSystemItems() { - int tempDirIndex = 3; + int tempDirIndex = 2; if (m_hasDesktopFolder) { tempDirIndex++; } @@ -608,7 +612,7 @@ void PlacesItemModelTest::testSystemItems() void PlacesItemModelTest::testEditBookmark() { - int tempDirIndex = 1; + int tempDirIndex = 2; if (m_hasDesktopFolder) { tempDirIndex++; } @@ -624,7 +628,7 @@ void PlacesItemModelTest::testEditBookmark() createPlaceItem(QStringLiteral("Temporary Dir"), QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::TempLocation)), QString()); // make sure that the new item will be removed later - schedulePlaceRemoval(tempDirIndex + 2); + schedulePlaceRemoval(tempDirIndex); QSignalSpy itemsChangedSply(m_model, &PlacesItemModel::itemsChanged); @@ -649,7 +653,7 @@ void PlacesItemModelTest::testEditBookmark() void PlacesItemModelTest::testEditAfterCreation() { - int tempDirIndex = 1; + int tempDirIndex = 2; if (m_hasDesktopFolder) { tempDirIndex++; } @@ -671,7 +675,7 @@ void PlacesItemModelTest::testEditAfterCreation() QTRY_COMPARE(model->count(), m_model->count()); // make sure that the new item will be removed later - schedulePlaceRemoval(tempDirIndex + 2); + schedulePlaceRemoval(tempDirIndex); // modify place text PlacesItem *item = m_model->placesItem(tempDirIndex); @@ -689,7 +693,7 @@ void PlacesItemModelTest::testEditAfterCreation() void PlacesItemModelTest::testEditMetadata() { - int tempDirIndex = 1; + int tempDirIndex = 2; if (m_hasDesktopFolder) { tempDirIndex++; } @@ -712,11 +716,11 @@ void PlacesItemModelTest::testEditMetadata() QTRY_COMPARE(model->count(), m_model->count()); // make sure that the new item will be removed later - schedulePlaceRemoval(tempDirIndex + 2); + schedulePlaceRemoval(tempDirIndex); // modify place metadata - PlacesItem *item = m_model->placesItem(tempDirIndex); - item->bookmark().setMetaDataItem(QStringLiteral("OnlyInApp"), KAboutData::applicationData().componentName()); + auto bookmark = m_model->placesItem(tempDirIndex)->bookmark(); + bookmark.setMetaDataItem(QStringLiteral("OnlyInApp"), KAboutData::applicationData().componentName()); m_model->refresh(); // check if the place was modified in both models @@ -731,7 +735,7 @@ void PlacesItemModelTest::testEditMetadata() void PlacesItemModelTest::testRefresh() { - int tempDirIndex = 3; + int tempDirIndex = 2; if (m_hasDesktopFolder) { tempDirIndex++; } @@ -805,7 +809,7 @@ void PlacesItemModelTest::testIcons() void PlacesItemModelTest::testDragAndDrop() { - int lastIndex = 2; // last index of places group + int lastIndex = 1; // last index of places group if (m_hasDesktopFolder) { lastIndex++; } @@ -819,6 +823,7 @@ void PlacesItemModelTest::testDragAndDrop() QList args; KItemRangeList range; QStringList urls = initialUrls(); + QSignalSpy itemsInsertedSpy(m_model, &PlacesItemModel::itemsInserted); QSignalSpy itemsRemovedSpy(m_model, &PlacesItemModel::itemsRemoved); @@ -927,7 +932,7 @@ void PlacesItemModelTest::testDuplicatedEntries() void PlacesItemModelTest::renameAfterCreation() { - int tempDirIndex = 1; + int tempDirIndex = 2; if (m_hasDesktopFolder) { tempDirIndex++; } @@ -947,10 +952,10 @@ void PlacesItemModelTest::renameAfterCreation() // create a new place createPlaceItem(QStringLiteral("Temporary Dir"), tempUrl, QString()); - urls.insert(tempDirIndex + 2, tempUrl.toLocalFile()); + urls.insert(tempDirIndex, tempUrl.toLocalFile()); // make sure that the new item will be removed later - schedulePlaceRemoval(tempDirIndex + 2); + schedulePlaceRemoval(tempDirIndex); CHECK_PLACES_URLS(urls); QCOMPARE(model->count(), m_model->count());