Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Cambra <claudio.cambra@gmail.com>2022-09-21 14:06:16 +0300
committerSimon L <szaimen@e.mail.de>2022-09-28 11:55:25 +0300
commit11a0949dd8d1c15622bf1ad733ab93839e067d88 (patch)
tree0f6d9074daa6065ec2937fc862a3bcdfa94ef35e
parent2aeb2c039c22303b75ba99f0fcf0d0f1b61dedf2 (diff)
Check local file locked and unlocked correctly in testlocaldiscovery
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
-rw-r--r--test/testlocaldiscovery.cpp32
1 files changed, 24 insertions, 8 deletions
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);
}
};