feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SquishTests: Fix used short cut on macOS

Browse Source 
Modify used short cut on macOS again. This tends to break
depending on OS version, underlying keyboard layout and
maybe even more causes.

Change-Id: I79b0e281128b8f779307782038aa9fb42510b633
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Christian Stenger
2023-07-20 07:22:24 +02:00
parent b44a7817b8
commit d53a743262
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/system/suite_HELP/tst_HELP02/test.py
View File

@@ -3,6 +3,14 @@
source("../../shared/qtcreator.py") source("../../shared/qtcreator.py")
if platform.system() == 'Darwin':
keysToType = '<Command+Alt+a>'
expectedKeys = 'Cmd+Opt+A'
else:
keysToType = '<Ctrl+Alt+a>'
expectedKeys = 'Ctrl+Alt+A'
# test Qt Creator version information from file and dialog # test Qt Creator version information from file and dialog
def getQtCreatorVersionFromDialog(): def getQtCreatorVersionFromDialog():
chk = re.search("(?<=Qt Creator)\s\d+.\d+.\d+[-\w]*", chk = re.search("(?<=Qt Creator)\s\d+.\d+.\d+[-\w]*",
@@ -68,17 +76,16 @@ def setKeyboardShortcutForAboutQtC():
"visible='1' text~='(Stop Recording|Record)'}" % shortcutGB) "visible='1' text~='(Stop Recording|Record)'}" % shortcutGB)
shortcut = ("{container=%s type='Utils::FancyLineEdit' unnamed='1' visible='1' " shortcut = ("{container=%s type='Utils::FancyLineEdit' unnamed='1' visible='1' "
"placeholderText='Enter key sequence as text'}" % shortcutGB) "placeholderText='Enter key sequence as text'}" % shortcutGB)
expected = 'Ctrl+Opt+A' if platform.system() == 'Darwin' else 'Ctrl+Alt+A'
clickButton(record) clickButton(record)
nativeType("<Ctrl+Alt+a>") nativeType(keysToType)
waitFor("_shortcutMatches_(shortcut, expected)", 5000) waitFor("_shortcutMatches_(shortcut, expectedKeys)", 5000)
clickButton(record) clickButton(record)
gotExpectedShortcut = _shortcutMatches_(shortcut, expected) gotExpectedShortcut = _shortcutMatches_(shortcut, expectedKeys)
if not gotExpectedShortcut and platform.system() == 'Darwin': if not gotExpectedShortcut and platform.system() == 'Darwin':
test.warning("Squish Issue: shortcut was set to %s - entering it manually now" test.warning("Squish Issue: shortcut was set to %s - entering it manually now"
% waitForObject(shortcut).text) % waitForObject(shortcut).text)
replaceEditorContent(shortcut, expected) replaceEditorContent(shortcut, expectedKeys)
else: else:
test.verify(gotExpectedShortcut, "Expected key sequence is displayed.") test.verify(gotExpectedShortcut, "Expected key sequence is displayed.")
clickButton(waitForObject(":Options.OK_QPushButton")) clickButton(waitForObject(":Options.OK_QPushButton"))
@@ -97,7 +104,7 @@ def main():
waitForObject(":Qt Creator.QtCreator.MenuBar_QMenuBar", 2000) waitForObject(":Qt Creator.QtCreator.MenuBar_QMenuBar", 2000)
except: except:
nativeMouseClick(waitForObject(":Qt Creator_Core::Internal::MainWindow", 1000), 20, 20, 0, Qt.LeftButton) nativeMouseClick(waitForObject(":Qt Creator_Core::Internal::MainWindow", 1000), 20, 20, 0, Qt.LeftButton)
nativeType("<Ctrl+Alt+a>") nativeType(keysToType)
# verify qt creator version # verify qt creator version
try: try:
waitForObject(":About Qt Creator_Core::Internal::VersionDialog", 5000) waitForObject(":About Qt Creator_Core::Internal::VersionDialog", 5000)