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

Squish: Improve invokeMenuItem()

Browse Source 
Change-Id: I977a9465a944f30fc195e6072f50b663f5d4d24d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Christian Stenger
2013-07-30 09:32:22 +02:00
parent 3be6065b04
commit a932c6ebca
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/system/shared/utils.py
View File

@@ -225,7 +225,7 @@ def cleanUpUserFiles(pathsToProFiles=None):
doneWithoutErrors = False doneWithoutErrors = False
return doneWithoutErrors return doneWithoutErrors
def invokeMenuItem(menu, item, subItem = None): def invokeMenuItem(menu, item, *subItems):
if platform.system() == "Darwin": if platform.system() == "Darwin":
try: try:
waitForObject(":Qt Creator.QtCreator.MenuBar_QMenuBar", 2000) waitForObject(":Qt Creator.QtCreator.MenuBar_QMenuBar", 2000)
@@ -237,10 +237,11 @@ def invokeMenuItem(menu, item, subItem = None):
itemObject = waitForObjectItem(objectMap.realName(menuObject), item) itemObject = waitForObjectItem(objectMap.realName(menuObject), item)
waitFor("itemObject.enabled", 2000) waitFor("itemObject.enabled", 2000)
activateItem(itemObject) activateItem(itemObject)
if subItem != None: for subItem in subItems:
sub = itemObject.menu() sub = itemObject.menu()
waitFor("sub.visible", 1000) waitFor("sub.visible", 1000)
activateItem(waitForObjectItem(sub, subItem)) itemObject = waitForObjectItem(sub, subItem)
activateItem(itemObject)
def logApplicationOutput(): def logApplicationOutput():
# make sure application output is shown # make sure application output is shown