mirror/keepassxc
0
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-09-19 20:02:18 +02:00
Code
develop
keepassxc/tests/TestMerge.h

76 lines
3.0 KiB
C++
Raw Permalink Normal View History

Feature : Update entries across groups when merging (#807) * Feature : Update entries across groups when merging * Styling
2017-09-05 16:28:47 +02:00
/*
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 or (at your option)
* version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef KEEPASSX_TESTMERGE_H
#define KEEPASSX_TESTMERGE_H
#include "core/Database.h"
Introduce synchronize merge method * Create history-based merging that keeps older data in history instead of discarding or deleting it * Extract merge logic into the Merger class * Allows special merge behavior * Improve handling of deletion and changes on groups * Enable basic change tracking while merging * Prevent unintended timestamp changes while merging * Handle differences in timestamp precision * Introduce comparison operators to allow for more sophisticated comparisons (ignore special properties, ...) * Introduce Clock class to handle datetime across the app Merge Strategies: * Default (use inherited/fallback method) * Duplicate (duplicate conflicting nodes, apply all deletions) * KeepLocal (use local values, but apply all deletions) * KeepRemote (use remote values, but apply all deletions) * KeepNewer (merge history only) * Synchronize (merge history, newest value stays on top, apply all deletions)
2018-09-30 14:45:06 +02:00
#include <functional>
Feature : Update entries across groups when merging (#807) * Feature : Update entries across groups when merging * Styling
2017-09-05 16:28:47 +02:00
class TestMerge : public QObject
{
Q_OBJECT
private slots:
void initTestCase();
Introduce synchronize merge method * Create history-based merging that keeps older data in history instead of discarding or deleting it * Extract merge logic into the Merger class * Allows special merge behavior * Improve handling of deletion and changes on groups * Enable basic change tracking while merging * Prevent unintended timestamp changes while merging * Handle differences in timestamp precision * Introduce comparison operators to allow for more sophisticated comparisons (ignore special properties, ...) * Introduce Clock class to handle datetime across the app Merge Strategies: * Default (use inherited/fallback method) * Duplicate (duplicate conflicting nodes, apply all deletions) * KeepLocal (use local values, but apply all deletions) * KeepRemote (use remote values, but apply all deletions) * KeepNewer (merge history only) * Synchronize (merge history, newest value stays on top, apply all deletions)
2018-09-30 14:45:06 +02:00
void init();
void cleanup();
Feature : Update entries across groups when merging (#807) * Feature : Update entries across groups when merging * Styling
2017-09-05 16:28:47 +02:00
void testMergeIntoNew();
void testMergeNoChanges();
Prevent KeeShare from merging database custom data This issue previously caused parent databases to be marked as modified on unlock. This was because of the new protections against byte-by-byte side channel attacks adds a randomized string to the database custom data. We should never be merging database custom data with keeshare or imports since we are merging groups only. Also prevent overwrite of auto-generated custom data fields, Last Modified and Random Slug.
2024-04-29 05:22:01 +02:00
void testMergeCustomData();
Feature : Update entries across groups when merging (#807) * Feature : Update entries across groups when merging * Styling
2017-09-05 16:28:47 +02:00
void testResolveConflictNewer();
Introduce synchronize merge method * Create history-based merging that keeps older data in history instead of discarding or deleting it * Extract merge logic into the Merger class * Allows special merge behavior * Improve handling of deletion and changes on groups * Enable basic change tracking while merging * Prevent unintended timestamp changes while merging * Handle differences in timestamp precision * Introduce comparison operators to allow for more sophisticated comparisons (ignore special properties, ...) * Introduce Clock class to handle datetime across the app Merge Strategies: * Default (use inherited/fallback method) * Duplicate (duplicate conflicting nodes, apply all deletions) * KeepLocal (use local values, but apply all deletions) * KeepRemote (use remote values, but apply all deletions) * KeepNewer (merge history only) * Synchronize (merge history, newest value stays on top, apply all deletions)
2018-09-30 14:45:06 +02:00
void testResolveConflictExisting();
Merge : Synchronising groups.
2017-11-03 21:29:42 +01:00
void testResolveGroupConflictOlder();
Adding tests for modified signal on merge.
2018-11-04 21:59:13 +01:00
void testMergeNotModified();
void testMergeModified();
Introduce synchronize merge method * Create history-based merging that keeps older data in history instead of discarding or deleting it * Extract merge logic into the Merger class * Allows special merge behavior * Improve handling of deletion and changes on groups * Enable basic change tracking while merging * Prevent unintended timestamp changes while merging * Handle differences in timestamp precision * Introduce comparison operators to allow for more sophisticated comparisons (ignore special properties, ...) * Introduce Clock class to handle datetime across the app Merge Strategies: * Default (use inherited/fallback method) * Duplicate (duplicate conflicting nodes, apply all deletions) * KeepLocal (use local values, but apply all deletions) * KeepRemote (use remote values, but apply all deletions) * KeepNewer (merge history only) * Synchronize (merge history, newest value stays on top, apply all deletions)
2018-09-30 14:45:06 +02:00
void testResolveConflictEntry_Synchronize();
void testResolveConflictEntry_KeepNewer();
void testDeletionConflictEntry_Synchronized();
void testDeletionConflictEntry_KeepNewer();
Feature : Update entries across groups when merging (#807) * Feature : Update entries across groups when merging * Styling
2017-09-05 16:28:47 +02:00
void testMoveEntry();
void testMoveEntryPreserveChanges();
void testMoveEntryIntoNewGroup();
void testCreateNewGroups();
void testUpdateEntryDifferentLocation();
Merge : Synchronising groups.
2017-11-03 21:29:42 +01:00
void testUpdateGroup();
void testUpdateGroupLocation();
Feature : Update entries across groups when merging (#807) * Feature : Update entries across groups when merging * Styling
2017-09-05 16:28:47 +02:00
void testMergeAndSync();
Add custom icons when merging. (#1008) * Adding missing custom icons on merge. * qDebug when adding icon * Adding test for merge custom icons.
2017-10-07 16:40:29 +02:00
void testMergeCustomIcons();
Fix duplicate icon add in export SharedObserver did not check for already added icons add during export leading to duplicate icons in the target db.
2019-04-12 12:21:20 +02:00
void testMergeDuplicateCustomIcons();
Introduce synchronize merge method * Create history-based merging that keeps older data in history instead of discarding or deleting it * Extract merge logic into the Merger class * Allows special merge behavior * Improve handling of deletion and changes on groups * Enable basic change tracking while merging * Prevent unintended timestamp changes while merging * Handle differences in timestamp precision * Introduce comparison operators to allow for more sophisticated comparisons (ignore special properties, ...) * Introduce Clock class to handle datetime across the app Merge Strategies: * Default (use inherited/fallback method) * Duplicate (duplicate conflicting nodes, apply all deletions) * KeepLocal (use local values, but apply all deletions) * KeepRemote (use remote values, but apply all deletions) * KeepNewer (merge history only) * Synchronize (merge history, newest value stays on top, apply all deletions)
2018-09-30 14:45:06 +02:00
void testMetadata();
Merge custom data only when necessary (#3475)
2019-09-16 20:01:13 +02:00
void testCustomData();
Introduce synchronize merge method * Create history-based merging that keeps older data in history instead of discarding or deleting it * Extract merge logic into the Merger class * Allows special merge behavior * Improve handling of deletion and changes on groups * Enable basic change tracking while merging * Prevent unintended timestamp changes while merging * Handle differences in timestamp precision * Introduce comparison operators to allow for more sophisticated comparisons (ignore special properties, ...) * Introduce Clock class to handle datetime across the app Merge Strategies: * Default (use inherited/fallback method) * Duplicate (duplicate conflicting nodes, apply all deletions) * KeepLocal (use local values, but apply all deletions) * KeepRemote (use remote values, but apply all deletions) * KeepNewer (merge history only) * Synchronize (merge history, newest value stays on top, apply all deletions)
2018-09-30 14:45:06 +02:00
void testDeletedEntry();
void testDeletedGroup();
void testDeletedRevertedEntry();
void testDeletedRevertedGroup();
Feature : Update entries across groups when merging (#807) * Feature : Update entries across groups when merging * Styling
2017-09-05 16:28:47 +02:00
private:
Database* createTestDatabase();
Introduce synchronize merge method * Create history-based merging that keeps older data in history instead of discarding or deleting it * Extract merge logic into the Merger class * Allows special merge behavior * Improve handling of deletion and changes on groups * Enable basic change tracking while merging * Prevent unintended timestamp changes while merging * Handle differences in timestamp precision * Introduce comparison operators to allow for more sophisticated comparisons (ignore special properties, ...) * Introduce Clock class to handle datetime across the app Merge Strategies: * Default (use inherited/fallback method) * Duplicate (duplicate conflicting nodes, apply all deletions) * KeepLocal (use local values, but apply all deletions) * KeepRemote (use remote values, but apply all deletions) * KeepNewer (merge history only) * Synchronize (merge history, newest value stays on top, apply all deletions)
2018-09-30 14:45:06 +02:00
Database* createTestDatabaseStructureClone(Database* source, int entryFlags, int groupFlags);
Restore correct formatting Many lines were not conformant with the project's formatting rules. This patch should fix all formatting and whitespace issues in the code base. A clang-format directive was put around the connect() calls containing SIGNALs and SLOTs whose signatures would be denormalized because of the formatting rules.
2018-11-01 04:27:38 +01:00
void testResolveConflictTemplate(int mergeMode,
std::function<void(Database*, const QMap<const char*, QDateTime>&)> verification);
void testDeletionConflictTemplate(int mergeMode,
std::function<void(Database*, const QMap<QString, QUuid>&)> verification);
static void assertDeletionNewerOnly(Database* db, const QMap<QString, QUuid>& identifiers);
static void assertDeletionLocalOnly(Database* db, const QMap<QString, QUuid>& identifiers);
static void assertUpdateMergedEntry1(Entry* entry, const QMap<const char*, QDateTime>& timestamps);
static void assertUpdateReappliedEntry2(Entry* entry, const QMap<const char*, QDateTime>& timestamps);
static void assertUpdateReappliedEntry1(Entry* entry, const QMap<const char*, QDateTime>& timestamps);
static void assertUpdateMergedEntry2(Entry* entry, const QMap<const char*, QDateTime>& timestamps);
Feature : Update entries across groups when merging (#807) * Feature : Update entries across groups when merging * Styling
2017-09-05 16:28:47 +02:00
};
#endif // KEEPASSX_TESTMERGE_H
Copy Permalink