diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2016-10-18 10:39:04 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2016-11-14 06:53:31 +0000 |
| commit | be9c7d6929d3c89b613088fe79f6f3e199563860 (patch) | |
| tree | fa3ed8e015255b444468b59125146422f09bac60 /tests/system | |
| parent | 701ccc5e3b1e5de97cfd52e50e1125bb8abb8de5 (diff) | |
| download | qt-creator-be9c7d6929d3c89b613088fe79f6f3e199563860.tar.gz | |
Squish: Fix triggering items listed under "Recent Files"
UI has changed again, so adapt the test to reflect this.
Change-Id: I5d6bcf2b48b8b625f6086f5a1101041a73d7e329
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Diffstat (limited to 'tests/system')
| -rw-r--r-- | tests/system/shared/utils.py | 4 | ||||
| -rw-r--r-- | tests/system/suite_editors/tst_generic_highlighter/test.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index 9f716d8639..db4c4e1cd5 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -198,7 +198,7 @@ def invokeMenuItem(menu, item, *subItems): itemObject = waitForObjectItem(objectMap.realName(menuObject), item) waitFor("itemObject.enabled", 2000) activateItem(itemObject) - numberedPrefix = "&?\\d+: " + numberedPrefix = "(&\\d \| )?" for subItem in subItems: sub = itemObject.menu() waitFor("sub.visible", 1000) @@ -209,7 +209,7 @@ def invokeMenuItem(menu, item, *subItems): for i in range(actions.count()): current = actions.at(i) nonPrefix = subItem[len(numberedPrefix):] - matcher = re.match("(%s)(.*)" % numberedPrefix, str(current.text)) + matcher = re.match("%s(.*)" % numberedPrefix, str(current.text)) if matcher and matcher.group(2) == nonPrefix: itemObject = current activateItem(itemObject) diff --git a/tests/system/suite_editors/tst_generic_highlighter/test.py b/tests/system/suite_editors/tst_generic_highlighter/test.py index a47b2136b2..8e249df54e 100644 --- a/tests/system/suite_editors/tst_generic_highlighter/test.py +++ b/tests/system/suite_editors/tst_generic_highlighter/test.py @@ -213,7 +213,7 @@ def main(): recentFile = os.path.join(folder, current) if recentFile.startswith(home) and platform.system() in ('Linux', 'Darwin'): recentFile = recentFile.replace(home, "~", 1) - invokeMenuItem("File", "Recent Files", "&?\\d+: %s" % recentFile) + invokeMenuItem("File", "Recent Files", "(&\\d \| )?%s" % recentFile) editor = getEditorForFileSuffix(current) display = displayHintForHighlighterDefinition(current, patterns, lPatterns, addedHighlighterDefinition, |