From 26777175b724ed1f436ba63c9d76375d01716bc6 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Wed, 1 Mar 2023 14:43:51 +0100 Subject: [PATCH] Add convenience method in TestingALM to fetch more than maximum activities to be displayed in activitylistmodel Signed-off-by: Claudio Cambra --- test/activitylistmodeltestutils.cpp | 16 ++++++++++++++-- test/activitylistmodeltestutils.h | 7 +++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/test/activitylistmodeltestutils.cpp b/test/activitylistmodeltestutils.cpp index 7527d990e..bbeb1b658 100644 --- a/test/activitylistmodeltestutils.cpp +++ b/test/activitylistmodeltestutils.cpp @@ -172,6 +172,8 @@ void FakeRemoteActivityStorage::init() void FakeRemoteActivityStorage::initActivityData() { + _activityData = {}; + // Insert activity data for (quint32 i = 0; i <= _numItemsToInsert; i++) { QJsonObject activity; @@ -443,7 +445,7 @@ int FakeRemoteActivityStorage::startingIdLast() const } -void TestingALM::startFetchJob() +void TestingALM::startFetchJobWithNumActivities(const int numActivities) { auto *job = new OCC::JsonApiJob( accountState()->account(), QLatin1String("ocs/v2.php/apps/activity/api/v2/activity"), this); @@ -452,13 +454,23 @@ void TestingALM::startFetchJob() QUrlQuery params; params.addQueryItem(QLatin1String("since"), QString::number(currentItem())); - params.addQueryItem(QLatin1String("limit"), QString::number(50)); + params.addQueryItem(QLatin1String("limit"), QString::number(numActivities)); job->addQueryParams(params); setAndRefreshCurrentlyFetching(true); job->start(); } +void TestingALM::startFetchJob() +{ + startFetchJobWithNumActivities(); +} + +void TestingALM::startMaxActivitiesFetchJob() +{ + startFetchJobWithNumActivities(_maxActivities + 1); +} + void TestingALM::slotProcessReceivedActivities() { auto finalListCopy = _finalList; diff --git a/test/activitylistmodeltestutils.h b/test/activitylistmodeltestutils.h index 16b8614dc..ef9234281 100644 --- a/test/activitylistmodeltestutils.h +++ b/test/activitylistmodeltestutils.h @@ -77,14 +77,17 @@ class TestingALM : public OCC::ActivityListModel public: TestingALM() = default; - void startFetchJob() override; - public slots: + void startFetchJob() override; + void startMaxActivitiesFetchJob(); void slotProcessReceivedActivities(); signals: void activitiesProcessed(); +private slots: + void startFetchJobWithNumActivities(const int numActivities = 50); + private: int _numRowsPrev = 0; }; -- 2.39.5