Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-09-18 11:54:47 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/updateKdbxExtract

Browse source
This commit is contained in:
Janek Bevendorff 2017-01-14 22:21:41 +02:00 • committed by GitHub
commit 6fd7427cae
21 changed files with 89 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/TestEntryModel.cpp
View file

@ -236,15 +236,15 @@ void TestEntryModel::testAutoTypeAssociationsModel()
QCOMPARE(model->rowCount(), 0);
AutoTypeAssociations* assocications = new AutoTypeAssociations(this);
model->setAutoTypeAssociations(assocications);
AutoTypeAssociations* associations = new AutoTypeAssociations(this);
model->setAutoTypeAssociations(associations);
QCOMPARE(model->rowCount(), 0);
AutoTypeAssociations::Association assoc;
assoc.window = "1";
assoc.sequence = "2";
assocications->add(assoc);
associations->add(assoc);
QCOMPARE(model->rowCount(), 1);
QCOMPARE(model->data(model->index(0, 0)).toString(), QString("1"));
@ -252,17 +252,17 @@ void TestEntryModel::testAutoTypeAssociationsModel()
assoc.window = "3";
assoc.sequence = "4";
assocications->update(0, assoc);
associations->update(0, assoc);
QCOMPARE(model->data(model->index(0, 0)).toString(), QString("3"));
QCOMPARE(model->data(model->index(0, 1)).toString(), QString("4"));
assocications->add(assoc);
assocications->remove(0);
associations->add(assoc);
associations->remove(0);
QCOMPARE(model->rowCount(), 1);
delete modelTest;
delete model;
delete assocications;
delete associations;
}
void TestEntryModel::testProxyModel()

2
tests/gui/TestGui.cpp
View file

@ -328,7 +328,7 @@ void TestGui::testEntryEntropy()
QTest::keyClicks(titleEdit, "test");
// Open the password generator
QToolButton* generatorButton = editEntryWidget->findChild<QToolButton*>("tooglePasswordGeneratorButton");
QToolButton* generatorButton = editEntryWidget->findChild<QToolButton*>("togglePasswordGeneratorButton");
QTest::mouseClick(generatorButton, Qt::LeftButton);
// Type in some password