X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d41d3be348e76feab3d31f5eec875f6a392ff40f..7df5fc8edb54153f:/src/tests/placesitemmodeltest.cpp diff --git a/src/tests/placesitemmodeltest.cpp b/src/tests/placesitemmodeltest.cpp index 7f0d498a7..af466908c 100644 --- a/src/tests/placesitemmodeltest.cpp +++ b/src/tests/placesitemmodeltest.cpp @@ -88,6 +88,7 @@ private: QMap m_interfacesMap; int m_expectedModelCount = 15; bool m_hasDesktopFolder = false; + bool m_hasDocumentsFolder = false; bool m_hasDownloadsFolder = false; void setBalooEnabled(bool enabled); @@ -171,6 +172,10 @@ QStringList PlacesItemModelTest::initialUrls() const urls << QDir::homePath() + QStringLiteral("/Desktop"); } + if (m_hasDocumentsFolder) { + urls << QDir::homePath() + QStringLiteral("/Documents"); + } + if (m_hasDownloadsFolder) { urls << QDir::homePath() + QStringLiteral("/Downloads"); } @@ -269,6 +274,11 @@ void PlacesItemModelTest::initTestCase() m_expectedModelCount++; } + if (QDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)).exists()) { + m_hasDocumentsFolder = true; + m_expectedModelCount++; + } + if (QDir(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)).exists()) { m_hasDownloadsFolder = true; m_expectedModelCount++; @@ -292,12 +302,15 @@ void PlacesItemModelTest::testModelSort() void PlacesItemModelTest::testGroups() { const auto groups = m_model->groups(); - int expectedGroupSize = 3; + int expectedRemoteIndex = 3; if (m_hasDesktopFolder) { - expectedGroupSize++; + expectedRemoteIndex++; + } + if (m_hasDocumentsFolder) { + expectedRemoteIndex++; } if (m_hasDownloadsFolder) { - expectedGroupSize++; + expectedRemoteIndex++; } QCOMPARE(groups.size(), 6); @@ -305,19 +318,19 @@ void PlacesItemModelTest::testGroups() QCOMPARE(groups.at(0).first, 0); QCOMPARE(groups.at(0).second.toString(), QStringLiteral("Places")); - QCOMPARE(groups.at(1).first, expectedGroupSize); + QCOMPARE(groups.at(1).first, expectedRemoteIndex); QCOMPARE(groups.at(1).second.toString(), QStringLiteral("Remote")); - QCOMPARE(groups.at(2).first, expectedGroupSize + 2); + QCOMPARE(groups.at(2).first, expectedRemoteIndex + 2); QCOMPARE(groups.at(2).second.toString(), QStringLiteral("Recently Saved")); - QCOMPARE(groups.at(3).first, expectedGroupSize + 4); + QCOMPARE(groups.at(3).first, expectedRemoteIndex + 4); QCOMPARE(groups.at(3).second.toString(), QStringLiteral("Search For")); - QCOMPARE(groups.at(4).first, expectedGroupSize + 8); + QCOMPARE(groups.at(4).first, expectedRemoteIndex + 8); QCOMPARE(groups.at(4).second.toString(), QStringLiteral("Devices")); - QCOMPARE(groups.at(5).first, expectedGroupSize + 9); + QCOMPARE(groups.at(5).first, expectedRemoteIndex + 9); QCOMPARE(groups.at(5).second.toString(), QStringLiteral("Removable Devices")); } @@ -372,6 +385,9 @@ void PlacesItemModelTest::testDeletePlace() if (m_hasDesktopFolder) { tempDirIndex++; } + if (m_hasDocumentsFolder) { + tempDirIndex++; + } if (m_hasDownloadsFolder) { tempDirIndex++; } @@ -545,6 +561,9 @@ void PlacesItemModelTest::testSystemItems() if (m_hasDesktopFolder) { tempDirIndex++; } + if (m_hasDocumentsFolder) { + tempDirIndex++; + } if (m_hasDownloadsFolder) { tempDirIndex++; } @@ -593,6 +612,9 @@ void PlacesItemModelTest::testEditBookmark() if (m_hasDesktopFolder) { tempDirIndex++; } + if (m_hasDocumentsFolder) { + tempDirIndex++; + } if (m_hasDownloadsFolder) { tempDirIndex++; } @@ -631,6 +653,9 @@ void PlacesItemModelTest::testEditAfterCreation() if (m_hasDesktopFolder) { tempDirIndex++; } + if (m_hasDocumentsFolder) { + tempDirIndex++; + } if (m_hasDownloadsFolder) { tempDirIndex++; } @@ -668,6 +693,9 @@ void PlacesItemModelTest::testEditMetadata() if (m_hasDesktopFolder) { tempDirIndex++; } + if (m_hasDocumentsFolder) { + tempDirIndex++; + } if (m_hasDownloadsFolder) { tempDirIndex++; } @@ -707,6 +735,9 @@ void PlacesItemModelTest::testRefresh() if (m_hasDesktopFolder) { tempDirIndex++; } + if (m_hasDocumentsFolder) { + tempDirIndex++; + } if (m_hasDownloadsFolder) { tempDirIndex++; } @@ -778,6 +809,9 @@ void PlacesItemModelTest::testDragAndDrop() if (m_hasDesktopFolder) { lastIndex++; } + if (m_hasDocumentsFolder) { + lastIndex++; + } if (m_hasDownloadsFolder) { lastIndex++; } @@ -897,6 +931,9 @@ void PlacesItemModelTest::renameAfterCreation() if (m_hasDesktopFolder) { tempDirIndex++; } + if (m_hasDocumentsFolder) { + tempDirIndex++; + } if (m_hasDownloadsFolder) { tempDirIndex++; }