kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-10 22:24:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1427 from bhangart/test/menubar-wait-active

Browse Source 
Wait for the window to be active in the menu bar keyboard tests
This commit is contained in:
ispyisail
2026-10-10 07:51:55 +13:00
committed by GitHub
parent ce3a4d82ea 7866a37f14
commit 82716f6291
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/qttest/tst_menubarkeyboard.cpp
+19 -7
View File
@@ -72,6 +72,18 @@ QMainWindow *makeWindow(QMenu **file_menu)
return w;
}
/*
Menu mnemonics and the F10 shortcut (a Qt::WindowShortcut) only fire
in the active window. Being exposed is not enough: on a loaded Xvfb or
with another application in front on macOS, activation arrives later,
and a key sent before it is dropped. Every test waits for activation
before pressing anything.
*/
bool waitForActiveWindow(QMainWindow *w)
{
return QTest::qWaitForWindowExposed(w) && QTest::qWaitForWindowActive(w);
}
}
/*
@@ -95,12 +107,12 @@ void TstMenuBarKeyboard::altLetterOpensMenu()
{
QMenu *file = nullptr;
QScopedPointer<QMainWindow> w(makeWindow(&file));
QVERIFY(QTest::qWaitForWindowExposed(w.data()));
QVERIFY2(waitForActiveWindow(w.data()),
"the test window never became active");
QTest::keyClick(w.data(), Qt::Key_F, Qt::AltModifier);
QTest::qWait(300);
QVERIFY2(file->isVisible(),
QTRY_VERIFY2(file->isVisible(),
"control failed: Alt+F did not open a menu, so this environment "
"cannot judge any of the keyboard tests below");
}
@@ -113,7 +125,8 @@ void TstMenuBarKeyboard::plainF10DoesNothingInQt()
{
QMenu *file = nullptr;
QScopedPointer<QMainWindow> w(makeWindow(&file));
QVERIFY(QTest::qWaitForWindowExposed(w.data()));
QVERIFY2(waitForActiveWindow(w.data()),
"the test window never became active");
QTest::keyClick(w.data(), Qt::Key_F10, Qt::NoModifier);
QTest::qWait(300);
@@ -139,7 +152,7 @@ void TstMenuBarKeyboard::shortcutOpensMenuBar()
QMenu *file = nullptr;
QScopedPointer<QMainWindow> holder(makeWindow(&file));
QMainWindow *w = holder.data();
QVERIFY(QTest::qWaitForWindowExposed(w));
QVERIFY2(waitForActiveWindow(w), "the test window never became active");
auto *shortcut = new QShortcut(QKeySequence(Qt::Key_F10), w);
shortcut->setContext(Qt::WindowShortcut);
@@ -153,9 +166,8 @@ void TstMenuBarKeyboard::shortcutOpensMenuBar()
});
QTest::keyClick(w, Qt::Key_F10, Qt::NoModifier);
QTest::qWait(300);
QVERIFY2(w->menuBar()->activeAction() != nullptr,
QTRY_VERIFY2(w->menuBar()->activeAction() != nullptr,
"F10 did not activate the menu bar");
QCOMPARE(w->menuBar()->activeAction()->text(), QStringLiteral("&File"));
}