From: Claudio Cambra <claudio.cambra@gmail.com>
Date: Wed, 21 Sep 2022 11:06:16 +0000 (+0200)
Subject: Check local file locked and unlocked correctly in testlocaldiscovery
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~225^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ff5261eaf142bd725d2a2076fc152d0389f2349d;p=nextcloud-desktop.git

Check local file locked and unlocked correctly in testlocaldiscovery

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

diff --git a/test/testlocaldiscovery.cpp b/test/testlocaldiscovery.cpp
index bc066aefc..80350bf90 100644
--- a/test/testlocaldiscovery.cpp
+++ b/test/testlocaldiscovery.cpp
@@ -620,14 +620,16 @@ private slots:
         const QString barFileAaaSubFolder("aaa/subfolder/bar");
 
         fakeFolder.remoteModifier().insert(fooFileRootFolder);
-
         fakeFolder.remoteModifier().insert(barFileRootFolder);
-        fakeFolder.remoteModifier().find("bar")->extraDavProperties = "<nc:lock>1</nc:lock>"
-                                                                      "<nc:lock-owner-type>0</nc:lock-owner-type>"
-                                                                      "<nc:lock-owner>user1</nc:lock-owner>"
-                                                                      "<nc:lock-owner-displayname>user1</nc:lock-owner-displayname>"
-                                                                      "<nc:lock-owner-editor>user1</nc:lock-owner-editor>"
-                                                                      "<nc:lock-time>1648046707</nc:lock-time>";
+
+        const auto lockedFileDavProps = QByteArray("<nc:lock>1</nc:lock>"
+                                                   "<nc:lock-owner-type>0</nc:lock-owner-type>"
+                                                   "<nc:lock-owner>user1</nc:lock-owner>"
+                                                   "<nc:lock-owner-displayname>user1</nc:lock-owner-displayname>"
+                                                   "<nc:lock-owner-editor>user1</nc:lock-owner-editor>"
+                                                   "<nc:lock-time>1648046707</nc:lock-time>");
+
+        fakeFolder.remoteModifier().find("bar")->extraDavProperties = lockedFileDavProps;
 
         fakeFolder.remoteModifier().mkdir(QStringLiteral("subfolder"));
         fakeFolder.remoteModifier().insert(fooFileSubFolder);
@@ -637,12 +639,26 @@ private slots:
         fakeFolder.remoteModifier().insert(fooFileAaaSubFolder);
         fakeFolder.remoteModifier().insert(barFileAaaSubFolder);
 
+        ItemCompletedSpy completeSpy(fakeFolder);
+
+        completeSpy.clear();
         QVERIFY(fakeFolder.syncOnce());
+        QCOMPARE(completeSpy.findItem("bar")->_locked, OCC::SyncFileItem::LockStatus::LockedItem);
+        SyncJournalFileRecord fileRecordBefore;
+        QVERIFY(fakeFolder.syncJournal().getFileRecord(QStringLiteral("bar"), &fileRecordBefore));
+        QVERIFY(fileRecordBefore._lockstate._locked);
 
-        fakeFolder.remoteModifier().find("bar")->extraDavProperties = "<nc:lock>0</nc:lock>";
+        const auto unlockedFileDavProps = QByteArray("<nc:lock>0</nc:lock>");
+        fakeFolder.remoteModifier().find("bar")->extraDavProperties = unlockedFileDavProps;
 
         fakeFolder.syncEngine().setLocalDiscoveryOptions(LocalDiscoveryStyle::DatabaseAndFilesystem);
+
+        completeSpy.clear();
         QVERIFY(fakeFolder.syncOnce());
+        QCOMPARE(completeSpy.findItem("bar")->_locked, OCC::SyncFileItem::LockStatus::UnlockedItem);
+        SyncJournalFileRecord fileRecordAfter;
+        QVERIFY(fakeFolder.syncJournal().getFileRecord(QStringLiteral("bar"), &fileRecordAfter));
+        QVERIFY(!fileRecordAfter._lockstate._locked);
     }
 };