diff options
author | Janek Bevendorff <janek@jbev.net> | 2018-11-22 13:47:31 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-22 13:47:31 +0300 |
commit | d612cad09a4f1cd8ef9bf6be8bf90b75248ecfef (patch) | |
tree | 94fbd4d07f56f9646dc8c0dd8e7586776c2e3585 /tests/TestCli.cpp | |
parent | 917c4cc18b8dbc04034cb0d43301b3f406644885 (diff) |
Refactor Database and Database widgets (#2491)
The Database, DatabaseWidget, and DatabaseTabWidget classes share many responsibilities in inconsistent ways resulting in impenetrable and unmaintainable code and a diverse set of bugs and architecture restrictions. This patch reworks the architecture, responsibilities of, and dependencies between these classes.
The core changes are:
* Move loading and saving logic from widgets into the Database class
* Get rid of the DatabaseManagerStruct and move all the information contained in it into the Database
* Let database objects keep track of modifications and dirty/clean state instead of handing this to external widgets
* Move GUI interactions for loading and saving from the DatabaseTabWidget into the DatabaseWidget (resolves #2494 as a side-effect)
* Heavily clean up DatabaseTabWidget and degrade it to a slightly glorified QTabWidget
* Use QSharedPointers for all Database objects
* Remove the modifiedImmediate signal and replace it with a markAsModified() method
* Implement proper tabName() method instead of reading back titles from GUI widgets (resolves #1389 and its duplicates #2146 #855)
* Fix unwanted AES-KDF downgrade if database uses Argon2 and has CustomData
* Improve code
This patch is also the first major step towards solving issues #476 and #2322.
Diffstat (limited to 'tests/TestCli.cpp')
-rw-r--r-- | tests/TestCli.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/TestCli.cpp b/tests/TestCli.cpp index 36ca479d5..3c5afc347 100644 --- a/tests/TestCli.cpp +++ b/tests/TestCli.cpp @@ -671,7 +671,8 @@ void TestCli::testMerge() QFile readBack(targetFile1.fileName()); readBack.open(QIODevice::ReadOnly); - QScopedPointer<Database> mergedDb(reader.readDatabase(&readBack, oldKey)); + auto mergedDb = QSharedPointer<Database>::create(); + reader.readDatabase(&readBack, oldKey, mergedDb.data()); readBack.close(); QVERIFY(mergedDb); auto* entry1 = mergedDb->rootGroup()->findEntryByPath("/Internet/Some Website"); @@ -691,7 +692,8 @@ void TestCli::testMerge() readBack.setFileName(targetFile2.fileName()); readBack.open(QIODevice::ReadOnly); - mergedDb.reset(reader.readDatabase(&readBack, key)); + mergedDb = QSharedPointer<Database>::create(); + reader.readDatabase(&readBack, key, mergedDb.data()); readBack.close(); QVERIFY(mergedDb); entry1 = mergedDb->rootGroup()->findEntryByPath("/Internet/Some Website"); @@ -740,7 +742,8 @@ void TestCli::testRemove() key->addKey(QSharedPointer<PasswordKey>::create("a")); QFile readBack(m_dbFile->fileName()); readBack.open(QIODevice::ReadOnly); - QScopedPointer<Database> readBackDb(reader.readDatabase(&readBack, key)); + auto readBackDb = QSharedPointer<Database>::create(); + reader.readDatabase(&readBack, key, readBackDb.data()); readBack.close(); QVERIFY(readBackDb); QVERIFY(!readBackDb->rootGroup()->findEntryByPath("/Sample Entry")); @@ -757,7 +760,8 @@ void TestCli::testRemove() readBack.setFileName(fileCopy.fileName()); readBack.open(QIODevice::ReadOnly); - readBackDb.reset(reader.readDatabase(&readBack, key)); + readBackDb = QSharedPointer<Database>::create(); + reader.readDatabase(&readBack, key, readBackDb.data()); readBack.close(); QVERIFY(readBackDb); QVERIFY(!readBackDb->rootGroup()->findEntryByPath("/Sample Entry")); |