From aec25d293b2d6bf2b612b5bf2ec3cdd54696727b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Thu, 12 Aug 2021 20:19:47 +0200 Subject: [PATCH] Squish: Use regex instead of wildcard to find objects Squish 6.7.1 for Qt 6.1.x can't find the objects when using wildcards. The same version of Squish for Qt 5.15.x works fine. Change-Id: Ia378934af51cab2894a9df01e2391dbdb9cf32f9 Reviewed-by: Christian Stenger --- tests/system/shared/project.py | 2 +- tests/system/suite_HELP/tst_HELP02/test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 6952db9f9e4..b304b4966c7 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -99,7 +99,7 @@ def __createProjectOrFileSelectType__(category, template, fromWelcome = False, i def __createProjectSetNameAndPath__(path, projectName = None, checks = True): directoryEdit = waitForObject("{type='Utils::FancyLineEdit' unnamed='1' visible='1' " - "toolTip?='Full path: *'}") + "toolTip~='Full path: .*'}") replaceEditorContent(directoryEdit, path) projectNameEdit = waitForObject("{name='nameLineEdit' visible='1' " "type='Utils::FancyLineEdit'}") diff --git a/tests/system/suite_HELP/tst_HELP02/test.py b/tests/system/suite_HELP/tst_HELP02/test.py index 2492be950fa..921a1c701b9 100755 --- a/tests/system/suite_HELP/tst_HELP02/test.py +++ b/tests/system/suite_HELP/tst_HELP02/test.py @@ -28,7 +28,7 @@ source("../../shared/qtcreator.py") # test Qt Creator version information from file and dialog def getQtCreatorVersionFromDialog(): chk = re.search("(?<=Qt Creator)\s\d+.\d+.\d+[-\w]*", - str(waitForObject("{text?='*Qt Creator*' type='QLabel' unnamed='1' visible='1' " + str(waitForObject("{text~='.*Qt Creator.*' type='QLabel' unnamed='1' visible='1' " "window=':About Qt Creator_Core::Internal::VersionDialog'}").text)) try: ver = chk.group(0).strip()