@@ -620,14 +620,16 @@ private slots:
620620 const QString barFileAaaSubFolder (" aaa/subfolder/bar" );
621621
622622 fakeFolder.remoteModifier ().insert (fooFileRootFolder);
623-
624623 fakeFolder.remoteModifier ().insert (barFileRootFolder);
625- fakeFolder.remoteModifier ().find (" bar" )->extraDavProperties = " <nc:lock>1</nc:lock>"
626- " <nc:lock-owner-type>0</nc:lock-owner-type>"
627- " <nc:lock-owner>user1</nc:lock-owner>"
628- " <nc:lock-owner-displayname>user1</nc:lock-owner-displayname>"
629- " <nc:lock-owner-editor>user1</nc:lock-owner-editor>"
630- " <nc:lock-time>1648046707</nc:lock-time>" ;
624+
625+ const auto lockedFileDavProps = QByteArray (" <nc:lock>1</nc:lock>"
626+ " <nc:lock-owner-type>0</nc:lock-owner-type>"
627+ " <nc:lock-owner>user1</nc:lock-owner>"
628+ " <nc:lock-owner-displayname>user1</nc:lock-owner-displayname>"
629+ " <nc:lock-owner-editor>user1</nc:lock-owner-editor>"
630+ " <nc:lock-time>1648046707</nc:lock-time>" );
631+
632+ fakeFolder.remoteModifier ().find (" bar" )->extraDavProperties = lockedFileDavProps;
631633
632634 fakeFolder.remoteModifier ().mkdir (QStringLiteral (" subfolder" ));
633635 fakeFolder.remoteModifier ().insert (fooFileSubFolder);
@@ -637,12 +639,26 @@ private slots:
637639 fakeFolder.remoteModifier ().insert (fooFileAaaSubFolder);
638640 fakeFolder.remoteModifier ().insert (barFileAaaSubFolder);
639641
642+ ItemCompletedSpy completeSpy (fakeFolder);
643+
644+ completeSpy.clear ();
640645 QVERIFY (fakeFolder.syncOnce ());
646+ QCOMPARE (completeSpy.findItem (" bar" )->_locked , OCC ::SyncFileItem::LockStatus::LockedItem);
647+ SyncJournalFileRecord fileRecordBefore;
648+ QVERIFY (fakeFolder.syncJournal ().getFileRecord (QStringLiteral (" bar" ), &fileRecordBefore));
649+ QVERIFY (fileRecordBefore._lockstate ._locked );
641650
642- fakeFolder.remoteModifier ().find (" bar" )->extraDavProperties = " <nc:lock>0</nc:lock>" ;
651+ const auto unlockedFileDavProps = QByteArray (" <nc:lock>0</nc:lock>" );
652+ fakeFolder.remoteModifier ().find (" bar" )->extraDavProperties = unlockedFileDavProps;
643653
644654 fakeFolder.syncEngine ().setLocalDiscoveryOptions (LocalDiscoveryStyle::DatabaseAndFilesystem);
655+
656+ completeSpy.clear ();
645657 QVERIFY (fakeFolder.syncOnce ());
658+ QCOMPARE (completeSpy.findItem (" bar" )->_locked , OCC ::SyncFileItem::LockStatus::UnlockedItem);
659+ SyncJournalFileRecord fileRecordAfter;
660+ QVERIFY (fakeFolder.syncJournal ().getFileRecord (QStringLiteral (" bar" ), &fileRecordAfter));
661+ QVERIFY (!fileRecordAfter._lockstate ._locked );
646662 }
647663};
648664
0 commit comments