diff options
author | Robert Loehning <robert.loehning@qt.io> | 2018-05-03 18:05:20 +0200 |
---|---|---|
committer | Robert Loehning <robert.loehning@qt.io> | 2018-05-08 09:05:25 +0000 |
commit | 06c2e693015c01954038f7a85523eb5f226fccf6 (patch) | |
tree | b0a4ef669ab1f499074c3a87b3324b976c634942 | |
parent | 1f1be705463c9ad240055c58257fc78221d9ae51 (diff) |
Squish: Use Locator instead of menu hack
Change-Id: I4e84a52fb6ad4c93ef53bb1a17639fd8b263b987
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r-- | tests/system/shared/utils.py | 19 | ||||
-rw-r--r-- | tests/system/suite_general/tst_installed_languages/test.py | 19 | ||||
-rw-r--r-- | tests/system/suite_general/tst_installed_languages/testdata/languages.tsv | 24 |
3 files changed, 20 insertions, 42 deletions
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index c8bd71da6f..8d1ce8682b 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -176,21 +176,10 @@ def invokeMenuItem(menu, item, *subItems): waitForObject(":Qt Creator.QtCreator.MenuBar_QMenuBar", 2000) except: nativeMouseClick(waitForObject(":Qt Creator_Core::Internal::MainWindow", 1000), 20, 20, 0, Qt.LeftButton) - # HACK as Squish fails to provide a proper way to access the system menu - if platform.system() == "Darwin": - if menu == "Tools" and item == "Options...": - #nativeType("<Command+,>") - # the following is a pure HACK because using the default key sequence seems to be broken - # when running from inside Squish - menuBar = waitForObject(":Qt Creator.QtCreator.MenuBar_QMenuBar", 500) - nativeMouseClick(menuBar, 75, 5, 0, Qt.LeftButton) - for _ in range(3): - nativeType("<Down>") - nativeType("<Return>") - return - if menu == "File" and item == "Exit": - nativeType("<Command+q>") - return + # Use Locator for menu items which wouldn't work on macOS + if menu == "Tools" and item == "Options..." or menu == "File" and item == "Exit": + selectFromLocator("t %s" % item, item) + return menuObject = waitForObjectItem(":Qt Creator.QtCreator.MenuBar_QMenuBar", menu) snooze(1) waitFor("menuObject.visible", 1000) diff --git a/tests/system/suite_general/tst_installed_languages/test.py b/tests/system/suite_general/tst_installed_languages/test.py index d4869559e9..3ec32bf349 100644 --- a/tests/system/suite_general/tst_installed_languages/test.py +++ b/tests/system/suite_general/tst_installed_languages/test.py @@ -50,21 +50,10 @@ def main(): overrideStartApplication() startApplication("qtcreator" + SettingsPath) try: - if platform.system() == 'Darwin': - try: - fileMenu = waitForObjectItem(":Qt Creator.QtCreator.MenuBar_QMenuBar", - testData.field(lang, "File")) - activateItem(fileMenu) - obj = waitForObject("{type='QMenu' visible='1'}") - test.compare(str(obj.objectName), 'QtCreator.Menu.File', - "Creator was running in %s translation" % languageName) - activateItem(fileMenu) - except: - test.fail("Creator seems to be missing %s translation" % languageName) - nativeType("<Command+q>") - else: - invokeMenuItem(testData.field(lang, "File"), testData.field(lang, "Exit")) - test.passes("Creator was running in %s translation." % languageName) + # Use Locator for menu items which wouldn't work on macOS + exitCommand = testData.field(lang, "Exit") + selectFromLocator("t %s" % exitCommand.rstrip("(X)"), exitCommand) + test.passes("Creator was running in %s translation." % languageName) except: test.fail("Creator seems to be missing %s translation" % languageName) sendEvent("QCloseEvent", ":Qt Creator_Core::Internal::MainWindow") diff --git a/tests/system/suite_general/tst_installed_languages/testdata/languages.tsv b/tests/system/suite_general/tst_installed_languages/testdata/languages.tsv index 0ab6a81985..6de7b8fc23 100644 --- a/tests/system/suite_general/tst_installed_languages/testdata/languages.tsv +++ b/tests/system/suite_general/tst_installed_languages/testdata/languages.tsv @@ -1,12 +1,12 @@ -"language" "File" "Exit" "ISO" -"Czech (CzechRepublic)" "Soubor" "Ukončit" "cs_CZ" -"Danish (Denmark)" "Fil" "Afslut" "da_DK" -"German (Germany)" "Datei" "Beenden" "de_DE" -"French (France)" "Fichier" "Quitter" "fr_FR" -"Japanese (Japan)" "ファイル(F)" "終了(X)" "ja_JP" -"Polish (Poland)" "Plik" "Zakończ" "pl_PL" -"Russian (%1)" "Файл" "Выход" "ru_RU" -"Slovenian (Slovenia)" "Datoteka" "Končaj" "sl_SL" -"Ukrainian (Ukraine)" "Файл" "Вийти" "uk_UA" -"Chinese (China)" "文件(F)" "退出(X)" "zh_CN" -"Chinese (Taiwan)" "檔案(F)" "離開(X)" "zh_TW" +"language" "Exit" "ISO" +"Czech (CzechRepublic)" "Ukončit" "cs_CZ" +"Danish (Denmark)" "Afslut" "da_DK" +"German (Germany)" "Beenden" "de_DE" +"French (France)" "Quitter" "fr_FR" +"Japanese (Japan)" "終了(X)" "ja_JP" +"Polish (Poland)" "Zakończ" "pl_PL" +"Russian (%1)" "Выход" "ru_RU" +"Slovenian (Slovenia)" "Končaj" "sl_SL" +"Ukrainian (Ukraine)" "Вийти" "uk_UA" +"Chinese (China)" "退出(X)" "zh_CN" +"Chinese (Taiwan)" "離開(X)" "zh_TW" |