yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

autotests: Fix testGlobalShortcuts in Qt 6 build

Browse source 
QXkbCommon fails to map `Ё` to `~` when pressing `Shift+grave` and
sequenceEdit seems to have focus now.

On the other hand, does it make sense to bind global shortcuts with key
sequences such as "Shift+`"? The system settings doesn't even allow typing
in such key sequences.
This commit is contained in:
Vlad Zahorodnii 2022-10-22 16:16:06 +03:00
parent de0c94df8d
commit 64dc8d7cfe
1 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
autotests/integration/globalshortcuts_test.cpp
View file

@ -95,34 +95,29 @@ void GlobalShortcutsTest::testNonLatinLayout_data()
QTest::addColumn<int>("key"); QTest::addColumn<int>("key");
QTest::addColumn<Qt::Key>("qtKey"); QTest::addColumn<Qt::Key>("qtKey");
for (const auto &modifier : // KEY_W is "ц" in the RU layout and "w" in the US layout
QVector<QPair<int, Qt::Modifier>>{ // KEY_GRAVE is "ё" in the RU layout and "`" in the US layout
{KEY_LEFTCTRL, Qt::CTRL}, // TAB_KEY is the same both in the US and RU layout
{KEY_LEFTALT, Qt::ALT},
{KEY_LEFTSHIFT, Qt::SHIFT},
{KEY_LEFTMETA, Qt::META},
}) {
for (const auto &key :
QVector<QPair<int, Qt::Key>> {
// Tab is example of a key usually the same on different layouts, check it first
{KEY_TAB, Qt::Key_Tab},
// Then check a key with a Latin letter. QTest::newRow("Left Ctrl + Tab") << KEY_LEFTCTRL << Qt::CTRL << KEY_TAB << Qt::Key_Tab;
// The symbol will probably be differ on non-Latin layout. QTest::newRow("Left Ctrl + W") << KEY_LEFTCTRL << Qt::CTRL << KEY_W << Qt::Key_W;
// On Russian layout, "w" key has a cyrillic letter "ц" #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
{KEY_W, Qt::Key_W}, QTest::newRow("Left Ctrl + `") << KEY_LEFTCTRL << Qt::CTRL << KEY_GRAVE << Qt::Key_QuoteLeft;
#endif
#if QT_VERSION_MAJOR > 5 // since Qt 5 LTS is frozen
// More common case with any Latin1 symbol keys, including punctuation, should work also. QTest::newRow("Left Alt + Tab") << KEY_LEFTALT << Qt::ALT << KEY_TAB << Qt::Key_Tab;
// "`" key has a "ё" letter on Russian layout QTest::newRow("Left Alt + W") << KEY_LEFTALT << Qt::ALT << KEY_W << Qt::Key_W;
// FIXME: QTBUG-90611 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
{KEY_GRAVE, Qt::Key_QuoteLeft}, QTest::newRow("Left Alt + `") << KEY_LEFTALT << Qt::ALT << KEY_GRAVE << Qt::Key_QuoteLeft;
#endif
QTest::newRow("Left Shift + Tab") << KEY_LEFTSHIFT << Qt::SHIFT << KEY_TAB << Qt::Key_Tab;
QTest::newRow("Left Meta + Tab") << KEY_LEFTMETA << Qt::META << KEY_TAB << Qt::Key_Tab;
QTest::newRow("Left Meta + W") << KEY_LEFTMETA << Qt::META << KEY_W << Qt::Key_W;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QTest::newRow("Left Meta + `") << KEY_LEFTMETA << Qt::META << KEY_GRAVE << Qt::Key_QuoteLeft;
#endif #endif
}) {
QTest::newRow(QKeySequence(modifier.second + key.second).toString().toLatin1().constData())
<< modifier.first << modifier.second << key.first << key.second;
}
}
} }
void GlobalShortcutsTest::testNonLatinLayout() void GlobalShortcutsTest::testNonLatinLayout()
@ -421,10 +416,12 @@ void GlobalShortcutsTest::testSetupWindowShortcut()
auto sequenceEdit = workspace()->shortcutDialog()->findChild<QKeySequenceEdit *>(); auto sequenceEdit = workspace()->shortcutDialog()->findChild<QKeySequenceEdit *>();
QVERIFY(sequenceEdit); QVERIFY(sequenceEdit);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
// the QKeySequenceEdit field does not get focus, we need to pass it focus manually // the QKeySequenceEdit field does not get focus, we need to pass it focus manually
QEXPECT_FAIL("", "Edit does not have focus", Continue); QEXPECT_FAIL("", "Edit does not have focus", Continue);
QVERIFY(sequenceEdit->hasFocus()); QVERIFY(sequenceEdit->hasFocus());
sequenceEdit->setFocus(); sequenceEdit->setFocus();
#endif
QTRY_VERIFY(sequenceEdit->hasFocus()); QTRY_VERIFY(sequenceEdit->hasFocus());
quint32 timestamp = 0; quint32 timestamp = 0;