Feature : Update entries across groups when merging (#807)

* Feature : Update entries across groups when merging

* Styling

tests/TestMerge.h

@@ -0,0 +1,46 @@
+/*
+ *  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 <QObject>
+
+class TestMerge : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+    void testMergeIntoNew();
+    void testMergeNoChanges();
+    void testResolveConflictNewer();
+    void testResolveConflictOlder();
+    void testResolveConflictKeepBoth();
+    void testMoveEntry();
+    void testMoveEntryPreserveChanges();
+    void testMoveEntryIntoNewGroup();
+    void testCreateNewGroups();
+    void testUpdateEntryDifferentLocation();
+    void testMergeAndSync();
+
+private:
+    Database* createTestDatabase();
+};
+
+#endif // KEEPASSX_TESTMERGE_H