From b1fd62e04bef63ad22119a7cbe9c3574f702feeb Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 7 May 2012 19:57:20 +0200 Subject: [PATCH] Squish: Update for changed breakPointTreeView Change-Id: I861585b895f3c3ea0d4ffc324c631e508899f79e Reviewed-by: Christian Stenger --- tests/system/objects.map | 2 ++ tests/system/shared/debugger.py | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system/objects.map b/tests/system/objects.map index 2f228d6fd4e..e3ae490001f 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -8,12 +8,14 @@ :*Qt Creator_Core::Internal::FancyToolButton {occurrence='3' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :*Qt Creator_Utils::FilterLineEdit {type='Utils::FilterLineEdit' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :*Qt Creator_Utils::IconButton {occurrence='4' type='Utils::IconButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Breakpoints_Debugger::Internal::BreakTreeView {container=':DebugModeWidget.Breakpoints_QDockWidget' type='Debugger::Internal::BreakTreeView' unnamed='1' visible='1'} :CMake Wizard.Cancel_QPushButton {text='Cancel' type='QPushButton' unnamed='1' visible='1' window=':CMake Wizard_CMakeProjectManager::Internal::CMakeOpenProjectWizard'} :CMake Wizard.Finish_QPushButton {text~='(Finish|Done)' type='QPushButton' unnamed='1' visible='1' window=':CMake Wizard_CMakeProjectManager::Internal::CMakeOpenProjectWizard'} :CMake Wizard.Generator:_QLabel {text='Generator:' type='QLabel' unnamed='1' visible='1' window=':CMake Wizard_CMakeProjectManager::Internal::CMakeOpenProjectWizard'} :CMake Wizard.Next_QPushButton {name='__qt__passive_wizardbutton1' text~='(Next.*|Continue)' type='QPushButton' visible='1' window=':CMake Wizard_CMakeProjectManager::Internal::CMakeOpenProjectWizard'} :CMake Wizard.Run CMake_QPushButton {text='Run CMake' type='QPushButton' unnamed='1' visible='1' window=':CMake Wizard_CMakeProjectManager::Internal::CMakeOpenProjectWizard'} :CMake Wizard_CMakeProjectManager::Internal::CMakeOpenProjectWizard {type='CMakeProjectManager::Internal::CMakeOpenProjectWizard' unnamed='1' visible='1' windowTitle='CMake Wizard'} +:DebugModeWidget.Breakpoints_QDockWidget {container=':Qt Creator.DebugModeWidget_QSplitter' name='Debugger.Docks.Break' type='QDockWidget' visible='1' windowTitle='Breakpoints'} :DebugModeWidget.Debugger Log_QDockWidget {container=':Qt Creator.DebugModeWidget_QSplitter' name='Debugger.Docks.Output' type='QDockWidget' visible='1' windowTitle='Debugger Log'} :DebugModeWidget.Debugger Toolbar_QDockWidget {container=':Qt Creator.DebugModeWidget_QSplitter' name='Debugger Toolbar' type='QDockWidget' visible='1' windowTitle='Debugger Toolbar'} :DebugModeWidget.OK_QPushButton {container=':Qt Creator.DebugModeWidget_QSplitter' text='OK' type='QPushButton' unnamed='1' visible='1'} diff --git a/tests/system/shared/debugger.py b/tests/system/shared/debugger.py index 7ee0db886a1..c1fbe76ec39 100644 --- a/tests/system/shared/debugger.py +++ b/tests/system/shared/debugger.py @@ -65,8 +65,7 @@ def setBreakpointsForCurrentProject(filesAndLines): invokeMenuItem("Debug", "Toggle Breakpoint") test.log('Set breakpoint in %s' % fName, curLine) try: - breakPointTreeView = waitForObject("{type='Debugger::Internal::BreakWindow' visible='1' " - "windowTitle='Breakpoints' name='Debugger.Docks.Break'}") + breakPointTreeView = waitForObject(":Breakpoints_Debugger::Internal::BreakTreeView") waitFor("breakPointTreeView.model().rowCount() == len(filesAndLines)", 2000) except: test.fatal("UI seems to have changed - check manually and fix this script.") @@ -81,8 +80,7 @@ def setBreakpointsForCurrentProject(filesAndLines): def removeOldBreakpoints(): test.log("Removing old breakpoints if there are any") try: - breakPointTreeView = waitForObject("{type='Debugger::Internal::BreakWindow' visible='1' " - "windowTitle='Breakpoints' name='Debugger.Docks.Break'}") + breakPointTreeView = waitForObject(":Breakpoints_Debugger::Internal::BreakTreeView") model = breakPointTreeView.model() if model.rowCount()==0: test.log("No breakpoints found...")