From 0db4c917f4f6fca907b1479df299027e4a68c081 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 20 Jun 2012 18:12:57 +0200 Subject: [PATCH] Squish: Fixed HELP06 for master Change-Id: Ic2e4f49502764e8835341c0d712c6c418d7259a5 Reviewed-by: Christian Stenger --- tests/system/suite_HELP/objects.map | 6 +++--- tests/system/suite_HELP/tst_HELP06/test.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/system/suite_HELP/objects.map b/tests/system/suite_HELP/objects.map index 149070d411b..00e9f70c421 100644 --- a/tests/system/suite_HELP/objects.map +++ b/tests/system/suite_HELP/objects.map @@ -9,17 +9,17 @@ :Add Bookmark.treeView_QTreeView {name='treeView' type='QTreeView' visible='1' window=':Add Bookmark_BookmarkDialog'} :Add Bookmark_BookmarkDialog {name='BookmarkDialog' type='BookmarkDialog' visible='1' windowTitle='Add Bookmark'} :Folder 1.Folder 2_QModelIndex {column='0' container=':Sample.Folder 1_QModelIndex' text='Folder 2' type='QModelIndex'} -:Folder 2.Qt Creator : Building and Running an Example_QModelIndex {column='0' container=':Folder 1.Folder 2_QModelIndex' text?='Qt Creator : Building and Running an Example*' type='QModelIndex'} +:Folder 2.Qt Creator : Building and Running an Example_QModelIndex {column='0' container=':Folder 1.Folder 2_QModelIndex' text?='QtCreator : Building and Running an Example*' type='QModelIndex'} :Getting Started.Building and Running an Example_QModelIndex {column='0' container=':Qt Creator Manual*.Getting Started_QModelIndex' text='Building and Running an Example' type='QModelIndex'} :Hits_QCLuceneResultWidget {aboveWidget=':Hits_QLabel' type='QCLuceneResultWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Hits_QLabel {text~='\\\\d+ - \\\\d+ of \\\\d+ Hits' type='QLabel' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} -:New Folder.Qt Creator : Qt Creator Manual_QModelIndex {column='0' container=':Sample.New Folder_QModelIndex' text='Qt Creator : Qt Creator Manual' type='QModelIndex'} +:New Folder.Qt Creator : Qt Creator Manual_QModelIndex {column='0' container=':Sample.New Folder_QModelIndex' text='QtCreator : Qt Creator Manual' type='QModelIndex'} :Next_QPushButton {text~='(Next.*|Continue)' type='QPushButton' visible='1'} :Options.OK_QPushButton {text='OK' type='QPushButton' unnamed='1' visible='1' window=':Options_Core::Internal::SettingsDialog'} :Options.qt_tabwidget_tabbar_QTabBar {name='qt_tabwidget_tabbar' type='QTabBar' visible='1' window=':Options_Core::Internal::SettingsDialog'} :Options_Core::Internal::SettingsDialog {type='Core::Internal::SettingsDialog' unnamed='1' visible='1' windowTitle~='Options|Preferences'} :Options_QListView {type='QListView' unnamed='1' visible='1' window=':Options_Core::Internal::SettingsDialog'} -:Qt Creator Manual QModelIndex {column='0' container=':Qt Creator_QHelpContentWidget' text='Qt Creator Manual 2.5.1' type='QModelIndex'} +:Qt Creator Manual QModelIndex {column='0' container=':Qt Creator_QHelpContentWidget' text~='Qt Creator Manual 2\\\\.[1-9]+[0-9]?\\\\.[1-9]+[0-9]?' type='QModelIndex'} :Qt Creator Manual*.Getting Started_QModelIndex {column='0' container=':Qt Creator Manual QModelIndex' text='Getting Started' type='QModelIndex'} :Qt Creator.+_QToolButton {text='+' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator.Add Bookmark_QToolButton {text='Add Bookmark' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} diff --git a/tests/system/suite_HELP/tst_HELP06/test.py b/tests/system/suite_HELP/tst_HELP06/test.py index feee1342c08..4c6e0d52224 100755 --- a/tests/system/suite_HELP/tst_HELP06/test.py +++ b/tests/system/suite_HELP/tst_HELP06/test.py @@ -51,14 +51,14 @@ def main(): for i in range(6): type(waitForObject(":Qt Creator_TreeView"), "") type(waitForObject(":Qt Creator_TreeView"), "") - test.verify("Qt Creator : Building and Running an Example" in str(waitForObject(":Qt Creator_Help::Internal::HelpViewer").title), + test.verify("QtCreator : Building and Running an Example" in str(waitForObject(":Qt Creator_Help::Internal::HelpViewer").title), "Verifying if first bookmark is opened") mouseClick(waitForObject(":Folder 2.Qt Creator : Building and Running an Example_QModelIndex")) type(waitForObject(":Qt Creator_TreeView"), "") type(waitForObject(":Qt Creator_TreeView"), "") type(waitForObject(":Qt Creator_TreeView"), "") type(waitForObject(":Qt Creator_TreeView"), "") - test.verify("Qt Creator : Qt Creator Manual" in str(waitForObject(":Qt Creator_Help::Internal::HelpViewer").title), + test.verify("QtCreator : Qt Creator Manual" in str(waitForObject(":Qt Creator_Help::Internal::HelpViewer").title), "Verifying if second bookmark is opened") # delete previously created directory clickButton(waitForObject(":Qt Creator.Add Bookmark_QToolButton"))