Merge branch '2.0'
This commit is contained in:
@@ -112,6 +112,7 @@ void TestKeys::testFileKey_data()
|
||||
{
|
||||
QTest::addColumn<QString>("type");
|
||||
QTest::newRow("Xml") << QString("Xml");
|
||||
QTest::newRow("XmlBrokenBase64") << QString("XmlBrokenBase64");
|
||||
QTest::newRow("Binary") << QString("Binary");
|
||||
QTest::newRow("Hex") << QString("Hex");
|
||||
QTest::newRow("Hashed") << QString("Hashed");
|
||||
|
||||
BIN
tests/data/FileKeyXmlBrokenBase64.kdbx
Normal file
BIN
tests/data/FileKeyXmlBrokenBase64.kdbx
Normal file
Binary file not shown.
9
tests/data/FileKeyXmlBrokenBase64.key
Normal file
9
tests/data/FileKeyXmlBrokenBase64.key
Normal file
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<KeyFile>
|
||||
<Meta>
|
||||
<Version>1.00</Version>
|
||||
</Meta>
|
||||
<Key>
|
||||
<Data>yy</Data>
|
||||
</Key>
|
||||
</KeyFile>
|
||||
@@ -211,6 +211,10 @@ void TestGui::testSearch()
|
||||
// Search for "some"
|
||||
QTest::keyClicks(searchEdit, "some");
|
||||
QTRY_COMPARE(entryView->model()->rowCount(), 4);
|
||||
// Press Down to focus on the entry view
|
||||
QVERIFY(!entryView->hasFocus());
|
||||
QTest::keyClick(searchEdit, Qt::Key_Down);
|
||||
QVERIFY(entryView->hasFocus());
|
||||
|
||||
clickIndex(entryView->model()->index(0, 1), entryView, Qt::LeftButton);
|
||||
QAction* entryEditAction = m_mainWindow->findChild<QAction*>("actionEntryEdit");
|
||||
|
||||
Reference in New Issue
Block a user