diff options
| author | Christian Kamm <mail@ckamm.de> | 2018-08-15 13:16:46 +0300 |
|---|---|---|
| committer | ckamm <mail@ckamm.de> | 2018-08-16 10:08:17 +0300 |
| commit | c8ecbc30ed7942512685f4a8e648748c0df4a0f5 (patch) | |
| tree | 9ecf8c903ee4598c4f6240c767c1199147849652 /test/testsyncjournaldb.cpp | |
| parent | 2811aebf1aeaa3035511e815a66216aa3149b2d1 (diff) | |
RemotePermissions: Fix empty vs null
Fixes two bugs that appeared since the introduction of the struct:
- when reading permissions from the journal, null ("") was read as
empty-not-null
- when reading permissinos from the server, empty ("") was read as null
Addresses #4608
Diffstat (limited to 'test/testsyncjournaldb.cpp')
| -rw-r--r-- | test/testsyncjournaldb.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/testsyncjournaldb.cpp b/test/testsyncjournaldb.cpp index 237b3b75a..6abf47761 100644 --- a/test/testsyncjournaldb.cpp +++ b/test/testsyncjournaldb.cpp @@ -57,7 +57,7 @@ private slots: record._type = ItemTypeDirectory; record._etag = "789789"; record._fileId = "abcd"; - record._remotePerm = RemotePermissions("RW"); + record._remotePerm = RemotePermissions::fromDbValue("RW"); record._fileSize = 213089055; record._checksumHeader = "MD5:mychecksum"; QVERIFY(_db.setFileRecord(record)); @@ -79,7 +79,7 @@ private slots: record._type = ItemTypeFile; record._etag = "789FFF"; record._fileId = "efg"; - record._remotePerm = RemotePermissions("NV"); + record._remotePerm = RemotePermissions::fromDbValue("NV"); record._fileSize = 289055; _db.setFileRecordMetadata(record); QVERIFY(_db.getFileRecord(QByteArrayLiteral("foo"), &storedRecord)); @@ -96,7 +96,7 @@ private slots: { SyncJournalFileRecord record; record._path = "foo-checksum"; - record._remotePerm = RemotePermissions("RW"); + record._remotePerm = RemotePermissions::fromDbValue(" "); record._checksumHeader = "MD5:mychecksum"; record._modtime = Utility::qDateTimeToTime_t(QDateTime::currentDateTimeUtc()); QVERIFY(_db.setFileRecord(record)); @@ -117,7 +117,7 @@ private slots: { SyncJournalFileRecord record; record._path = "foo-nochecksum"; - record._remotePerm = RemotePermissions("RWN"); + record._remotePerm = RemotePermissions(); record._modtime = Utility::qDateTimeToTime_t(QDateTime::currentDateTimeUtc()); QVERIFY(_db.setFileRecord(record)); |