From cdad6a513e2cbd4376dd03bb4fa63681076eb18b Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A9ven=20Car?= Date: Tue, 18 Jun 2019 13:08:00 +0200 Subject: [PATCH] Fix tests relating to the removal of the Root Place in D15739 Summary: See D15739 Test Plan: ctest Reviewers: elvisangelaccio, ngraham Reviewed By: elvisangelaccio, ngraham Subscribers: kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D21789 --- src/tests/CMakeLists.txt | 8 ++++--- src/tests/placesitemmodeltest.cpp | 40 +++++++++++++------------------ 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 8ef20cb83..f60eabd3f 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -77,9 +77,11 @@ LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test) ecm_add_test(draganddrophelpertest.cpp LINK_LIBRARIES dolphinprivate Qt5::Test) # PlacesItemModelTest -ecm_add_test(placesitemmodeltest.cpp -TEST_NAME placesitemmodeltest -LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test) +if (KIO_VERSION VERSION_GREATER_EQUAL "5.60.0") + ecm_add_test(placesitemmodeltest.cpp + TEST_NAME placesitemmodeltest + LINK_LIBRARIES dolphinprivate dolphinstatic Qt5::Test) +endif() add_test(NAME servicemenutest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../settings/services/test/test_run.rb) diff --git a/src/tests/placesitemmodeltest.cpp b/src/tests/placesitemmodeltest.cpp index af466908c..cc66c5aa0 100644 --- a/src/tests/placesitemmodeltest.cpp +++ b/src/tests/placesitemmodeltest.cpp @@ -37,13 +37,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 +79,7 @@ private: PlacesItemModel* m_model; QSet m_tobeRemoved; QMap m_interfacesMap; - int m_expectedModelCount = 15; + int m_expectedModelCount = 14; bool m_hasDesktopFolder = false; bool m_hasDocumentsFolder = false; bool m_hasDownloadsFolder = false; @@ -180,7 +173,7 @@ 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") @@ -302,7 +295,7 @@ void PlacesItemModelTest::testModelSort() void PlacesItemModelTest::testGroups() { const auto groups = m_model->groups(); - int expectedRemoteIndex = 3; + int expectedRemoteIndex = 2; if (m_hasDesktopFolder) { expectedRemoteIndex++; } @@ -381,7 +374,7 @@ void PlacesItemModelTest::testDeletePlace() PlacesItemModel *model = new PlacesItemModel(); - int tempDirIndex = 3; + int tempDirIndex = 2; if (m_hasDesktopFolder) { tempDirIndex++; } @@ -557,7 +550,7 @@ void PlacesItemModelTest::testHideItem() void PlacesItemModelTest::testSystemItems() { - int tempDirIndex = 3; + int tempDirIndex = 2; if (m_hasDesktopFolder) { tempDirIndex++; } @@ -608,7 +601,7 @@ void PlacesItemModelTest::testSystemItems() void PlacesItemModelTest::testEditBookmark() { - int tempDirIndex = 1; + int tempDirIndex = 2; if (m_hasDesktopFolder) { tempDirIndex++; } @@ -624,7 +617,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 +642,7 @@ void PlacesItemModelTest::testEditBookmark() void PlacesItemModelTest::testEditAfterCreation() { - int tempDirIndex = 1; + int tempDirIndex = 2; if (m_hasDesktopFolder) { tempDirIndex++; } @@ -671,7 +664,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 +682,7 @@ void PlacesItemModelTest::testEditAfterCreation() void PlacesItemModelTest::testEditMetadata() { - int tempDirIndex = 1; + int tempDirIndex = 2; if (m_hasDesktopFolder) { tempDirIndex++; } @@ -712,7 +705,7 @@ 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); @@ -731,7 +724,7 @@ void PlacesItemModelTest::testEditMetadata() void PlacesItemModelTest::testRefresh() { - int tempDirIndex = 3; + int tempDirIndex = 2; if (m_hasDesktopFolder) { tempDirIndex++; } @@ -805,7 +798,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 +812,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 +921,7 @@ void PlacesItemModelTest::testDuplicatedEntries() void PlacesItemModelTest::renameAfterCreation() { - int tempDirIndex = 1; + int tempDirIndex = 2; if (m_hasDesktopFolder) { tempDirIndex++; } @@ -947,10 +941,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()); -- 2.47.3