Move creation of example activities from testactivitylistmodel to activitylistmodelte...

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/test/activitylistmodeltestutils.cpp b/test/activitylistmodeltestutils.cpp
index e86bf6fca08eecababfd9c7e15af277b8e2b98a3..a226caccf2e7b028d5ea95a4bb23cb99a647120b 100644 (file)
--- a/test/activitylistmodeltestutils.cpp
+++ b/test/activitylistmodeltestutils.cpp
@@ -72,6 +72,71 @@ QNetworkReply *almTestQnamOverride(FakeQNAM * const fakeQnam,
     return reply;
 }
 
+// Activity comparison is done by checking type, id, and accName
+// We need an activity with these details, at least
+
+OCC::Activity exampleNotificationActivity(const QString &accountName, const int id)
+{
+    OCC::Activity testNotificationActivity;
+
+    testNotificationActivity._accName = accountName;
+    testNotificationActivity._id = id;
+    testNotificationActivity._type = OCC::Activity::NotificationType;
+    testNotificationActivity._dateTime = QDateTime::currentDateTime();
+    testNotificationActivity._subject = QStringLiteral("Sample notification text");
+
+    return testNotificationActivity;
+}
+
+OCC::Activity exampleSyncResultErrorActivity(const QString &accountName, const int id)
+{
+    OCC::Activity testSyncResultErrorActivity;
+
+    testSyncResultErrorActivity._id = id;
+    testSyncResultErrorActivity._type = OCC::Activity::SyncResultType;
+    testSyncResultErrorActivity._syncResultStatus = OCC::SyncResult::Error;
+    testSyncResultErrorActivity._dateTime = QDateTime::currentDateTime();
+    testSyncResultErrorActivity._subject = QStringLiteral("Sample failed sync text");
+    testSyncResultErrorActivity._message = QStringLiteral("/path/to/thingy");
+    testSyncResultErrorActivity._link = QStringLiteral("/path/to/thingy");
+    testSyncResultErrorActivity._accName = accountName;
+
+    return testSyncResultErrorActivity;
+}
+
+OCC::Activity exampleSyncFileItemActivity(const QString &accountName, const QUrl &link, const int id)
+{
+    OCC::Activity testSyncFileItemActivity;
+
+    testSyncFileItemActivity._id = id;
+    testSyncFileItemActivity._type = OCC::Activity::SyncFileItemType; //client activity
+    testSyncFileItemActivity._syncFileItemStatus = OCC::SyncFileItem::Success;
+    testSyncFileItemActivity._dateTime = QDateTime::currentDateTime();
+    testSyncFileItemActivity._message = QStringLiteral("Sample file successfully synced text");
+    testSyncFileItemActivity._link = link;
+    testSyncFileItemActivity._accName = accountName;
+    testSyncFileItemActivity._file = QStringLiteral("xyz.pdf");
+
+    return testSyncFileItemActivity;
+}
+
+OCC::Activity exampleFileIgnoredActivity(const QString &accountName, const QUrl &link, const int id)
+{
+    OCC::Activity testFileIgnoredActivity;
+
+    testFileIgnoredActivity._id = id;
+    testFileIgnoredActivity._type = OCC::Activity::SyncFileItemType;
+    testFileIgnoredActivity._syncFileItemStatus = OCC::SyncFileItem::FileIgnored;
+    testFileIgnoredActivity._dateTime = QDateTime::currentDateTime();
+    testFileIgnoredActivity._subject = QStringLiteral("Sample ignored file sync text");
+    testFileIgnoredActivity._link = link;
+    testFileIgnoredActivity._accName = accountName;
+    testFileIgnoredActivity._folder = QStringLiteral("thingy");
+    testFileIgnoredActivity._file = QStringLiteral("test.txt");
+
+    return testFileIgnoredActivity;
+}
+
 FakeRemoteActivityStorage *FakeRemoteActivityStorage::_instance = nullptr;
 
 FakeRemoteActivityStorage* FakeRemoteActivityStorage::instance()

diff --git a/test/activitylistmodeltestutils.h b/test/activitylistmodeltestutils.h
index 19dc37ded04bb6b1b853b283c01453cd01e995bb..16b8614dce66caf4ff581926c1bba8b90b5ca8c3 100644 (file)
--- a/test/activitylistmodeltestutils.h
+++ b/test/activitylistmodeltestutils.h
@@ -38,6 +38,11 @@ namespace ActivityListModelTestUtils
                                                  const int searchResultsReplyDelay = 0,
                                                  QIODevice * const device = nullptr);
 
+[[nodiscard]] OCC::Activity exampleNotificationActivity(const QString &accountName, const int id = 1);
+[[nodiscard]] OCC::Activity exampleSyncResultErrorActivity(const QString &accountName, const int id = 2);
+[[nodiscard]] OCC::Activity exampleSyncFileItemActivity(const QString &accountName, const QUrl &link, const int id = 3);
+[[nodiscard]] OCC::Activity exampleFileIgnoredActivity(const QString &accountName, const QUrl &link = {}, const int id = 4);
+
 class FakeRemoteActivityStorage
 {
     FakeRemoteActivityStorage() = default;

diff --git a/test/testactivitylistmodel.cpp b/test/testactivitylistmodel.cpp
index 0fe77b83dc8ca75beaeda99e777b8cc99a70ca74..7e2a734e7532bec6de9d0c71355c962c1632361a 100644 (file)
--- a/test/testactivitylistmodel.cpp
+++ b/test/testactivitylistmodel.cpp
@@ -108,41 +108,13 @@ private slots:
 
         OCC::AccountManager::instance()->addAccount(account);
 
-        // Activity comparison is done by checking type, id, and accName
-        // We need an activity with these details, at least
-        testNotificationActivity._accName = accountState->account()->displayName();
-        testNotificationActivity._id = 1;
-        testNotificationActivity._type = OCC::Activity::NotificationType;
-        testNotificationActivity._dateTime = QDateTime::currentDateTime();
-        testNotificationActivity._subject = QStringLiteral("Sample notification text");
-
-        testSyncResultErrorActivity._id = 2;
-        testSyncResultErrorActivity._type = OCC::Activity::SyncResultType;
-        testSyncResultErrorActivity._syncResultStatus = OCC::SyncResult::Error;
-        testSyncResultErrorActivity._dateTime = QDateTime::currentDateTime();
-        testSyncResultErrorActivity._subject = QStringLiteral("Sample failed sync text");
-        testSyncResultErrorActivity._message = QStringLiteral("/path/to/thingy");
-        testSyncResultErrorActivity._link = QStringLiteral("/path/to/thingy");
-        testSyncResultErrorActivity._accName = accountState->account()->displayName();
-
-        testSyncFileItemActivity._id = 3;
-        testSyncFileItemActivity._type = OCC::Activity::SyncFileItemType; //client activity
-        testSyncFileItemActivity._syncFileItemStatus = OCC::SyncFileItem::Success;
-        testSyncFileItemActivity._dateTime = QDateTime::currentDateTime();
-        testSyncFileItemActivity._message = QStringLiteral("Sample file successfully synced text");
-        testSyncFileItemActivity._link = accountState->account()->url();
-        testSyncFileItemActivity._accName = accountState->account()->displayName();
-        testSyncFileItemActivity._file = QStringLiteral("xyz.pdf");
-
-        testFileIgnoredActivity._id = 4;
-        testFileIgnoredActivity._type = OCC::Activity::SyncFileItemType;
-        testFileIgnoredActivity._syncFileItemStatus = OCC::SyncFileItem::FileIgnored;
-        testFileIgnoredActivity._dateTime = QDateTime::currentDateTime();
-        testFileIgnoredActivity._subject = QStringLiteral("Sample ignored file sync text");
-        testFileIgnoredActivity._link = accountState->account()->url();
-        testFileIgnoredActivity._accName = accountState->account()->displayName();
-        testFileIgnoredActivity._folder = QStringLiteral("thingy");
-        testFileIgnoredActivity._file = QStringLiteral("test.txt");
+        const auto accName = accountState->account()->displayName();
+        const auto accUrl = accountState->account()->url();
+
+        testNotificationActivity = exampleNotificationActivity(accName);
+        testSyncResultErrorActivity = exampleSyncResultErrorActivity(accName);
+        testSyncFileItemActivity = exampleSyncFileItemActivity(accName, accUrl);
+        testFileIgnoredActivity = exampleFileIgnoredActivity(accName, accUrl);
     };
 
     // Test receiving activity from server