From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Sat, 5 Dec 2020 18:15:51 +0000 (+0100)
Subject: Fix PlacesItemModelTest, 2nd try
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c453393d357f094bc48d61061bf818cfe9d1c4ec

Fix PlacesItemModelTest, 2nd try

This partly reverts 15a5189b1193cc7305ad2c556d67ec79bdb6e38a

The KDE CI does not have KDE_FULL_SESSION set, which means that KIO
doesn't add the recentlyused:// urls to the model, but defaults to the
old timeline:// urls instead.

In both cases KIO adds 2 places, so it is safe to always assume that the
expected model count is 14.
---

diff --git a/src/tests/placesitemmodeltest.cpp b/src/tests/placesitemmodeltest.cpp
index 0a6ccf27d..d289b390d 100644
--- a/src/tests/placesitemmodeltest.cpp
+++ b/src/tests/placesitemmodeltest.cpp
@@ -67,7 +67,7 @@ private:
     PlacesItemModel* m_model;
     QSet<int> m_tobeRemoved;
     QMap<QString, QDBusInterface *> m_interfacesMap;
-    int m_expectedModelCount = qEnvironmentVariableIsSet("KDE_FULL_SESSION") && KProtocolInfo::isKnownProtocol(QStringLiteral("recentlyused")) ? 14 : 12;
+    int m_expectedModelCount = 14;
     bool m_hasDesktopFolder = false;
     bool m_hasDocumentsFolder = false;
     bool m_hasDownloadsFolder = false;
@@ -184,6 +184,9 @@ QStringList PlacesItemModelTest::initialUrls() const
         if (qEnvironmentVariableIsSet("KDE_FULL_SESSION") && KProtocolInfo::isKnownProtocol(QStringLiteral("recentlyused"))) {
             urls << QStringLiteral("recentlyused:/files");
             urls << QStringLiteral("recentlyused:/locations");
+        } else {
+            urls << QStringLiteral("timeline:/today")
+                 << QStringLiteral("timeline:/yesterday");
         }
 
         urls << QStringLiteral("search:/documents") << QStringLiteral("search:/images") << QStringLiteral("search:/audio") << QStringLiteral("search:/videos")
@@ -352,17 +355,16 @@ void PlacesItemModelTest::testGroups()
     QCOMPARE(groups.at(1).first, expectedRemoteIndex);
     QCOMPARE(groups.at(1).second.toString(), QStringLiteral("Remote"));
 
-    if (qEnvironmentVariableIsSet("KDE_FULL_SESSION") && KProtocolInfo::isKnownProtocol(QStringLiteral("recentlyused"))) {
-        expectedRemoteIndex += 2;
-    }
+    QCOMPARE(groups.at(2).first, expectedRemoteIndex + 2);
+    QCOMPARE(groups.at(2).second.toString(), QStringLiteral("Recent"));
 
-    QCOMPARE(groups.at(3).first, expectedRemoteIndex + 2);
+    QCOMPARE(groups.at(3).first, expectedRemoteIndex + 4);
     QCOMPARE(groups.at(3).second.toString(), QStringLiteral("Search For"));
 
-    QCOMPARE(groups.at(4).first, expectedRemoteIndex + 6);
+    QCOMPARE(groups.at(4).first, expectedRemoteIndex + 8);
     QCOMPARE(groups.at(4).second.toString(), QStringLiteral("Devices"));
 
-    QCOMPARE(groups.at(5).first, expectedRemoteIndex + 7);
+    QCOMPARE(groups.at(5).first, expectedRemoteIndex + 9);
     QCOMPARE(groups.at(5).second.toString(), QStringLiteral("Removable Devices"));
 }