prehistoric-systems/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2026-03-11 08:54:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix Linux test failures (#13113)

Browse source 
* Fix test failure introduced by ab31a748fa (#10993)

* Fix tray hiding test failure

Introduced by 43904d87b7 (#10928), but somehow hasn't posed an issue until now.

---------

Co-authored-by: Jonathan White <support@dmapps.us>
This commit is contained in:
Janek Bevendorff 2026-03-06 23:59:02 +01:00
parent b124f57dd9
commit be1efffde7
No known key found for this signature in database
GPG key ID: 2CF41D2AA8438F99
2 changed files with 20 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/gui/TestGui.cpp
View file

@ -346,8 +346,8 @@ void TestGui::testMergeDatabase()
fileDialog()->setNextFileName(QString(KEEPASSX_TEST_DATA_DIR).append("/MergeDatabase.kdbx")); fileDialog()->setNextFileName(QString(KEEPASSX_TEST_DATA_DIR).append("/MergeDatabase.kdbx"));
triggerAction("actionDatabaseMerge"); triggerAction("actionDatabaseMerge");
QTRY_COMPARE(QApplication::focusWidget()->objectName(), QString("passwordEdit")); QWidget* editPasswordMerge;
auto* editPasswordMerge = QApplication::focusWidget(); QTRY_VERIFY((editPasswordMerge = QApplication::focusWidget()) && editPasswordMerge->objectName() == "passwordEdit");
QVERIFY(editPasswordMerge->isVisible()); QVERIFY(editPasswordMerge->isVisible());
QTest::keyClicks(editPasswordMerge, "a"); QTest::keyClicks(editPasswordMerge, "a");
@ -1931,18 +1931,28 @@ void TestGui::testTrayRestoreHide()
trayIcon->activated(QSystemTrayIcon::Trigger); trayIcon->activated(QSystemTrayIcon::Trigger);
QTRY_VERIFY(m_mainWindow->isVisible()); QTRY_VERIFY(m_mainWindow->isVisible());
// Wait out window hide grace period before triggering tray icon again
int gracePeriod = 250;
#ifdef Q_OS_WIN
// Windows requires a shorter grace period
gracePeriod = 50;
#endif
Tools::wait(gracePeriod);
trayIcon->activated(QSystemTrayIcon::Trigger); trayIcon->activated(QSystemTrayIcon::Trigger);
QTRY_VERIFY(!m_mainWindow->isVisible()); QTRY_VERIFY(!m_mainWindow->isVisible());
trayIcon->activated(QSystemTrayIcon::MiddleClick); trayIcon->activated(QSystemTrayIcon::MiddleClick);
QTRY_VERIFY(m_mainWindow->isVisible()); QTRY_VERIFY(m_mainWindow->isVisible());
Tools::wait(gracePeriod);
trayIcon->activated(QSystemTrayIcon::MiddleClick); trayIcon->activated(QSystemTrayIcon::MiddleClick);
QTRY_VERIFY(!m_mainWindow->isVisible()); QTRY_VERIFY(!m_mainWindow->isVisible());
trayIcon->activated(QSystemTrayIcon::DoubleClick); trayIcon->activated(QSystemTrayIcon::DoubleClick);
QTRY_VERIFY(m_mainWindow->isVisible()); QTRY_VERIFY(m_mainWindow->isVisible());
Tools::wait(gracePeriod);
trayIcon->activated(QSystemTrayIcon::DoubleClick); trayIcon->activated(QSystemTrayIcon::DoubleClick);
QTRY_VERIFY(!m_mainWindow->isVisible()); QTRY_VERIFY(!m_mainWindow->isVisible());

40
tests/gui/attachments/TestImageAttachmentsWidget.cpp
View file

@ -43,10 +43,7 @@ void TestImageAttachmentsWidget::testFitInView()
auto zoomFactor = m_imageAttachmentsView->transform(); auto zoomFactor = m_imageAttachmentsView->transform();
m_widget->setMinimumSize(m_widget->size() + QSize{100, 100}); m_widget->setMinimumSize(m_widget->size() + QSize{100, 100});
QTRY_VERIFY(zoomFactor != m_imageAttachmentsView->transform());
QCoreApplication::processEvents();
QVERIFY(zoomFactor != m_imageAttachmentsView->transform());
} }
void TestImageAttachmentsWidget::testZoomCombobox() void TestImageAttachmentsWidget::testZoomCombobox()
@ -56,10 +53,7 @@ void TestImageAttachmentsWidget::testZoomCombobox()
QVERIFY(index != -1); QVERIFY(index != -1);
m_zoomCombobox->setCurrentIndex(index); m_zoomCombobox->setCurrentIndex(index);
QTRY_COMPARE(m_imageAttachmentsView->transform(), QTransform::fromScale(zoom, zoom));
QCoreApplication::processEvents();
QCOMPARE(m_imageAttachmentsView->transform(), QTransform::fromScale(zoom, zoom));
} }
} }
@ -67,10 +61,7 @@ void TestImageAttachmentsWidget::testEditZoomCombobox()
{ {
for (double i = 0.25; i < 5; i += 0.25) { for (double i = 0.25; i < 5; i += 0.25) {
m_zoomCombobox->setCurrentText(QString::number(i * 100)); m_zoomCombobox->setCurrentText(QString::number(i * 100));
QTRY_COMPARE(m_imageAttachmentsView->transform(), QTransform::fromScale(i, i));
QCoreApplication::processEvents();
QCOMPARE(m_imageAttachmentsView->transform(), QTransform::fromScale(i, i));
} }
} }
@ -79,19 +70,13 @@ void TestImageAttachmentsWidget::testEditWithPercentZoomCombobox()
// Example 100 % // Example 100 %
for (double i = 0.25; i < 5; i += 0.25) { for (double i = 0.25; i < 5; i += 0.25) {
m_zoomCombobox->setCurrentText(QString("%1 %").arg(i * 100)); m_zoomCombobox->setCurrentText(QString("%1 %").arg(i * 100));
QTRY_COMPARE(m_imageAttachmentsView->transform(), QTransform::fromScale(i, i));
QCoreApplication::processEvents();
QCOMPARE(m_imageAttachmentsView->transform(), QTransform::fromScale(i, i));
} }
// Example 100% // Example 100%
for (double i = 0.25; i < 5; i += 0.25) { for (double i = 0.25; i < 5; i += 0.25) {
m_zoomCombobox->setCurrentText(QString("%1%").arg(i * 100)); m_zoomCombobox->setCurrentText(QString("%1%").arg(i * 100));
QTRY_COMPARE(m_imageAttachmentsView->transform(), QTransform::fromScale(i, i));
QCoreApplication::processEvents();
QCOMPARE(m_imageAttachmentsView->transform(), QTransform::fromScale(i, i));
} }
} }
@ -108,10 +93,7 @@ void TestImageAttachmentsWidget::testInvalidValueZoomCombobox()
for (const auto& invalidValue : {"Help", "3,4", "", ".", "% 100"}) { for (const auto& invalidValue : {"Help", "3,4", "", ".", "% 100"}) {
m_zoomCombobox->setCurrentText(invalidValue); m_zoomCombobox->setCurrentText(invalidValue);
QTRY_COMPARE(m_imageAttachmentsView->transform(), expectedTransform);
QCoreApplication::processEvents();
QCOMPARE(m_imageAttachmentsView->transform(), expectedTransform);
} }
} }
@ -208,10 +190,7 @@ void TestImageAttachmentsWidget::testZoomLowerBound()
true); true);
QCoreApplication::sendEvent(m_imageAttachmentsView->viewport(), &event); QCoreApplication::sendEvent(m_imageAttachmentsView->viewport(), &event);
QTRY_COMPARE(m_imageAttachmentsView->transform(), expectTransform);
QCoreApplication::processEvents();
QCOMPARE(m_imageAttachmentsView->transform(), expectTransform);
} }
void TestImageAttachmentsWidget::testZoomUpperBound() void TestImageAttachmentsWidget::testZoomUpperBound()
@ -237,8 +216,5 @@ void TestImageAttachmentsWidget::testZoomUpperBound()
true); true);
QCoreApplication::sendEvent(m_imageAttachmentsView->viewport(), &event); QCoreApplication::sendEvent(m_imageAttachmentsView->viewport(), &event);
QTRY_COMPARE(m_imageAttachmentsView->transform(), expectTransform);
QCoreApplication::processEvents();
QCOMPARE(m_imageAttachmentsView->transform(), expectTransform);
} }