mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-09-19 23:56:10 +00:00
c1e9f45df9
* 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)
79 lines
3.1 KiB
C++
79 lines
3.1 KiB
C++
/*
|
|
* 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"
|
|
#include <QDateTime>
|
|
#include <QMap>
|
|
#include <QObject>
|
|
#include <functional>
|
|
|
|
class TestMerge : public QObject
|
|
{
|
|
Q_OBJECT
|
|
private slots:
|
|
void initTestCase();
|
|
void init();
|
|
void cleanup();
|
|
void testMergeIntoNew();
|
|
void testMergeNoChanges();
|
|
void testResolveConflictNewer();
|
|
void testResolveConflictExisting();
|
|
void testResolveGroupConflictOlder();
|
|
void testResolveConflictDuplicate();
|
|
void testResolveConflictEntry_Synchronize();
|
|
void testResolveConflictEntry_KeepLocal();
|
|
void testResolveConflictEntry_KeepRemote();
|
|
void testResolveConflictEntry_KeepNewer();
|
|
void testDeletionConflictEntry_Duplicate();
|
|
void testDeletionConflictEntry_Synchronized();
|
|
void testDeletionConflictEntry_KeepLocal();
|
|
void testDeletionConflictEntry_KeepRemote();
|
|
void testDeletionConflictEntry_KeepNewer();
|
|
void testMoveEntry();
|
|
void testMoveEntryPreserveChanges();
|
|
void testMoveEntryIntoNewGroup();
|
|
void testCreateNewGroups();
|
|
void testUpdateEntryDifferentLocation();
|
|
void testUpdateGroup();
|
|
void testUpdateGroupLocation();
|
|
void testMergeAndSync();
|
|
void testMergeCustomIcons();
|
|
void testMetadata();
|
|
void testDeletedEntry();
|
|
void testDeletedGroup();
|
|
void testDeletedRevertedEntry();
|
|
void testDeletedRevertedGroup();
|
|
|
|
private:
|
|
Database* createTestDatabase();
|
|
Database* createTestDatabaseStructureClone(Database* source, int entryFlags, int groupFlags);
|
|
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> ×tamps);
|
|
static void assertUpdateReappliedEntry2(Entry *entry, const QMap<const char*, QDateTime> ×tamps);
|
|
static void assertUpdateReappliedEntry1(Entry *entry, const QMap<const char*, QDateTime> ×tamps);
|
|
static void assertUpdateMergedEntry2(Entry *entry, const QMap<const char *, QDateTime> ×tamps);
|
|
|
|
};
|
|
|
|
#endif // KEEPASSX_TESTMERGE_H
|