diff options
author | Florian Geyer <blueice@fobos.de> | 2011-12-29 23:10:19 +0400 |
---|---|---|
committer | Florian Geyer <blueice@fobos.de> | 2011-12-29 23:10:19 +0400 |
commit | ccc8725bb3923f376199deadaf1ce0c7741fa7e9 (patch) | |
tree | 2bc90cf389ed1042f707452130354531dbae1055 | |
parent | 42773f51a4e7145e0c4f53fc2fd5ea3f7c9322f9 (diff) |
Clean up gui test.
-rw-r--r-- | tests/gui/TestGui.cpp | 25 | ||||
-rw-r--r-- | tests/gui/TestGui.h | 7 |
2 files changed, 24 insertions, 8 deletions
diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp index 711bbd56d..69f8ca965 100644 --- a/tests/gui/TestGui.cpp +++ b/tests/gui/TestGui.cpp @@ -32,28 +32,37 @@ void TestGui::initTestCase() { Crypto::init(); + m_mainWindow = new MainWindow(); } void TestGui::testOpenDatabase() { - MainWindow mainWindow; - mainWindow.show(); - QAction* actionDatabaseOpen = mainWindow.findChild<QAction*>("actionDatabaseOpen"); + m_mainWindow->show(); + QAction* actionDatabaseOpen = m_mainWindow->findChild<QAction*>("actionDatabaseOpen"); fileDialog()->setNextFileName(QString(KEEPASSX_TEST_DATA_DIR).append("/NewDatabase.kdbx")); actionDatabaseOpen->trigger(); + QWidget* keyDialog = m_mainWindow->findChild<QWidget*>("KeyOpenDialog"); + QVERIFY(keyDialog); + QTest::qWaitForWindowShown(keyDialog); - QTest::qWait(500); - - QLineEdit* editPassword = QApplication::activeWindow()->findChild<QLineEdit*>("editPassword"); + QLineEdit* editPassword = keyDialog->findChild<QLineEdit*>("editPassword"); QVERIFY(editPassword); QTest::keyClicks(editPassword, "a"); - QDialogButtonBox* buttonBox = QApplication::activeWindow()->findChild<QDialogButtonBox*>("buttonBox"); + QDialogButtonBox* buttonBox = keyDialog->findChild<QDialogButtonBox*>("buttonBox"); QTest::mouseClick(buttonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); +} - QTabWidget* tabWidget = mainWindow.findChild<QTabWidget*>("tabWidget"); +void TestGui::testTabs() +{ + QTabWidget* tabWidget = m_mainWindow->findChild<QTabWidget*>("tabWidget"); QCOMPARE(tabWidget->count(), 1); QCOMPARE(tabWidget->tabText(tabWidget->currentIndex()), QString("NewDatabase.kdbx")); } +void TestGui::cleanupTestCase() +{ + delete m_mainWindow; +} + QTEST_MAIN(TestGui); diff --git a/tests/gui/TestGui.h b/tests/gui/TestGui.h index 7ba8fa37c..91b305058 100644 --- a/tests/gui/TestGui.h +++ b/tests/gui/TestGui.h @@ -20,6 +20,8 @@ #include <QtCore/QObject> +class MainWindow; + class TestGui : public QObject { Q_OBJECT @@ -27,6 +29,11 @@ class TestGui : public QObject private Q_SLOTS: void initTestCase(); void testOpenDatabase(); + void testTabs(); + void cleanupTestCase(); + +private: + MainWindow* m_mainWindow; }; #endif // KEEPASSX_TESTGUI_H |