From f2c9cd655e9b87a408d504ca3f5830aa76f22187 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 11 Feb 2015 12:02:52 +0100 Subject: [PATCH] Squish: Prepare help tests for Qt 5.4 Change-Id: I38568b325ae37d8b75ad3481ef0cc6ced0a99488 Reviewed-by: Christian Stenger --- tests/system/shared/qtcreator.py | 2 ++ tests/system/suite_HELP/tst_HELP06/test.py | 8 +++++++- tests/system/suite_WELP/tst_WELP01/test.py | 5 ++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py index 559334ea3f2..5190f1b3759 100644 --- a/tests/system/shared/qtcreator.py +++ b/tests/system/shared/qtcreator.py @@ -39,6 +39,8 @@ import sys import errno; from datetime import datetime,timedelta; +isQt53Build = os.getenv("SYSTEST_ISQT53BUILD") != "0" + srcPath = '' SettingsPath = '' tmpSettingsDir = '' diff --git a/tests/system/suite_HELP/tst_HELP06/test.py b/tests/system/suite_HELP/tst_HELP06/test.py index 7f79a046865..3d5a96b0d63 100755 --- a/tests/system/suite_HELP/tst_HELP06/test.py +++ b/tests/system/suite_HELP/tst_HELP06/test.py @@ -45,7 +45,13 @@ def invokeContextMenuItemOnBookmarkFolder(view, item, menuItem): "window=':Add Bookmark_BookmarkDialog'}" % aboveWidget), menuItem) def textForQtVersion(text): - return text + " | QtCreator" + if isQt53Build: + return text + " | QtCreator" + else: + suffix = "Qt Creator Manual" + if text != suffix: + text += " | " + suffix + return text def main(): startApplication("qtcreator" + SettingsPath) diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py index 5b8208b7104..fd19e479b42 100755 --- a/tests/system/suite_WELP/tst_WELP01/test.py +++ b/tests/system/suite_WELP/tst_WELP01/test.py @@ -83,7 +83,10 @@ def main(): test.verify(checkIfObjectExists(gettingStartedText), "Verifying: Qt Creator displays Welcome Page with 'Get Started Now' button.") - expectedText = "(QtCreator : Qt Creator Manual)|(Qt Creator Manual [|] QtCreator)" + if isQt53Build: + expectedText = "(QtCreator : Qt Creator Manual)|(Qt Creator Manual [|] QtCreator)" + else: + expectedText = "Qt Creator Manual" testDetails = "Verifying: Help with Creator Documentation is being opened." clickItemVerifyHelpCombo(gettingStartedText, expectedText, testDetails)