diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-12-13 19:20:45 +0300 |
|---|---|---|
| committer | Hannah von Reth <vonreth@kde.org> | 2021-12-13 22:18:58 +0300 |
| commit | b206a3d994f84451c98429621f3d6e56f98a5827 (patch) | |
| tree | 4c6dfcccba9b3d7b6d488ed69370619d3a3fd610 /test | |
| parent | f776818cf599a55df4431dc21a20173e6a9d11bf (diff) | |
Ensure we compare the correct signals
Diffstat (limited to 'test')
| -rw-r--r-- | test/testsyncfilestatustracker.cpp | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/test/testsyncfilestatustracker.cpp b/test/testsyncfilestatustracker.cpp index d0dc3a01a..ad7dccef1 100644 --- a/test/testsyncfilestatustracker.cpp +++ b/test/testsyncfilestatustracker.cpp @@ -18,14 +18,18 @@ public: StatusPushSpy(SyncEngine &syncEngine) : QSignalSpy(&syncEngine.syncFileStatusTracker(), &SyncFileStatusTracker::fileStatusChanged) , _syncEngine(syncEngine) - { } + { + } - SyncFileStatus statusOf(const QString &relativePath) const { - QFileInfo file(_syncEngine.localPath(), relativePath); + SyncFileStatus statusOf(const QString &relativePath) const + { + const QFileInfo file(_syncEngine.localPath(), relativePath); // Start from the end to get the latest status for (auto it = crbegin(); it != crend(); ++it) { - if (QFileInfo(it->at(0).toString()) == file) + const auto info = QFileInfo(it->at(0).toString()); + if (info == file) { return it->at(1).value<SyncFileStatus>(); + } } return SyncFileStatus(); } @@ -58,7 +62,7 @@ class TestSyncFileStatusTracker : public QObject QDirIterator it(root, QDir::AllEntries | QDir::NoDotAndDotDot, QDirIterator::Subdirectories); while (it.hasNext()) { QString filePath = it.next().mid(root.size()); - SyncFileStatus pushedStatus = statusSpy.statusOf(filePath); + auto pushedStatus = statusSpy.statusOf(filePath); if (pushedStatus != SyncFileStatus()) { QCOMPARE(fakeFolder.syncEngine().syncFileStatusTracker().fileStatus(filePath), pushedStatus); } @@ -141,12 +145,14 @@ private slots: QCOMPARE(statusSpy.statusOf("D"), SyncFileStatus(SyncFileStatus::StatusSync)); QCOMPARE(statusSpy.statusOf("D/d0"), SyncFileStatus(SyncFileStatus::StatusSync)); + statusSpy.clear(); fakeFolder.execUntilItemCompleted("D"); verifyThatPushMatchesPull(fakeFolder, statusSpy); - QCOMPARE(statusSpy.statusOf(""), SyncFileStatus(SyncFileStatus::StatusSync)); - QCOMPARE(statusSpy.statusOf("D"), SyncFileStatus(SyncFileStatus::StatusSync)); - QCOMPARE(statusSpy.statusOf("D/d0"), SyncFileStatus(SyncFileStatus::StatusSync)); + QCOMPARE(statusSpy.statusOf(""), SyncFileStatus(SyncFileStatus::StatusNone)); + QCOMPARE(statusSpy.statusOf("D"), SyncFileStatus(SyncFileStatus::StatusNone)); + QCOMPARE(statusSpy.statusOf("D/d0"), SyncFileStatus(SyncFileStatus::StatusNone)); + statusSpy.clear(); fakeFolder.execUntilFinished(); verifyThatPushMatchesPull(fakeFolder, statusSpy); QCOMPARE(statusSpy.statusOf(""), SyncFileStatus(SyncFileStatus::StatusUpToDate)); @@ -169,12 +175,14 @@ private slots: QCOMPARE(statusSpy.statusOf("D"), SyncFileStatus(SyncFileStatus::StatusSync)); QCOMPARE(statusSpy.statusOf("D/d0"), SyncFileStatus(SyncFileStatus::StatusSync)); + statusSpy.clear(); fakeFolder.execUntilItemCompleted("D"); verifyThatPushMatchesPull(fakeFolder, statusSpy); - QCOMPARE(statusSpy.statusOf(""), SyncFileStatus(SyncFileStatus::StatusSync)); - QCOMPARE(statusSpy.statusOf("D"), SyncFileStatus(SyncFileStatus::StatusSync)); - QCOMPARE(statusSpy.statusOf("D/d0"), SyncFileStatus(SyncFileStatus::StatusSync)); + QCOMPARE(statusSpy.statusOf(""), SyncFileStatus(SyncFileStatus::StatusNone)); + QCOMPARE(statusSpy.statusOf("D"), SyncFileStatus(SyncFileStatus::StatusNone)); + QCOMPARE(statusSpy.statusOf("D/d0"), SyncFileStatus(SyncFileStatus::StatusNone)); + statusSpy.clear(); fakeFolder.execUntilFinished(); verifyThatPushMatchesPull(fakeFolder, statusSpy); QCOMPARE(statusSpy.statusOf(""), SyncFileStatus(SyncFileStatus::StatusUpToDate)); |