]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Fix testing of sync result error activities in sorted activity list test
authorClaudio Cambra <claudio.cambra@nextcloud.com>
Thu, 20 Jul 2023 11:33:48 +0000 (19:33 +0800)
committerClaudio Cambra <claudio.cambra@nextcloud.com>
Tue, 25 Jul 2023 00:40:29 +0000 (08:40 +0800)
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
test/testsortedactivitylistmodel.cpp

index 9614a77305bc75fa528d00e3e701378407c4aa8f..90b8d74c8b6c86f327d829b2830503a1daba5c5e 100644 (file)
@@ -67,6 +67,21 @@ public:
         QCOMPARE(model->rowCount(), originalRowCount + 1);
     }
 
+    void addActivity(QSharedPointer<OCC::SortedActivityListModel> model,
+                     void (OCC::ActivityListModel::*addingMethod)(const OCC::Activity &, OCC::ActivityListModel::ErrorType),
+                     OCC::Activity &activity,
+                     OCC::ActivityListModel::ErrorType type)
+    {
+        const auto originalRowCount = model->rowCount();
+        const auto sourceModel = dynamic_cast<TestingALM *>(model->sourceModel());
+
+        (sourceModel->*addingMethod)(activity, type);
+        QCOMPARE(model->rowCount(), originalRowCount + 1);
+
+        const auto index = model->index(0, 0);
+        QVERIFY(index.isValid());
+    }
+
 private slots:
     void initTestCase()
     {
@@ -125,7 +140,7 @@ private slots:
 
         addActivity(model, &TestingALM::addSyncFileItemToActivityList, testSyncFileItemActivity);
         addActivity(model, &TestingALM::addNotificationToActivityList, testNotificationActivity);
-        addActivity(model, &TestingALM::addErrorToActivityList, testSyncResultErrorActivity);
+        addActivity(model, &TestingALM::addErrorToActivityList, testSyncResultErrorActivity, OCC::ActivityListModel::ErrorType::SyncError);
         addActivity(model, &TestingALM::addIgnoredFileToList, testFileIgnoredActivity);
     }
 
@@ -147,7 +162,7 @@ private slots:
         addActivity(model, &TestingALM::addSyncFileItemToActivityList, errorSyncFileItemActivity);
         addActivity(model, &TestingALM::addSyncFileItemToActivityList, testSyncFileItemActivity);
         addActivity(model, &TestingALM::addNotificationToActivityList, testNotificationActivity);
-        addActivity(model, &TestingALM::addErrorToActivityList, testSyncResultErrorActivity);
+        addActivity(model, &TestingALM::addErrorToActivityList, testSyncResultErrorActivity, OCC::ActivityListModel::ErrorType::SyncError);
         addActivity(model, &TestingALM::addIgnoredFileToList, testFileIgnoredActivity);
 
         const QVector<OCC::Activity::Type> activityDefaultTypeOrder {