From dbfa9280b00a572d3b10328a63549ebb7bc9f5aa Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 22 Apr 2016 13:48:47 +0200 Subject: [PATCH] Squish: Fix assigning shortcut Change-Id: I32d563a198ec1e56b86e97f6803dd2e15f1bd565 Reviewed-by: Robert Loehning --- tests/system/suite_HELP/tst_HELP02/test.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/system/suite_HELP/tst_HELP02/test.py b/tests/system/suite_HELP/tst_HELP02/test.py index 7c0b6f67fc4..7427014bef0 100755 --- a/tests/system/suite_HELP/tst_HELP02/test.py +++ b/tests/system/suite_HELP/tst_HELP02/test.py @@ -76,11 +76,19 @@ def setKeyboardShortcutForAboutQtC(): "container={column='0' text='QtCreator' type='QModelIndex' " "container=%s}}" % objectMap.realName(treewidget)) mouseClick(modelIndex, 5, 5, 0, Qt.LeftButton) - shortcut = waitForObject("{container={title='Shortcut' type='QGroupBox' unnamed='1' " - "visible='1'} type='Utils::FancyLineEdit' unnamed='1' visible='1' " - "placeHolderText='Type to set shortcut'}") - mouseClick(shortcut, 5, 5, 0, Qt.LeftButton) + shortcutGB = "{title='Shortcut' type='QGroupBox' unnamed='1' visible='1'}" + record = waitForObject("{container=%s type='Core::Internal::ShortcutButton' unnamed='1' " + "visible='1' text~='(Stop Recording|Record)'}" % shortcutGB) + shortcut = ("{container=%s type='Utils::FancyLineEdit' unnamed='1' visible='1' " + "placeHolderText='Enter key sequence as text'}" % shortcutGB) + clickButton(record) nativeType("") + clickButton(record) + expected = 'Ctrl+Alt+A' + if platform.system() == 'Darwin': + expected = 'Ctrl+Opt+A' + test.verify(waitFor("str(findObject(shortcut).text) == expected", 5000), + "Expected key sequence is displayed.") clickButton(waitForObject(":Options.OK_QPushButton")) def main():