From 5ba3eb7fcf4aadaabefa703b558e991d73c91a3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Fri, 22 Oct 2021 21:29:22 +0200 Subject: [PATCH] Squish: Update for running tst_generic_highlighter Change-Id: I262fb7a7223e235708cbc7e8e382a2448a2f8c84 Reviewed-by: Christian Stenger --- tests/system/shared/utils.py | 15 ++++++--------- .../suite_editors/tst_generic_highlighter/test.py | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index 71427adb03d..74ce0723924 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -190,22 +190,19 @@ 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: # we might have numbered sub items (e.g. "Recent Files") - these have this special prefix if subItem.startswith(numberedPrefix): - # TODO: Find fix for Qt 6 - actions = sub.actions() triggered = False - for i in range(actions.count()): - current = actions.at(i) - nonPrefix = subItem[len(numberedPrefix):] - matcher = re.match("%s(.*)" % numberedPrefix, str(current.text)) - if matcher and matcher.group(2) == nonPrefix: - itemObject = current + for i in range(1, 10): + try: + itemObject = waitForObjectItem(itemObject, subItem % i, 1000) activateItem(itemObject) triggered = True break + except: + continue if not triggered: test.fail("Could not trigger '%s' - item missing or code wrong?" % subItem, "Function arguments: '%s', '%s', %s" % (menu, item, str(subItems))) diff --git a/tests/system/suite_editors/tst_generic_highlighter/test.py b/tests/system/suite_editors/tst_generic_highlighter/test.py index c154e32cacc..e3975c787e7 100644 --- a/tests/system/suite_editors/tst_generic_highlighter/test.py +++ b/tests/system/suite_editors/tst_generic_highlighter/test.py @@ -199,7 +199,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 | " + recentFile) editor = getEditorForFileSuffix(current) display = displayHintForHighlighterDefinition(current, patterns, lPatterns, addedHaskell, addedLiterateHaskell)