From dcc3dcadacbd115002593aaa452c3ba0ba9b37d9 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Tue, 3 Jun 2014 12:58:01 +0200 Subject: [PATCH] Squish: Let tst_HELP04 run on Qt 5.3 Change-Id: I41a3121e616e5709f10e8d03da2fb71356d06498 Reviewed-by: Christian Stenger --- tests/system/objects.map | 2 -- tests/system/suite_HELP/tst_HELP04/test.py | 11 +++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/system/objects.map b/tests/system/objects.map index f9b25dd3437..6d2a24a205b 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -131,7 +131,6 @@ :Qt Creator.Compile Output_Core::OutputWindow {type='Core::OutputWindow' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Compile Output'} :Qt Creator.DebugModeWidget_QSplitter {name='DebugModeWidget' type='QSplitter' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator.Go to Help Mode_QToolButton {text='Go to Help Mode' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} -:Qt Creator.Help_Search for:_QLineEdit {leftWidget=':Qt Creator.Search for:_QLabel' type='QLineEdit' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator.Issues_QListView {type='QListView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Issues'} :Qt Creator.Project.Menu.File_QMenu {name='Project.Menu.File' type='QMenu'} :Qt Creator.Project.Menu.Folder_QMenu {name='Project.Menu.Folder' type='QMenu' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} @@ -139,7 +138,6 @@ :Qt Creator.ReRun_QToolButton {toolTip='Re-run this run-configuration' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator.Replace All_QToolButton {name='replaceAllButton' text='Replace All' type='QToolButton' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator.Replace_QToolButton {name='replaceButton' text='Replace' type='QToolButton' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} -:Qt Creator.Search for:_QLabel {text='Search for:' type='QLabel' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator.Stop_QToolButton {text='Stop' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator.replaceEdit_Utils::FilterLineEdit {name='replaceEdit' type='Utils::FancyLineEdit' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator.scrollArea_QScrollArea {name='scrollArea' type='QScrollArea' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} diff --git a/tests/system/suite_HELP/tst_HELP04/test.py b/tests/system/suite_HELP/tst_HELP04/test.py index e7ece48b460..84009ca0752 100755 --- a/tests/system/suite_HELP/tst_HELP04/test.py +++ b/tests/system/suite_HELP/tst_HELP04/test.py @@ -96,10 +96,13 @@ def main(): mouseClick(waitForObject("{column='0' container=':Qt Creator_QHelpContentWidget' " "text='Qt Reference Documentation' type='QModelIndex'}")) # try to search keyword from list + searchLineEdit = getChildByClass(waitForObject("{type='QHelpSearchQueryWidget' unnamed='1' visible='1' " + "window=':Qt Creator_Core::Internal::MainWindow'}"), + "QLineEdit") for searchKeyword,shouldFind in searchKeywordDictionary.items(): - mouseClick(waitForObject(":Qt Creator.Help_Search for:_QLineEdit")) - replaceEditorContent(":Qt Creator.Help_Search for:_QLineEdit", searchKeyword) - type(waitForObject(":Qt Creator.Help_Search for:_QLineEdit"), "") + mouseClick(searchLineEdit) + replaceEditorContent(searchLineEdit, searchKeyword) + type(searchLineEdit, "") progressBarWait(warn=False) if shouldFind: test.verify(waitFor("re.match('[1-9]\d* - [1-9]\d* of [1-9]\d* Hits'," @@ -153,7 +156,7 @@ def main(): test.verify("sql" in str(__getSelectedText__()).lower(), "sql advanced search result can be found") # verify if simple search is properly disabled - test.verify(findObject(":Qt Creator.Help_Search for:_QLineEdit").enabled == False, + test.verify(not searchLineEdit.enabled, "Verifying if simple search is not active in advanced mode.") # exit invokeMenuItem("File", "Exit")