Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-23 06:50:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix minor typos (#10124)

Browse source
This commit is contained in:
spaette 2023-12-22 14:12:07 -06:00 • committed by GitHub
parent 681a0f5638
commit 9e119230d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/TestMerge.cpp
View file

@ -533,7 +533,7 @@ void TestMerge::assertDeletionNewerOnly(Database* db, const QMap<QString, QUuid>
// newer deletion in source forces deletion
QVERIFY(!mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInSourceAfterChangedInTarget"]));
QVERIFY(db->containsDeletedObject(identifiers["EntryDeletedInSourceAfterChangedInTarget"]));
// newer change in source privents deletion
// newer change in source prevents deletion
QVERIFY(mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInTargetBeforeChangedInSource"]));
QVERIFY(!db->containsDeletedObject(identifiers["EntryDeletedInTargetBeforeChangedInSource"]));
// newer deletion in target forces deletion
@ -549,7 +549,7 @@ void TestMerge::assertDeletionNewerOnly(Database* db, const QMap<QString, QUuid>
QVERIFY(db->containsDeletedObject(identifiers["GroupDeletedInSourceAfterEntryUpdatedInTarget"]));
QVERIFY(!mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInSourceAfterEntryUpdatedInTarget"]));
QVERIFY(db->containsDeletedObject(identifiers["EntryDeletedInSourceAfterEntryUpdatedInTarget"]));
// newer change in source privents deletion
// newer change in source prevents deletion
QVERIFY(mergedRootGroup->findGroupByUuid(identifiers["GroupDeletedInTargetBeforeEntryUpdatedInSource"]));
QVERIFY(!db->containsDeletedObject(identifiers["GroupDeletedInTargetBeforeEntryUpdatedInSource"]));
QVERIFY(mergedRootGroup->findEntryByUuid(identifiers["EntryDeletedInTargetBeforeEntryUpdatedInSource"]));
@ -890,7 +890,7 @@ void TestMerge::testUpdateEntryDifferentLocation()
QCOMPARE(entryDestinationMerged->username(), QString("username"));
QCOMPARE(entryDestinationMerged->group()->name(), QString("group3"));
QCOMPARE(uuidBeforeSyncing, entryDestinationMerged->uuid());
// default merge strategie is KeepNewer - therefore the older location is used!
// default merge strategy is KeepNewer - therefore the older location is used!
QCOMPARE(entryDestinationMerged->timeInfo().locationChanged(), sourceLocationChanged);
}