jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory leaks in tests

Browse Source
This commit is contained in:
Janek Bevendorff
2018-01-07 00:30:18 +01:00
committed by Jonathan White
parent ccfd7a065c
commit 72a1c65d00
4 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/gui/TestGui.cpp
View File

@@ -117,7 +117,14 @@ void TestGui::cleanup()
triggerAction("actionDatabaseClose");
Tools::wait(100);
if (m_db) {
delete m_db;
}
m_db = nullptr;
if (m_dbWidget) {
delete m_dbWidget;
}
m_dbWidget = nullptr;
}
@@ -1060,7 +1067,7 @@ void TestGui::dragAndDropGroup(const QModelIndex& sourceIndex, const QModelIndex
QVERIFY(sourceIndex.isValid());
QVERIFY(targetIndex.isValid());
GroupModel* groupModel = qobject_cast<GroupModel*>(m_dbWidget->findChild<GroupView*>("groupView")->model());
auto groupModel = qobject_cast<GroupModel*>(m_dbWidget->findChild<GroupView*>("groupView")->model());
QMimeData mimeData;
QByteArray encoded;

9
tests/gui/TestGui.h
View File

@@ -23,6 +23,7 @@
#include <QAbstractItemModel>
#include <QObject>
#include <QPointer>
class Database;
class DatabaseTabWidget;
@@ -71,14 +72,14 @@ private:
void clickIndex(const QModelIndex& index, QAbstractItemView* view, Qt::MouseButton button,
Qt::KeyboardModifiers stateKey = 0);
MainWindow* m_mainWindow;
DatabaseTabWidget* m_tabWidget;
DatabaseWidget* m_dbWidget;
QPointer<MainWindow> m_mainWindow;
QPointer<DatabaseTabWidget> m_tabWidget;
QPointer<DatabaseWidget> m_dbWidget;
QPointer<Database> m_db;
QByteArray m_dbData;
TemporaryFile m_dbFile;
QString m_dbFileName;
QString m_dbFilePath;
Database* m_db;
};
#endif // KEEPASSX_TESTGUI_H