diff options
| author | Elvis Angelaccio <[email protected]> | 2018-10-07 16:50:27 +0200 |
|---|---|---|
| committer | Elvis Angelaccio <[email protected]> | 2018-10-07 16:50:27 +0200 |
| commit | 9760f9607d48555452557f22749b291fd3981b76 (patch) | |
| tree | 2b2d6c3d2eacd9e678775a60e6b45d15124ed5d1 | |
| parent | 5e8b892a519b8d1fef58a747fafb5846b7fa3492 (diff) | |
[PlacesItemModelTest] Check whether Desktop and Download folders exist
KFilePlacesModel creates the Desktop and Downloads bookmarks only if
their folder exists.
This should hopefully fix the failing test on the CI (actual count = 15,
expected count = 17), since the CI runs in docker and probably doesn't
have those two folders by default.
| -rw-r--r-- | src/tests/placesitemmodeltest.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/tests/placesitemmodeltest.cpp b/src/tests/placesitemmodeltest.cpp index 2e814220a..e0fdb1d86 100644 --- a/src/tests/placesitemmodeltest.cpp +++ b/src/tests/placesitemmodeltest.cpp @@ -85,6 +85,7 @@ private: PlacesItemModel* m_model; QSet<int> m_tobeRemoved; QMap<QString, QDBusInterface *> m_interfacesMap; + int m_expectedModelCount = 15; void setBalooEnabled(bool enabled); int indexOf(const QUrl &url); @@ -227,7 +228,7 @@ void PlacesItemModelTest::init() m_model = new PlacesItemModel(); // WORKAROUND: need to wait for bookmark to load, check: PlacesItemModel::updateBookmarks QTest::qWait(300); - QCOMPARE(m_model->count(), 17); + QCOMPARE(m_model->count(), m_expectedModelCount); } void PlacesItemModelTest::cleanup() @@ -261,6 +262,14 @@ void PlacesItemModelTest::initTestCase() QVERIFY(QFile::remove(bookmarsFileName)); } + if (QDir(QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)).exists()) { + m_expectedModelCount++; + } + + if (QDir(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)).exists()) { + m_expectedModelCount++; + } + qRegisterMetaType<KItemRangeList>(); qRegisterMetaType<KItemRange>(); } |
