summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@theqtcompany.com>2015-02-11 12:02:52 +0100
committerRobert Loehning <robert.loehning@theqtcompany.com>2015-02-11 11:13:38 +0000
commitf2c9cd655e9b87a408d504ca3f5830aa76f22187 (patch)
tree3b8525796431e144b199530372b311d560424683
parent8d27ec664a2dbdd3a4941965dbf3883e671b7bcc (diff)
downloadqt-creator-f2c9cd655e9b87a408d504ca3f5830aa76f22187.tar.gz
Squish: Prepare help tests for Qt 5.4
Change-Id: I38568b325ae37d8b75ad3481ef0cc6ced0a99488 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
-rw-r--r--tests/system/shared/qtcreator.py2
-rwxr-xr-xtests/system/suite_HELP/tst_HELP06/test.py8
-rwxr-xr-xtests/system/suite_WELP/tst_WELP01/test.py5
3 files changed, 13 insertions, 2 deletions
diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index 559334ea3f..5190f1b375 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 7f79a04686..3d5a96b0d6 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 5b8208b710..fd19e479b4 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)